www-commits
[Top][All Lists]
Advanced

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

www distros/free-distros.nl.html distros/po/fre...


From: GNUN
Subject: www distros/free-distros.nl.html distros/po/fre...
Date: Sat, 14 Apr 2018 07:33:16 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/04/14 07:33:15

Modified files:
        distros        : free-distros.nl.html 
        distros/po     : free-distros.ar.po free-distros.ca-diff.html 
                         free-distros.ca.po free-distros.de.po 
                         free-distros.es.po free-distros.fr.po 
                         free-distros.hr-diff.html free-distros.hr.po 
                         free-distros.it.po free-distros.ja-diff.html 
                         free-distros.ja.po free-distros.nl-diff.html 
                         free-distros.nl.po free-distros.pl-diff.html 
                         free-distros.pl.po free-distros.pot 
                         free-distros.pt-br.po free-distros.ro-diff.html 
                         free-distros.ro.po free-distros.ru.po 
                         free-distros.sk.po free-distros.uk.po 
                         free-distros.zh-cn.po 
        server/gnun/compendia: compendium.af.po compendium.ar.po 
                               compendium.bg.po compendium.ca.po 
                               compendium.cs.po compendium.da.po 
                               compendium.de.po compendium.el.po 
                               compendium.es.po compendium.fa.po 
                               compendium.fr.po compendium.he.po 
                               compendium.hr.po compendium.id.po 
                               compendium.it.po compendium.ja.po 
                               compendium.ko.po compendium.lt.po 
                               compendium.ml.po compendium.nb.po 
                               compendium.nl.po compendium.pl.po 
                               compendium.pot compendium.pt-br.po 
                               compendium.ro.po compendium.ru.po 
                               compendium.sk.po compendium.sq.po 
                               compendium.sr.po compendium.sv.po 
                               compendium.ta.po compendium.tr.po 
                               compendium.uk.po compendium.zh-cn.po 
                               compendium.zh-tw.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-distros.nl.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ar.po?cvsroot=www&r1=1.96&r2=1.97
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ca-diff.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ca.po?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.de.po?cvsroot=www&r1=1.122&r2=1.123
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.es.po?cvsroot=www&r1=1.166&r2=1.167
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.fr.po?cvsroot=www&r1=1.165&r2=1.166
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.hr-diff.html?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.hr.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.it.po?cvsroot=www&r1=1.177&r2=1.178
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ja-diff.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ja.po?cvsroot=www&r1=1.106&r2=1.107
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.nl-diff.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.nl.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.pl-diff.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.pl.po?cvsroot=www&r1=1.123&r2=1.124
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.pot?cvsroot=www&r1=1.85&r2=1.86
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.pt-br.po?cvsroot=www&r1=1.76&r2=1.77
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ro-diff.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ro.po?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ru.po?cvsroot=www&r1=1.167&r2=1.168
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.sk.po?cvsroot=www&r1=1.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.uk.po?cvsroot=www&r1=1.78&r2=1.79
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.af.po?cvsroot=www&r1=1.83&r2=1.84
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ar.po?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.bg.po?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ca.po?cvsroot=www&r1=1.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.cs.po?cvsroot=www&r1=1.87&r2=1.88
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.da.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.de.po?cvsroot=www&r1=1.134&r2=1.135
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.el.po?cvsroot=www&r1=1.91&r2=1.92
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.es.po?cvsroot=www&r1=1.94&r2=1.95
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fa.po?cvsroot=www&r1=1.85&r2=1.86
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fr.po?cvsroot=www&r1=1.92&r2=1.93
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.he.po?cvsroot=www&r1=1.83&r2=1.84
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.hr.po?cvsroot=www&r1=1.67&r2=1.68
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.id.po?cvsroot=www&r1=1.84&r2=1.85
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.it.po?cvsroot=www&r1=1.111&r2=1.112
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ja.po?cvsroot=www&r1=1.100&r2=1.101
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ko.po?cvsroot=www&r1=1.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.lt.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ml.po?cvsroot=www&r1=1.85&r2=1.86
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.nb.po?cvsroot=www&r1=1.85&r2=1.86
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.nl.po?cvsroot=www&r1=1.80&r2=1.81
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pl.po?cvsroot=www&r1=1.100&r2=1.101
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pot?cvsroot=www&r1=1.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pt-br.po?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ro.po?cvsroot=www&r1=1.88&r2=1.89
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ru.po?cvsroot=www&r1=1.87&r2=1.88
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sk.po?cvsroot=www&r1=1.83&r2=1.84
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sq.po?cvsroot=www&r1=1.102&r2=1.103
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sr.po?cvsroot=www&r1=1.84&r2=1.85
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sv.po?cvsroot=www&r1=1.85&r2=1.86
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ta.po?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.tr.po?cvsroot=www&r1=1.85&r2=1.86
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.uk.po?cvsroot=www&r1=1.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-cn.po?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-tw.po?cvsroot=www&r1=1.80&r2=1.81

Patches:
Index: distros/free-distros.nl.html
===================================================================
RCS file: /web/www/www/distros/free-distros.nl.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- distros/free-distros.nl.html        19 Feb 2018 18:00:45 -0000      1.11
+++ distros/free-distros.nl.html        14 Apr 2018 11:33:12 -0000      1.12
@@ -3,7 +3,7 @@
  https://www.gnu.org/distros/po/free-distros.nl.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/distros/free-distros.html"
  --><!--#set var="DIFF_FILE" value="/distros/po/free-distros.nl-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2017-12-21" --><!--#set 
var="ENGLISH_PAGE" value="/distros/free-distros.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2017-12-21" -->
 
 <!--#include virtual="/server/header.nl.html" -->
 <!-- Parent-Version: 1.79 -->
@@ -292,7 +292,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2018/02/19 18:00:45 $
+$Date: 2018/04/14 11:33:12 $
 
 <!-- timestamp end -->
 </p>

Index: distros/po/free-distros.ar.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ar.po,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- distros/po/free-distros.ar.po       21 Dec 2017 17:59:23 -0000      1.96
+++ distros/po/free-distros.ar.po       14 Apr 2018 11:33:14 -0000      1.97
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2009-09-02 21:48+0200\n"
 "Last-Translator: Hossam Hossny <address@hidden>\n"
 "Language-Team: Arabic\n"
@@ -32,32 +32,71 @@
 msgid "Free GNU/Linux distributions"
 msgstr "توزيعات غنو/لينكس حرّة"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
+
+# type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid "<a href=\"http://patron.fsf.org/\";>Corporate Patronage</a>"
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr "<a href=\"http://patron.fsf.org/\";>الشركات الراعية</a>"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\"><a href=\"http://www.fsf.org/\";>مؤسسة "
 "البرمجيات الحرّة</a> غير مسؤولة عن محتوى م
واقع الوب الأخرى، ولا عن طريقة "
 "تحديث محتوى تلك المواقع.</span></em>"
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "مقدمة"
+
 #. type: Content of: <p>
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 
 # | These {+distros+} are [-the <a
@@ -90,10 +129,10 @@
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "هذه·توزيعات <a 
href=\"/gnu/linux-and-gnu.html\">غنو/لينكس</a>·نعلم أن 
لديها "
 "سياسة صارمة وهي تضمين البرمجيات الحرّة 
فقط. ترفض هذه التوزيعات البرمجيات غير "
@@ -150,31 +189,22 @@
 "تأييدنا على لبعض التوزيعات الشائعة</a>. 
هنا، سوف تجد قائمة الأسباب التي تجعل "
 "عددًا من التوزيعات المعروفة لا تتبع 
إرشاداتنا."
 
-# | <strong>All of the distributions that follow are installable to a
-# | [-computer-] {+computer's+} hard [-drive and-] {+drive;+} most can be run
-# | [-live.</strong>  They are listed-] {+live.  Not all hardware works+} in
-# | [-no particular order.-] {+the free world; each distro's site should say
-# | which hardware it supports.</strong>+}
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "<strong>All of the distributions that follow are installable to a "
-#| "computer hard drive and most can be run live.</strong>  They are listed "
-#| "in no particular order.  "
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
 msgstr ""
-"<strong>جميع هذه التوزيعات تتيح تنصيبها على 
القرص الصلب للحاسوب وأغلبها يمكن "
-"تشغيلها مباشرة من القرص،</strong> وهي مدرجة 
دون ترتيب معين."
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
 msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
@@ -182,7 +212,7 @@
 msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+msgid "Brief Description"
 msgstr ""
 
 #. type: Content of: <table><tr><td><a>
@@ -203,7 +233,9 @@
 "BLAG Linux and GNU،·بلاغ غنو و لينكس، توزيعة 
غنو/لينكس مبنية على فيدورا."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -236,8 +268,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
-msgstr "Dynebolic،·توزيعة غنو/لينكس، تركز بصفة 
خاصة على تحرير الصوت والفيديو."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
+msgstr ""
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -281,12 +314,15 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix،·توزيعة غنو/لينكس مبنية على كنوبيكس، م
ع تركير خاص على الإنتاج الصوتي."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -322,7 +358,9 @@
 "الحرّة."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -346,13 +384,23 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS،·توزيعة غنو/لينكس مبنية على Gentoo. كانت 
أول نظام غنو/لينكس يعترف "
 "به مشروع غنو."
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "توزيعات غنو/لينكس حرّة"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -393,6 +441,12 @@
 "build-time and run-time for different hardware and use cases."
 msgstr ""
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "توزيعات غنو/لينكس حرّة"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -404,24 +458,23 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
 msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "نسرد أيضا <a href=\"/links/companies.html\">الشركات التي 
تبيع عتاد الحاسوب "
 "الذي تأتي معه مسبقا توزيعة غنو/لينكس 
حرة</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr ""
@@ -528,7 +581,8 @@
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2011, 2012 مؤسسة البرمجيات الحرة، 
المحدودة."
 
 #. type: Content of: <div><p>
@@ -553,6 +607,46 @@
 msgid "Updated:"
 msgstr "حُدّثت:"
 
+# | <strong>All of the distributions that follow are installable to a
+# | [-computer-] {+computer's+} hard [-drive and-] {+drive;+} most can be run
+# | [-live.</strong>  They are listed-] {+live.  Not all hardware works+} in
+# | [-no particular order.-] {+the free world; each distro's site should say
+# | which hardware it supports.</strong>+}
+#, fuzzy
+#~| msgid ""
+#~| "<strong>All of the distributions that follow are installable to a "
+#~| "computer hard drive and most can be run live.</strong>  They are listed "
+#~| "in no particular order.  "
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>جميع هذه التوزيعات تتيح تنصيبها على 
القرص الصلب للحاسوب وأغلبها "
+#~ "يمكن تشغيلها مباشرة من القرص،</strong> وهي م
درجة دون ترتيب معين."
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic،·توزيعة غنو/لينكس، تركز بصفة خاصة 
على تحرير الصوت والفيديو."
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix،·توزيعة غنو/لينكس مبنية على كنوبيكس، 
مع تركير خاص على الإنتاج "
+#~ "الصوتي."
+
+# | Copyright &copy; [-2011, 2012-] {+2014, 2015, 2016, 2017+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#~| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011, 2012 مؤسسة البرمجيات 
الحرة، المحدودة."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"
 

Index: distros/po/free-distros.ca-diff.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ca-diff.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- distros/po/free-distros.ca-diff.html        22 Dec 2017 07:59:28 -0000      
1.17
+++ distros/po/free-distros.ca-diff.html        14 Apr 2018 11:33:14 -0000      
1.18
@@ -18,38 +18,72 @@
       href="http://www.gnu.org/distros/distros.rss";
       type="application/rss+xml" /&gt;
 &lt;style type="text/css" media="screen"&gt;&lt;!--
+<span class="inserted"><ins><em>h2 { margin-bottom: 1.5em; }
+h3 { margin: 1.8em 0 1.3em; }
+.summary {
+   padding-top: .7em; padding-bottom: 1.2em;
+   margin-top: 0;
+   border: .15em dotted #ccc;
+}
+.note { margin-top: .8em; margin-bottom: 1em; }
+p.highlight {
+   border: .1em solid #ccc;
+   margin-bottom: 0;
+}
+table.listing { margin-bottom: 3em; }</em></ins></span>
 td.icon { width: 20%; }
 td.icon img { max-width: 100%; max-height: 4em; }
+<span class="inserted"><ins><em>@media (max-width: 48em) {
+   .note, .summary { width: 30em; max-width: 93%; }
+}</em></ins></span>
 --&gt;&lt;/style&gt;
-
 &lt;!--#include virtual="/distros/po/free-distros.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;h2&gt;Free GNU/Linux distributions&lt;/h2&gt;
+
 &lt;!--#include virtual="/licenses/fsf-licensing.html" --&gt;
 
-&lt;blockquote&gt;
-&lt;p&gt;&lt;em&gt;&lt;span class="highlight"&gt;The &lt;a 
href="http://www.fsf.org/"&gt;Free
-Software Foundation&lt;/a&gt; is not responsible for other web sites, or how
-up-to-date their information is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt; 
-&lt;/blockquote&gt;
+<span class="removed"><del><strong>&lt;blockquote&gt;
+&lt;p&gt;&lt;em&gt;&lt;span class="highlight"&gt;The</strong></del></span>
+<span class="inserted"><ins><em>&lt;div class="summary"&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;
+&lt;ul&gt;
+  &lt;li&gt;&lt;a href="#intro"&gt;Introduction&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#for-pc"&gt;GNU/Linux distros for PCs and 
workstations&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#small-distros"&gt;Small GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#howto-get"&gt;How to get free GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/distros/free-non-gnu-distros.html"&gt;Other free 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#NewDistro"&gt;See something we 
missed?&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p class="highlight"&gt;&lt;em&gt;The</em></ins></span> &lt;a 
href="http://www.fsf.org/"&gt;Free
+Software Foundation&lt;/a&gt; is not responsible for other <span 
class="removed"><del><strong>web sites,</strong></del></span> <span 
class="inserted"><ins><em>websites,</em></ins></span> or how
+up-to-date their information <span 
class="removed"><del><strong>is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt; 
+&lt;/blockquote&gt;</strong></del></span> <span 
class="inserted"><ins><em>is.&lt;/em&gt;&lt;/p&gt; 
+&lt;/div&gt;
+&lt;hr class="no-display" /&gt;
+
+&lt;h3 id="intro"&gt;Introduction&lt;/h3&gt;</em></ins></span>
 
 &lt;p&gt;This page lists the &lt;a 
href="/gnu/linux-and-gnu.html"&gt;GNU/Linux&lt;/a&gt;
 distributions that are
 entirely &lt;a href="/philosophy/free-sw.html"&gt;free&lt;/a&gt; as in freedom.
-All of the distributions that follow are installable to a
-computer's hard drive; most can be run live.&lt;/p&gt;
+<span class="removed"><del><strong>All of the</strong></del></span>
+<span class="inserted"><ins><em>Non-GNU-based free system</em></ins></span> 
distributions <span class="removed"><del><strong>that 
follow</strong></del></span> are <span class="removed"><del><strong>installable 
to a
+computer's hard drive; most can be run live.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>listed &lt;a
+href="/distros/free-non-gnu-distros.html"&gt;separately&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;The Free Software Foundation recommends and endorses these GNU/Linux
-distros, although we do not try to judge or compare them based on any
-criterion other than freedom; therefore, we list them in alphabetical
-order.  We encourage you to read these brief descriptions and to
+distros, although <span class="removed"><del><strong>we</strong></del></span> 
<span class="inserted"><ins><em>&lt;strong&gt;we</em></ins></span> do not try 
to judge or compare them based on any
+criterion other than <span 
class="removed"><del><strong>freedom;</strong></del></span> <span 
class="inserted"><ins><em>freedom&lt;/strong&gt;;</em></ins></span> therefore, 
we list them in alphabetical
+<span class="removed"><del><strong>order.  We encourage you to read these 
brief descriptions and to
 consult their respective web sites and other information to choose the
-one best for you.&lt;/p&gt;
+one best for you.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>order.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;These distros are ready-to-use full systems whose developers have made
 a commitment to follow the 
 &lt;a href="/distros/free-system-distribution-guidelines.html"&gt;Guidelines
-for Free System Distributions&lt;/a&gt;.  This means these distros will
+for Free System Distributions&lt;/a&gt;.  This means <span 
class="removed"><del><strong>these distros</strong></del></span> <span 
class="inserted"><ins><em>they</em></ins></span> will
 include, and propose, exclusively free software.  They will reject
 nonfree applications, nonfree programming platforms, nonfree drivers,
 nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other
@@ -74,17 +108,27 @@
 improve the state of free distros, helping to develop an existing free
 distro contributes more than starting a new one.&lt;/p&gt;
 
-&lt;p&gt;&lt;strong&gt;All of the distributions that follow are installable to 
a
-computer's hard drive; most can be run live.  Not all hardware works
-in the free world; each distro's site should say which hardware it
-supports.&lt;/strong&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;All of the 
distributions</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Please note</em></ins></span> that 
<span class="removed"><del><strong>follow are installable to a
+computer's hard drive; most can be run live.  Not</strong></del></span> <span 
class="inserted"><ins><em>not</em></ins></span> all hardware works in the free 
world; each
+distro's site should say which hardware it
+<span class="removed"><del><strong>supports.&lt;/strong&gt;&lt;/p&gt;
 
 &lt;p&gt;We endorse these distros only for freedom.  We do not try to judge
 or compare these distros based on any other criterion; therefore, we
-list them in alphabetical order.  We suggest you consult their
-respective web sites and other information to judge which one is most
+list them in alphabetical order.</strong></del></span> <span 
class="inserted"><ins><em>supports.</em></ins></span> We suggest <span 
class="inserted"><ins><em>that,
+after reading the short descriptions below,</em></ins></span> you consult 
<span class="removed"><del><strong>their
+respective web</strong></del></span> <span 
class="inserted"><ins><em>these</em></ins></span> sites <span 
class="removed"><del><strong>and</strong></del></span> <span 
class="inserted"><ins><em>as
+well as</em></ins></span> other <span 
class="removed"><del><strong>information</strong></del></span> <span 
class="inserted"><ins><em>available information,</em></ins></span> to judge 
which <span class="removed"><del><strong>one</strong></del></span> <span 
class="inserted"><ins><em>distro</em></ins></span> is most
 convenient for you.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h3 id="for-pc"&gt;GNU/Linux distros for 
PCs and
+workstations&lt;/h3&gt;
+
+&lt;p&gt;The distributions that follow are installable to a computer's hard
+drive and/or can be run live.&lt;/p&gt;</em></ins></span>
+
 &lt;!-- Do not add or remove anything from this list without a lot of
      discussion, following the usual process, and confirmation by RMS. See 
      http://www.gnu.org/server/standards/index.html#distros --&gt;
@@ -92,16 +136,17 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
-&lt;tr class="odd"&gt;
+  &lt;tr class="odd"&gt;
    &lt;td class="icon"&gt;&lt;a href="http://www.blagblagblag.org/"&gt;
        &lt;img src="/graphics/distros-blag.jpg" alt="BLAG Linux and GNU" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;BLAG Linux and GNU, a GNU/Linux distribution based on 
Fedora.&lt;/td&gt;&lt;/tr&gt;
 
  &lt;tr class="even"&gt;
-   &lt;td class="icon"&gt;&lt;a href="http://dragora.org"&gt;
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://dragora.org"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://dragora.org/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-dragora.png" <span 
class="removed"><del><strong>alt="Dragora"</strong></del></span>
             <span class="inserted"><ins><em>alt="Dragora 
GNU/Linux-Libre"</em></ins></span> /&gt;&lt;/a&gt;&lt;/td&gt;
    <span class="removed"><del><strong>&lt;td&gt;Dragora,</strong></del></span>
@@ -112,7 +157,9 @@
    &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://www.dynebolic.org"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.dyne.org/software/dynebolic/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-dyen.png" alt="Dynebolic" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Dynebolic, a GNU/Linux distribution with special emphasis on 
audio 
-       and video editing.&lt;/td&gt;&lt;/tr&gt;
+       and video <span 
class="removed"><del><strong>editing.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>editing. This is a &ldquo;static&rdquo; 
distro, normally
+       run from a live CD. Since it will not receive security updates, it
+       should be used offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="http://www.gnewsense.org/"&gt;
@@ -127,29 +174,30 @@
        on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
        functional package manager for the GNU system. &lt;/td&gt;&lt;/tr&gt;
 
-    
  &lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="https://musixdistro.wordpress.com/"&gt;
        &lt;img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Musix, a GNU+Linux distribution based on Knoppix, with special
-       emphasis on audio production.&lt;/td&gt;&lt;/tr&gt;
+       emphasis on audio <span 
class="removed"><del><strong>production.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>production. This is a &ldquo;static&rdquo;
+       distro, normally run from a live CD. Since it will not receive
+       security updates, it should be used 
offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr class="odd"&gt;
-   &lt;td class="icon"&gt;&lt;a href="http://www.parabola.nu/https/"&gt;
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://www.parabola.nu/https/"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.parabola.nu"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-parabola.png"
             alt="Parabola <span 
class="removed"><del><strong>GNU/Linux"</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux-libre"</em></ins></span> 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Parabola <span 
class="removed"><del><strong>GNU/Linux,</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux-libre,</em></ins></span> a distribution 
based on Arch that
        prioritizes simple package and system management.&lt;/td&gt;&lt;/tr&gt;
 
  &lt;tr class="even"&gt;
-   &lt;td class="icon"&gt;&lt;a <span 
class="inserted"><ins><em>href="https://pureos.net/"&gt;
-       &lt;img src="/graphics/pureos-logo-small.png"
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://trisquel.info/"&gt;</strong></del></span>
 <span class="inserted"><ins><em>href="https://pureos.net/"&gt;
+       &lt;img src="/graphics/pureos-logo-small.png" style="max-height: 1.8em;"
             alt="PureOS" /&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;PureOS, a GNU distribution based on Debian with a focus on
        privacy, security, and convenience.&lt;/td&gt;&lt;/tr&gt;
  
  &lt;tr class="odd"&gt;
-   &lt;td class="icon"&gt;&lt;a</em></ins></span> 
href="http://trisquel.info/"&gt;
+   &lt;td class="icon"&gt;&lt;a 
href="https://trisquel.info/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-trisquel.png" alt="Trisquel" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Trisquel, a GNU/Linux distribution based on Ubuntu that's 
oriented 
  toward small enterprises, domestic users and educational 
centers.&lt;/td&gt;&lt;/tr&gt;
@@ -157,12 +205,16 @@
 &lt;tr <span 
class="removed"><del><strong>class="odd"&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="even"&gt;</em></ins></span>
    &lt;td class="icon"&gt;&lt;a href="http://www.ututo.org/"&gt;
        &lt;img src="/graphics/distros-ututo.png" alt="Ututo" 
/&gt;&lt;/a&gt;&lt;/td&gt;
-   &lt;td&gt;Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the 
first
+   &lt;td&gt;Ututo <span 
class="removed"><del><strong>XS,</strong></del></span> <span 
class="inserted"><ins><em>S,</em></ins></span> a GNU/Linux <span 
class="removed"><del><strong>distribution based on 
Gentoo.</strong></del></span> <span class="inserted"><ins><em>100% free 
distribution.</em></ins></span>  It was the first
        fully free GNU/Linux system recognized by the GNU 
Project.&lt;/td&gt;&lt;/tr&gt;
 
 &lt;/table&gt;
 
-&lt;p id="small-distros"&gt;Below is a list of small system distributions. 
These 
+<span class="removed"><del><strong>&lt;p 
id="small-distros"&gt;Below</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 id="small-distros"&gt;Small GNU/Linux 
distros&lt;/h3&gt;
+
+&lt;p&gt;Below</em></ins></span> is a list of small system distributions. 
These 
    distributions are meant for devices with limited resources, like a 
    wireless router for example. A free small system distribution is not 
    self-hosting, but it must be developable and buildable on top of one of 
@@ -171,7 +223,8 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
  &lt;tr class="odd"&gt;
@@ -191,6 +244,8 @@
 
 &lt;/table&gt;
 
+<span class="inserted"><ins><em>&lt;h3 id="howto-get"&gt;How to get free 
GNU/Linux distros&lt;/h3&gt;</em></ins></span>
+
 &lt;p&gt;In addition to their own sites, many of these distributions are
 available from &lt;a href="http://mirror.fsf.org/"&gt;mirror.fsf.org&lt;/a&gt;.
 Feel free to download or mirror the distributions from there,
@@ -198,16 +253,21 @@
 mirror for their project by mailing the 
 &lt;a href="mailto:address@hidden"&gt;FSF sysadmins&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p id="other-free"&gt;Non-GNU-based free system distributions are
+<span class="removed"><del><strong>&lt;p id="other-free"&gt;Non-GNU-based free 
system distributions are
 listed in &lt;a href="/distros/free-non-gnu-distros.html"&gt;a separate 
file&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;We list &lt;a href="/links/companies.html"&gt;companies that sell 
hardware
-preinstalled with a free GNU/Linux distribution&lt;/a&gt; separately.&lt;/p&gt;
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</strong></del></span>
 
 &lt;p&gt;&lt;a href="/software/software.html"&gt;Individual GNU
 packages&lt;/a&gt; (most of which are included in the free distributions here) 
 are described separately.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;p&gt;We list &lt;a
+href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom"&gt;
+companies that sell hardware
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</em></ins></span>
+
 &lt;h3 id="NewDistro"&gt;See something we missed?&lt;/h3&gt;
 
 &lt;p&gt;Do you know about a distribution that you expected to find on our
@@ -276,7 +336,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2014, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2017</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2017, 2018</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -286,7 +346,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2017/12/22 07:59:28 $
+$Date: 2018/04/14 11:33:14 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: distros/po/free-distros.ca.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ca.po,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- distros/po/free-distros.ca.po       21 Dec 2017 17:59:24 -0000      1.129
+++ distros/po/free-distros.ca.po       14 Apr 2018 11:33:14 -0000      1.130
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: free-distros.ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2016-09-17 08:50+0200\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -30,23 +30,72 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Distribucions GNU/Linux lliures"
 
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Índex de continguts"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "Ens n'hem deixat alguna?"
+
 # type: Content of: <p>
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\">La <a href=\"http://www.fsf.org/\";>Free "
 "Software Foundation</a> no és responsable del contingut d'altres llocs web "
 "ni de si estan o no actualitzats.</span></em>"
 
+# type: Content of: <h3>
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "Introducció"
+
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "En aquesta pàgina trobareu una llista de les distribucions de <a 
href=\"/gnu/"
 "linux-and-gnu.html\">GNU/Linux</a> que són completament <a href=\"/"
@@ -54,13 +103,19 @@
 "d'un ordinador; la majoria també poden executar-se sense instal·lació 
prèvia."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "La Free Software Foundation recomana i avala aquestes distribucions de GNU/"
 "Linux, tot i que no intentem jutjar-les o comparar-les  basant-nos en algun "
@@ -71,14 +126,24 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Aquestes distribucions són sistemes complets i a punt, els desenvolupadors "
 "dels quals s'han compromès a seguir les <a href=\"/distros/free-system-"
@@ -135,31 +200,23 @@
 "ajudant a desenvolupar una distribució lliure ja existent que començant-ne "
 "una de nova."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
-msgstr ""
-"<strong>Totes les distribucions que trobareu a continuació poden 
instal·lar-"
-"se al disc dur de l'ordinador, i la majoria es poden executar directament "
-"sense instal·lar-les. No tot el maquinari funciona en el món lliure; el 
lloc "
-"web de cada distribució hauria d'indicar en quins ordinadors funciona.</"
-"strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
-msgstr ""
-"Recomanem aquestes distribucions només pel fet que són lliures. No intentem 
"
-"jutjar-les o comparar-les basant-nos en algun altre criteri, i per això les "
-"posem en ordre alfabètic. Us suggerim que consulteu les seves respectives "
-"pàgines web i altra informació per escollir la que sigui millor per "
-"vosaltres."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
+msgstr ""
 
 # type: Content of: <table><thead><tr><th>
 #. type: Content of: <table><thead><tr><th>
@@ -168,7 +225,9 @@
 
 # type: Content of: <table><thead><tr><th>
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Descripció"
 
 # type: Content of: <table><tr><td><a>
@@ -193,7 +252,9 @@
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -227,14 +288,12 @@
 msgid "Dynebolic"
 msgstr "Dynebolic"
 
-# type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic, una distribució GNU/Linux que posa especial èmfasi en l'edició 
de "
-"vídeo i àudio."
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
@@ -284,18 +343,19 @@
 msgid "Musix GNU+Linux"
 msgstr "Musix GNU+Linux"
 
-# type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix GNU+Linux, una distribució GNU/Linux basada en Knoppix que posa "
-"especial èmfasi en la producció d'àudio."
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -342,7 +402,9 @@
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 # type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -371,13 +433,24 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS, una distribució GNU/Linux basada en Gentoo. Va ser el primer "
 "sistema GNU/Linux completament lliure reconegut pel Projecte GNU."
 
+# type: Content of: <h2>
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Distribucions GNU/Linux lliures"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -433,6 +506,13 @@
 "binaris en processos de compilació i execució per a diferents usos i "
 "dispositius."
 
+# type: Content of: <h2>
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Distribucions GNU/Linux lliures"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -451,30 +531,27 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"Trobareu una llista de distribucions lliures no basades en GNU en <a href=\"/"
-"distros/free-non-gnu-distros.html\">aquesta pàgina</a>."
+"Trobareu apart la informació sobre els <a href=\"/software/software.html"
+"\">paquets individuals de GNU </a> (la major part estan inclosos a les "
+"distribucions lliures que esmenem aquí)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
 msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "Tenim a part una llista de les <a href=\"/links/companies.html\">companyies "
 "que venen maquinari amb una distribució GNU/Linux lliure 
preinstal·lada</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"Trobareu apart la informació sobre els <a href=\"/software/software.html"
-"\">paquets individuals de GNU </a> (la major part estan inclosos a les "
-"distribucions lliures que esmenem aquí)."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "Ens n'hem deixat alguna?"
@@ -567,7 +644,8 @@
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -594,6 +672,61 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+# type: Content of: <p>
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Totes les distribucions que trobareu a continuació poden "
+#~ "instal·lar-se al disc dur de l'ordinador, i la majoria es poden executar "
+#~ "directament sense instal·lar-les. No tot el maquinari funciona en el món 
"
+#~ "lliure; el lloc web de cada distribució hauria d'indicar en quins "
+#~ "ordinadors funciona.</strong>"
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "Recomanem aquestes distribucions només pel fet que són lliures. No "
+#~ "intentem jutjar-les o comparar-les basant-nos en algun altre criteri, i "
+#~ "per això les posem en ordre alfabètic. Us suggerim que consulteu les "
+#~ "seves respectives pàgines web i altra informació per escollir la que "
+#~ "sigui millor per vosaltres."
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, una distribució GNU/Linux que posa especial èmfasi en 
l'edició "
+#~ "de vídeo i àudio."
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix GNU+Linux, una distribució GNU/Linux basada en Knoppix que posa "
+#~ "especial èmfasi en la producció d'àudio."
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "Trobareu una llista de distribucions lliures no basades en GNU en <a href="
+#~ "\"/distros/free-non-gnu-distros.html\">aquesta pàgina</a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+
 # type: Content of: <table><tr><td><a>
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"

Index: distros/po/free-distros.de.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.de.po,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- distros/po/free-distros.de.po       19 Jan 2018 13:35:08 -0000      1.122
+++ distros/po/free-distros.de.po       14 Apr 2018 11:33:14 -0000      1.123
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
 "Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2017-12-31 22:00+0100\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\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: 2018-04-14 11:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -25,23 +26,85 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Freie GNU/Linux-Verteilungen"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Inhaltsverzeichnis"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+# | [-See-]{+<a href=\"#NewDistro\">See+} something we [-missed?-]
+# | {+missed?</a>+}
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "Etwas gefunden, was wir übersehen haben?"
+
+#. type: Content of: <div><p>
+# | [-<em><span class=\"highlight\">The-]{+<em>The+} <a
+# | href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not
+# | responsible for other web[- -]sites, or how up-to-date their information
+# | [-is.</span></em>-] {+is.</em>+}
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\">Die <a href=\"https://www.fsf.org/\"; xml:lang="
 "\"en\" lang=\"en\">Free Software Foundation</a> ist nicht für andere "
 "Internetpräsenzen verantwortlich oder wie aktuell deren Informationen 
sind.</"
 "span></em>"
 
+#. type: Content of: <h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "Einführung"
+
 #. type: Content of: <p>
+# | This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>
+# | distributions that are entirely <a
+# | href=\"/philosophy/free-sw.html\">free</a> as in freedom.  [-All of the-] 
+# | {+Non-GNU-based free system+} distributions [-that follow-] are
+# | [-installable to a computer's hard drive; most can be run live.-] {+listed
+# | <a href=\"/distros/free-non-gnu-distros.html\">separately</a>.+}
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "Dies sind <a href=\"/gnu/linux-and-gnu\">GNU/Linux</a>-Verteilungen, die "
 "ganz und gar <em><a href=\"/philosophy/free-sw\">Frei</a> wie in Freiheit</"
@@ -49,13 +112,25 @@
 "Rechners installierbar; die meisten können live ausgeführt werden. "
 
 #. type: Content of: <p>
+# | The Free Software Foundation recommends and endorses these GNU/Linux
+# | distros, although [-we-] {+<strong>we+} do not try to judge or compare
+# | them based on any criterion other than [-freedom;-] {+freedom</strong>;+}
+# | therefore, we list them in alphabetical order.  [-We encourage you to read
+# | these brief descriptions and to consult their respective web sites and
+# | other information to choose the one best for you.-]
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "Die <span xml:lang=\"en\" lang=\"en\">Free Software Foundation</span> "
 "empfiehlt und unterstützt diese GNU/Linux-Verteilungen, obwohl wir versuchen 
"
@@ -66,14 +141,32 @@
 "am besten passende zu wählen."
 
 #. type: Content of: <p>
+# | These distros are ready-to-use full systems whose developers have made a
+# | commitment to follow the <a
+# | href=\"/distros/free-system-distribution-guidelines.html\">Guidelines for
+# | Free System Distributions</a>.  This means [-these distros-] {+they+} will
+# | include, and propose, exclusively free software.  They will reject nonfree
+# | applications, nonfree programming platforms, nonfree drivers, nonfree
+# | firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree
+# | software, as well as nonfree manuals or documentation.
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Diese Verteilungen sind einsatzbereite Komplettsysteme, deren Entwickler "
 "sich verpflichtet haben, die <cite><a href=\"/distros/free-system-"
@@ -133,37 +226,41 @@
 
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
 msgstr ""
-"<strong>Alle nachfolgenden Verteilungen sind auf der Festplatte eines "
-"Rechners installierbar, die meisten können live ausgeführt werden. In der "
-"freien Welt funktioniert jedoch möglicherweise nicht jegliche Hardware. "
-"Informationen darüber, welche Hardware unterstützt wird, sollte über die "
-"Internetpräsenz der <ins>entsprechenden</ins> Verteilung abrufbar sein.</"
-"strong>."
 
 #. type: Content of: <p>
+# | [-<strong>All of the-]{+The+} distributions that follow are installable to
+# | a computer's hard drive [-and most-] {+and/or+} can be run
+# | [-live.</strong>-] {+live.+}
+#, fuzzy
+#| msgid ""
+#| "<strong>All of the distributions that follow are installable to a "
+#| "computer's hard drive and most can be run live.</strong>"
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
-msgstr ""
-"Wir befürworten diese Verteilungen nur unter dem Gesichtspunkt der Freiheit. 
"
-"Wir beurteilen oder vergleichen diese nach keinem anderen Kriterium<!--, "
-"daher erfolgt die Nennung in alphabetischer Reihenfolge-->. Wir empfehlen "
-"für weitere Informationen die jeweilige Internetpräsenz zu besuchen, um die 
"
-"am besten passende auszuwählen.<br /><br /><em><small>(in alphabetischer "
-"Reihenfolge)</small></em>"
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
+msgstr ""
+"<strong>Alle nachfolgenden Verteilungen sind auf der Festplatte eines "
+"Rechners installierbar und die meisten können live ausgeführt werden.</"
+"strong>"
 
 #. type: Content of: <table><thead><tr><th>
 msgid "Distribution"
 msgstr "Verteilung"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+# | {+Brief+} Description
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Beschreibung"
 
 #. type: Content of: <table><tr><td><a>
@@ -184,7 +281,10 @@
 "<b>BLAG</b> ist ein freies Derivat der GNU/Linux-Verteilung <b>Fedora</b>."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+# | <a [-href=\"http://dragora.org\";>-] {+href=\"https://dragora.org/\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"https://dragora.org/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -211,10 +311,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"<b>Dynebolic</b> ist eine freie Live-GNU/Linux-Verteilung mit besonderem "
-"Schwerpunkt auf Multimedia."
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -262,13 +361,17 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"<b>Musix</b> ist ein freies Derivat der GNU/Linux-Verteilung <b>Knoppix</b> "
-"mit besonderem Schwerpunkt auf Audio-Produktion."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+# | <a [-href=\"http://www.parabola.nu/https/\";>-]
+# | {+href=\"https://www.parabola.nu\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"https://www.parabola.nu/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -300,7 +403,10 @@
 "mit Schwerpunkt auf Privatsphäre, Sicherheit und Komfort."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+# | <a href=\"http{+s+}://trisquel.info/\">
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"https://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -325,13 +431,27 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+# | Ututo [-X-]S, a GNU/Linux [-distribution based on Gentoo.-] {+100% free
+# | distribution.+}  It was the first fully free GNU/Linux system recognized
+# | by the GNU Project.
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "<b>Ututo XS</b>, das erste vollständig vom GNU-Projekt anerkannte freie 
GNU/"
 "Linux-System, ist ein freies Derivat der GNU/Linux-Verteilung <b>Gentoo</b>."
 
+#. type: Content of: <h3>
+# | [-Free-]{+Small+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Freie GNU/Linux-Verteilungen"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -387,6 +507,13 @@
 "ermöglicht binäre Pakete zur Build- und Laufzeit für verschiedene 
Hardware- "
 "und Anwendungsfälle zu konfigurieren."
 
+#. type: Content of: <h3>
+# | [-Free-]{+How to get free+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Freie GNU/Linux-Verteilungen"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -403,32 +530,33 @@
 "die Systemadministratoren der FSF unter <a href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a> anfordern."
 
+# # test link to #allgnupkgs
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"<a href=\"/distros/free-non-gnu-distros\">Freie GNU-fremde "
-"Systemdistributionen</a> sind gesondert abrufbar."
+"<a href=\"/software/#allgnupkgs\">Einzelne GNU-Pakete</a> werden separat "
+"beschrieben (die meisten sind bereits in freien Verteilungen enthalten)."
 
 #. type: Content of: <p>
-msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+# | We list <a [-href=\"/links/companies.html\">companies-]
+# | 
{+href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-freedom\";>
+# | companies+} that sell hardware preinstalled with a free GNU/Linux
+# | distribution</a> separately.
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
+msgid ""
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "Außerdem sind in einer weiteren Übersicht <cite><a href=\"/links/companies"
 "\">Unternehmen, die Rechner mit vorinstalliertem GNU/Linux verkaufen</a></"
 "cite>, aufgeführt."
 
-# # test link to #allgnupkgs
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"<a href=\"/software/#allgnupkgs\">Einzelne GNU-Pakete</a> werden separat "
-"beschrieben (die meisten sind bereits in freien Verteilungen enthalten)."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "Etwas gefunden, was wir übersehen haben?"
@@ -522,8 +650,14 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 201<ins>0</ins>-2018 Free Software Foundation, Inc."
+# | Copyright &copy; 2014, 2015, 2016, [-2017-] {+2017, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; <ins>2010-</ins>2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -547,6 +681,58 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Alle nachfolgenden Verteilungen sind auf der Festplatte eines "
+#~ "Rechners installierbar, die meisten können live ausgeführt werden. In 
der "
+#~ "freien Welt funktioniert jedoch möglicherweise nicht jegliche Hardware. "
+#~ "Informationen darüber, welche Hardware unterstützt wird, sollte über 
die "
+#~ "Internetpräsenz der <ins>entsprechenden</ins> Verteilung abrufbar sein.</"
+#~ "strong>."
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "Wir befürworten diese Verteilungen nur unter dem Gesichtspunkt der "
+#~ "Freiheit. Wir beurteilen oder vergleichen diese nach keinem anderen "
+#~ "Kriterium<!--, daher erfolgt die Nennung in alphabetischer Reihenfolge--"
+#~ ">. Wir empfehlen für weitere Informationen die jeweilige Internetpräsenz 
"
+#~ "zu besuchen, um die am besten passende auszuwählen.<br /><br 
/><em><small>"
+#~ "(in alphabetischer Reihenfolge)</small></em>"
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "<b>Dynebolic</b> ist eine freie Live-GNU/Linux-Verteilung mit besonderem "
+#~ "Schwerpunkt auf Multimedia."
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "<b>Musix</b> ist ein freies Derivat der GNU/Linux-Verteilung <b>Knoppix</"
+#~ "b> mit besonderem Schwerpunkt auf Audio-Produktion."
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "<a href=\"/distros/free-non-gnu-distros\">Freie GNU-fremde "
+#~ "Systemdistributionen</a> sind gesondert abrufbar."
+
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 201<ins>0</ins>-2018 Free Software Foundation, Inc."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"https://www.dyne.org/\";>"
 
@@ -815,14 +1001,6 @@
 #~ "erwerben</a>."
 
 #~ msgid ""
-#~ "<strong>All of the distributions that follow are installable to a "
-#~ "computer's hard drive and most can be run live.</strong>"
-#~ msgstr ""
-#~ "<strong>Alle nachfolgenden Verteilungen sind auf der Festplatte eines "
-#~ "Rechners installierbar und die meisten können live ausgeführt werden.</"
-#~ "strong>"
-
-#~ msgid ""
 #~ "We cannot make a general recommendation for using one over another, so "
 #~ "they are listed here in alphabetical order.  We encourage you to read "
 #~ "these brief descriptions and even more to explore their respective web "

Index: distros/po/free-distros.es.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.es.po,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- distros/po/free-distros.es.po       22 Dec 2017 11:21:25 -0000      1.166
+++ distros/po/free-distros.es.po       14 Apr 2018 11:33:14 -0000      1.167
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -20,6 +20,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-04-14 11:27+0000\n"
 "X-Generator: Poedit 1.8.11\n"
 
 # type: Content of: <title>
@@ -35,23 +36,86 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Distribuciones libres de GNU/Linux"
 
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Índice general"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+# | [-See-]{+<a href=\"#NewDistro\">See+} something we [-missed?-]
+# | {+missed?</a>+}
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "¿Falta algo?"
+
 # type: Content of: <p>
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+# | [-<em><span class=\"highlight\">The-]{+<em>The+} <a
+# | href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not
+# | responsible for other web[- -]sites, or how up-to-date their information
+# | [-is.</span></em>-] {+is.</em>+}
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\">La <a href=\"http://www.fsf.org/\";><cite>Free "
 "Software Foundation</cite></a> no se responsabiliza de otros sitios web, ni "
 "de que sus contenidos estén actualizados.</span></em>"
 
-#. type: Content of: <p>
+# type: Content of: <h3>
+#. type: Content of: <h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "Introducción"
+
+#. type: Content of: <p>
+# | This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>
+# | distributions that are entirely <a
+# | href=\"/philosophy/free-sw.html\">free</a> as in freedom.  [-All of the-] 
+# | {+Non-GNU-based free system+} distributions [-that follow-] are
+# | [-installable to a computer's hard drive; most can be run live.-] {+listed
+# | <a href=\"/distros/free-non-gnu-distros.html\">separately</a>.+}
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "En esta página se incluyen las distribuciones <a href=\"/gnu/linux-and-gnu."
 "html\">GNU/Linux</a> que son completamente <a href=\"/philosophy/free-sw.html"
@@ -59,13 +123,25 @@
 "pueden instalar en el disco duro; la mayoría funciona sin instalación."
 
 #. type: Content of: <p>
+# | The Free Software Foundation recommends and endorses these GNU/Linux
+# | distros, although [-we-] {+<strong>we+} do not try to judge or compare
+# | them based on any criterion other than [-freedom;-] {+freedom</strong>;+}
+# | therefore, we list them in alphabetical order.  [-We encourage you to read
+# | these brief descriptions and to consult their respective web sites and
+# | other information to choose the one best for you.-]
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "La <cite>Free Software Foundation</cite> recomienda y respalda estas "
 "distribuciones GNU/Linux, pero no trata de juzgarlas o compararlas en base a "
@@ -76,14 +152,32 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | These distros are ready-to-use full systems whose developers have made a
+# | commitment to follow the <a
+# | href=\"/distros/free-system-distribution-guidelines.html\">Guidelines for
+# | Free System Distributions</a>.  This means [-these distros-] {+they+} will
+# | include, and propose, exclusively free software.  They will reject nonfree
+# | applications, nonfree programming platforms, nonfree drivers, nonfree
+# | firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree
+# | software, as well as nonfree manuals or documentation.
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Estas distribuciones están completas y listas para usar, y sus "
 "desarrolladores se han comprometido a seguir las <a href=\"/distros/free-"
@@ -143,27 +237,21 @@
 
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
-msgstr ""
-"<strong>Todas las distribuciones que se mencionan a continuación se pueden "
-"instalar en el disco duro de un ordenador. La mayoría funciona sin "
-"instalación. No todo el hardware funciona en el mundo libre; el sitio de "
-"cada distribución debería indicar qué tipo de hardware soporta.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
-msgstr ""
-"Respaldamos estas distribuciones solo por la libertad.  No tratamos de "
-"juzgarlas o compararlas en base a ningún otro criterio. Por lo tanto, las "
-"ponemos en orden alfabético. Para evaluar cuál es la que mejor se adapta a "
-"sus necesidades, sugerimos consultar sus respectivos sitios web y cualquier "
-"otra información disponible."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
+msgstr ""
 
 # type: Content of: <table><thead><tr><th>
 #. type: Content of: <table><thead><tr><th>
@@ -172,7 +260,10 @@
 
 # type: Content of: <table><thead><tr><th>
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+# | {+Brief+} Description
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Descripción"
 
 # type: Content of: <table><tr><td><a>
@@ -195,7 +286,10 @@
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+# | <a [-href=\"http://dragora.org\";>-] {+href=\"https://dragora.org/\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -221,14 +315,12 @@
 msgid "Dynebolic"
 msgstr "Dynebolic"
 
-# type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic, una distribución de GNU/Linux que pone un énfasis especial en la 
"
-"edición de audio y vídeo."
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
@@ -277,18 +369,21 @@
 msgid "Musix GNU+Linux"
 msgstr "Musix GNU+Linux"
 
-# type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix GNU+Linux, una distribución de GNU/Linux basada en Knoppix, con un "
-"énfasis especial en la producción de audio."
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+# | <a [-href=\"http://www.parabola.nu/https/\";>-]
+# | {+href=\"https://www.parabola.nu\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -323,7 +418,10 @@
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+# | <a href=\"http{+s+}://trisquel.info/\">
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 # type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -350,13 +448,28 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+# | Ututo [-X-]S, a GNU/Linux [-distribution based on Gentoo.-] {+100% free
+# | distribution.+}  It was the first fully free GNU/Linux system recognized
+# | by the GNU Project.
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS, una distribución GNU/Linux basada en Gentoo. Fue el primer sistema 
"
 "GNU/Linux completamente libre reconocido por el Proyecto GNU."
 
+# type: Content of: <h2>
+#. type: Content of: <h3>
+# | [-Free-]{+Small+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Distribuciones libres de GNU/Linux"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -413,6 +526,14 @@
 "los paquetes binarios en el momento de la compilación o en tiempo de "
 "ejecución, según los diferentes tipos de hardware y usos."
 
+# type: Content of: <h2>
+#. type: Content of: <h3>
+# | [-Free-]{+How to get free+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Distribuciones libres de GNU/Linux"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -430,31 +551,31 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"Las distribuciones libres de sistemas que no están basados en GNU se "
-"encuentran en una <a href=\"/distros/free-non-gnu-distros.html\">lista "
-"separada</a>."
+"Puede encontrar por separado <a href=\"/software/software.html\">los "
+"paquetes individuales de GNU</a> (la mayoría de los cuales están incluidos "
+"en las distribuciones libres que se mencionan aquí)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+# | We list <a [-href=\"/links/companies.html\">companies-]
+# | 
{+href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-freedom\";>
+# | companies+} that sell hardware preinstalled with a free GNU/Linux
+# | distribution</a> separately.
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
+msgid ""
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "Tenemos otra lista aparte con <a href=\"/links/companies.html\">las empresas "
 "que venden hardware con una distribución libre de GNU/Linux 
preinstalada</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"Puede encontrar por separado <a href=\"/software/software.html\">los "
-"paquetes individuales de GNU</a> (la mayoría de los cuales están incluidos "
-"en las distribuciones libres que se mencionan aquí)."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "¿Falta algo?"
@@ -549,7 +670,13 @@
 "de este sitio web."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+# | Copyright &copy; 2014, 2015, 2016, [-2017-] {+2017, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -574,6 +701,58 @@
 msgid "Updated:"
 msgstr "Última actualización:"
 
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Todas las distribuciones que se mencionan a continuación se "
+#~ "pueden instalar en el disco duro de un ordenador. La mayoría funciona sin 
"
+#~ "instalación. No todo el hardware funciona en el mundo libre; el sitio de "
+#~ "cada distribución debería indicar qué tipo de hardware 
soporta.</strong>"
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "Respaldamos estas distribuciones solo por la libertad.  No tratamos de "
+#~ "juzgarlas o compararlas en base a ningún otro criterio. Por lo tanto, las 
"
+#~ "ponemos en orden alfabético. Para evaluar cuál es la que mejor se adapta 
"
+#~ "a sus necesidades, sugerimos consultar sus respectivos sitios web y "
+#~ "cualquier otra información disponible."
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, una distribución de GNU/Linux que pone un énfasis especial en 
"
+#~ "la edición de audio y vídeo."
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix GNU+Linux, una distribución de GNU/Linux basada en Knoppix, con un "
+#~ "énfasis especial en la producción de audio."
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "Las distribuciones libres de sistemas que no están basados en GNU se "
+#~ "encuentran en una <a href=\"/distros/free-non-gnu-distros.html\">lista "
+#~ "separada</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+
 # type: Content of: <table><tr><td><a>
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"

Index: distros/po/free-distros.fr.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.fr.po,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- distros/po/free-distros.fr.po       21 Dec 2017 18:10:45 -0000      1.165
+++ distros/po/free-distros.fr.po       14 Apr 2018 11:33:14 -0000      1.166
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2017-12-21 19:09+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\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: 2018-04-14 11:27+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -31,22 +32,84 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Distributions GNU/Linux libres"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Table des matières"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+# | [-See-]{+<a href=\"#NewDistro\">See+} something we [-missed?-]
+# | {+missed?</a>+}
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "Vous voyez quelque chose qui manque ?"
+
+#. type: Content of: <div><p>
+# | [-<em><span class=\"highlight\">The-]{+<em>The+} <a
+# | href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not
+# | responsible for other web[- -]sites, or how up-to-date their information
+# | [-is.</span></em>-] {+is.</em>+}
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\">La <a href=\"http://www.fsf.org/\";>Free "
 "Software Foundation</a> n'est pas responsable des autres sites web ni de "
 "l'actualisation de l'information qui s'y trouve.</span></em>"
 
-#. type: Content of: <p>
+#. type: Content of: <h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "Introduction"
+
+#. type: Content of: <p>
+# | This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>
+# | distributions that are entirely <a
+# | href=\"/philosophy/free-sw.html\">free</a> as in freedom.  [-All of the-] 
+# | {+Non-GNU-based free system+} distributions [-that follow-] are
+# | [-installable to a computer's hard drive; most can be run live.-] {+listed
+# | <a href=\"/distros/free-non-gnu-distros.html\">separately</a>.+}
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "Cette page répertorie les distributions <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> qui sont entièrement <a href=\"/philosophy/free-sw.html"
@@ -55,13 +118,25 @@
 "peuvent fonctionner en mode « live » (sans installation)."
 
 #. type: Content of: <p>
+# | The Free Software Foundation recommends and endorses these GNU/Linux
+# | distros, although [-we-] {+<strong>we+} do not try to judge or compare
+# | them based on any criterion other than [-freedom;-] {+freedom</strong>;+}
+# | therefore, we list them in alphabetical order.  [-We encourage you to read
+# | these brief descriptions and to consult their respective web sites and
+# | other information to choose the one best for you.-]
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "La Free Software Foundation recommande et cautionne ces distributions GNU/"
 "Linux. Nous n'essayons pas de les juger ni de les comparer sur la base de "
@@ -71,14 +146,32 @@
 "d'information, pour choisir celle qui vous convient le mieux."
 
 #. type: Content of: <p>
+# | These distros are ready-to-use full systems whose developers have made a
+# | commitment to follow the <a
+# | href=\"/distros/free-system-distribution-guidelines.html\">Guidelines for
+# | Free System Distributions</a>.  This means [-these distros-] {+they+} will
+# | include, and propose, exclusively free software.  They will reject nonfree
+# | applications, nonfree programming platforms, nonfree drivers, nonfree
+# | firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree
+# | software, as well as nonfree manuals or documentation.
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Ces distributions sont des systèmes complets, prêts à l'emploi, dont les "
 "développeurs se sont engagés à suivre les <a href=\"/distros/free-system-"
@@ -139,35 +232,31 @@
 
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
-msgstr ""
-"<strong>Les distributions suivantes sont toutes installables sur un disque "
-"dur d'ordinateur et la plupart peuvent être exécutées à partir d'un "
-"périphérique amovible. Les composants matériels ne fonctionnent pas tous "
-"dans le monde du libre ; le site de chaque distribution doit indiquer quels "
-"matériels elle gère.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
-msgstr ""
-"Nous ne cautionnons ces distributions que du point de vue de la liberté. "
-"Nous n'essayons pas de les juger ni de les comparer sur la base d'autres "
-"critères ; c'est pourquoi elles sont classées ici par ordre alphabétique. 
"
-"Nous vous invitons à consulter leurs sites web respectifs ainsi que les "
-"autres sources d'information pour décider laquelle vous convient le mieux."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
+msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
 msgid "Distribution"
 msgstr "Distribution"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+# | {+Brief+} Description
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Description"
 
 #. type: Content of: <table><tr><td><a>
@@ -187,7 +276,10 @@
 msgstr "BLAG Linux et GNU, une distribution GNU/Linux basée sur Fedora."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+# | <a [-href=\"http://dragora.org\";>-] {+href=\"https://dragora.org/\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -213,10 +305,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic, une distribution GNU/Linux qui met l'accent sur le montage audio "
-"et vidéo."
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -264,13 +355,17 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix, une distribution GNU/Linux basée sur Knoppix, qui met l'accent sur la 
"
-"production audio."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+# | <a [-href=\"http://www.parabola.nu/https/\";>-]
+# | {+href=\"https://www.parabola.nu\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -302,7 +397,10 @@
 "respect de la vie privée, la sécurité et la commodité."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+# | <a href=\"http{+s+}://trisquel.info/\">
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -326,13 +424,27 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+# | Ututo [-X-]S, a GNU/Linux [-distribution based on Gentoo.-] {+100% free
+# | distribution.+}  It was the first fully free GNU/Linux system recognized
+# | by the GNU Project.
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS, une distribution GNU/Linux basée sur Gentoo. Ce fut le premier "
 "système GNU/Linux entièrement libre reconnu par le projet GNU."
 
+#. type: Content of: <h3>
+# | [-Free-]{+Small+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Distributions GNU/Linux libres"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -387,6 +499,13 @@
 "configurer les paquets binaires au moment de la compilation ou au moment de "
 "l'exécution pour des appareils et des usages divers."
 
+#. type: Content of: <h3>
+# | [-Free-]{+How to get free+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Distributions GNU/Linux libres"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -404,30 +523,31 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"Les distributions libres de systèmes non basés sur GNU sont dans <a 
href=\"/"
-"distros/free-non-gnu-distros.html\">une liste séparée.</a>"
+"<a href=\"/software/software.html\">Les paquets GNU individuels</a> (la "
+"plupart faisant partie des distributions libres présentées ici) sont "
+"disponibles séparément."
 
 #. type: Content of: <p>
-msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+# | We list <a [-href=\"/links/companies.html\">companies-]
+# | 
{+href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-freedom\";>
+# | companies+} that sell hardware preinstalled with a free GNU/Linux
+# | distribution</a> separately.
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
+msgid ""
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "Nous référençons séparément les <a 
href=\"/links/companies.html\">sociétés "
 "qui vendent du matériel avec des distributions GNU/Linux libres "
 "préinstallées</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"<a href=\"/software/software.html\">Les paquets GNU individuels</a> (la "
-"plupart faisant partie des distributions libres présentées ici) sont "
-"disponibles séparément."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "Vous voyez quelque chose qui manque ?"
@@ -526,7 +646,13 @@
 "README.translations.html\">guide de traduction</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+# | Copyright &copy; 2014, 2015, 2016, [-2017-] {+2017, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -552,6 +678,56 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
 
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Les distributions suivantes sont toutes installables sur un "
+#~ "disque dur d'ordinateur et la plupart peuvent être exécutées à partir "
+#~ "d'un périphérique amovible. Les composants matériels ne fonctionnent 
pas "
+#~ "tous dans le monde du libre ; le site de chaque distribution doit "
+#~ "indiquer quels matériels elle gère.</strong>"
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "Nous ne cautionnons ces distributions que du point de vue de la liberté. "
+#~ "Nous n'essayons pas de les juger ni de les comparer sur la base d'autres "
+#~ "critères ; c'est pourquoi elles sont classées ici par ordre 
alphabétique. "
+#~ "Nous vous invitons à consulter leurs sites web respectifs ainsi que les "
+#~ "autres sources d'information pour décider laquelle vous convient le 
mieux."
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, une distribution GNU/Linux qui met l'accent sur le montage "
+#~ "audio et vidéo."
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix, une distribution GNU/Linux basée sur Knoppix, qui met l'accent sur 
"
+#~ "la production audio."
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "Les distributions libres de systèmes non basés sur GNU sont dans <a 
href="
+#~ "\"/distros/free-non-gnu-distros.html\">une liste séparée.</a>"
+
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"
 

Index: distros/po/free-distros.hr-diff.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.hr-diff.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- distros/po/free-distros.hr-diff.html        22 Dec 2017 07:59:28 -0000      
1.35
+++ distros/po/free-distros.hr-diff.html        14 Apr 2018 11:33:14 -0000      
1.36
@@ -18,42 +18,70 @@
       href="http://www.gnu.org/distros/distros.rss";
       type="application/rss+xml" /&gt;
 <span class="inserted"><ins><em>&lt;style type="text/css" 
media="screen"&gt;&lt;!--
+h2 { margin-bottom: 1.5em; }
+h3 { margin: 1.8em 0 1.3em; }
+.summary {
+   padding-top: .7em; padding-bottom: 1.2em;
+   margin-top: 0;
+   border: .15em dotted #ccc;
+}
+.note { margin-top: .8em; margin-bottom: 1em; }
+p.highlight {
+   border: .1em solid #ccc;
+   margin-bottom: 0;
+}
+table.listing { margin-bottom: 3em; }
 td.icon { width: 20%; }
 td.icon img { max-width: 100%; max-height: 4em; }
address@hidden (max-width: 48em) {
+   .note, .summary { width: 30em; max-width: 93%; }
+}
 --&gt;&lt;/style&gt;</em></ins></span>
-
 &lt;!--#include virtual="/distros/po/free-distros.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;h2&gt;Free GNU/Linux distributions&lt;/h2&gt;
+
+<span class="removed"><del><strong>&lt;p&gt;&lt;em&gt;&lt;span 
class="highlight"&gt;The FSF</strong></del></span>
+
 <span class="inserted"><ins><em>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;
+&lt;div class="summary"&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;
+&lt;ul&gt;
+  &lt;li&gt;&lt;a href="#intro"&gt;Introduction&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#for-pc"&gt;GNU/Linux distros for PCs and 
workstations&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#small-distros"&gt;Small GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#howto-get"&gt;How to get free GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/distros/free-non-gnu-distros.html"&gt;Other free 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#NewDistro"&gt;See something we 
missed?&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p class="highlight"&gt;&lt;em&gt;The &lt;a 
href="http://www.fsf.org/"&gt;Free
+Software Foundation&lt;/a&gt;</em></ins></span> is not responsible for other
+<span class="removed"><del><strong>web sites,</strong></del></span> <span 
class="inserted"><ins><em>websites,</em></ins></span> or how
+up-to-date their information <span 
class="removed"><del><strong>is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt;
 
-&lt;blockquote&gt;</em></ins></span>
-&lt;p&gt;&lt;em&gt;&lt;span class="highlight"&gt;The <span 
class="removed"><del><strong>FSF</strong></del></span> <span 
class="inserted"><ins><em>&lt;a href="http://www.fsf.org/"&gt;Free
-Software Foundation&lt;/a&gt;</em></ins></span> is not responsible for other 
web sites, or how
-up-to-date their information is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt;
+&lt;p&gt;Below are</strong></del></span> <span 
class="inserted"><ins><em>is.&lt;/em&gt;&lt;/p&gt; 
+&lt;/div&gt;
+&lt;hr class="no-display" /&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Below are</strong></del></span> 
-<span class="inserted"><ins><em>&lt;/blockquote&gt;
+&lt;h3 id="intro"&gt;Introduction&lt;/h3&gt;
 
 &lt;p&gt;This page lists</em></ins></span> the <span 
class="removed"><del><strong>complete,
 ready-to-use</strong></del></span> &lt;a 
href="/gnu/linux-and-gnu.html"&gt;GNU/Linux&lt;/a&gt;
 distributions <span class="inserted"><ins><em>that are
 entirely &lt;a href="/philosophy/free-sw.html"&gt;free&lt;/a&gt; as in freedom.
-All of the distributions that follow are installable to a
-computer's hard drive; most can be run live.&lt;/p&gt;
+Non-GNU-based free system distributions are listed &lt;a
+href="/distros/free-non-gnu-distros.html"&gt;separately&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;The Free Software Foundation recommends and endorses these GNU/Linux
-distros, although</em></ins></span> we <span 
class="removed"><del><strong>know</strong></del></span> <span 
class="inserted"><ins><em>do not try to judge or compare them based on any
-criterion other than freedom; therefore, we list them in alphabetical
-order.  We encourage you to read these brief descriptions and to
-consult their respective web sites and other information to choose the
-one best for you.&lt;/p&gt;
+distros, although &lt;strong&gt;we do not try to judge or compare them based 
on any
+criterion other than freedom&lt;/strong&gt;; therefore,</em></ins></span> we 
<span class="removed"><del><strong>know</strong></del></span> <span 
class="inserted"><ins><em>list them in alphabetical
+order.&lt;/p&gt;
 
 &lt;p&gt;These distros are ready-to-use full systems whose developers have made
 a commitment to</em></ins></span> follow the 
 &lt;a href="/distros/free-system-distribution-guidelines.html"&gt;Guidelines
 for Free System Distributions&lt;/a&gt;.  <span 
class="removed"><del><strong>They have a firm policy commitment
-to only include</strong></del></span>  <span class="inserted"><ins><em>This 
means these distros will
+to only include</strong></del></span>  <span class="inserted"><ins><em>This 
means they will
 include,</em></ins></span> and <span class="removed"><del><strong>only 
propose</strong></del></span> <span class="inserted"><ins><em>propose, 
exclusively</em></ins></span> free software.  They <span 
class="inserted"><ins><em>will</em></ins></span> reject <span 
class="removed"><del><strong>non-free</strong></del></span>
 <span class="inserted"><ins><em>nonfree</em></ins></span> applications, <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> programming platforms, 
<span class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> drivers, <span 
class="removed"><del><strong>or
 non-free</strong></del></span>
@@ -73,29 +101,35 @@
 while we inform the developers so they can fix the problem.&lt;/p&gt;
 
 &lt;p&gt;Fixing freedom bugs is an ethical requirement</em></ins></span> for 
<span class="removed"><del><strong>their ongoing work to 
achieve</strong></del></span> <span class="inserted"><ins><em>listing a distro
-here; therefore, we list only distros with a development 
team</em></ins></span> that <span 
class="removed"><del><strong>goal,</strong></del></span> <span 
class="inserted"><ins><em>has
-told us it will remove any nonfree software that might be found in
+here; therefore, we list only distros with a development team that has
+told us it will remove any nonfree software</em></ins></span> that <span 
class="removed"><del><strong>goal,</strong></del></span> <span 
class="inserted"><ins><em>might be found in
 them.  Usually the team consists of volunteers,</em></ins></span> and <span 
class="removed"><del><strong>hope</strong></del></span> <span 
class="inserted"><ins><em>they don't make
 legally binding commitments</em></ins></span> to <span 
class="inserted"><ins><em>users; but if we find out a distro is
 not properly maintained, we will de-list it.&lt;/p&gt;
 
 &lt;p&gt;We hope the other existing GNU/Linux distributions will become
-entirely free software so that we can</em></ins></span> list them <span 
class="removed"><del><strong>here some day.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>here.  If you wish to
-improve the state of free distros, helping to develop an existing free
-distro contributes more than starting a new one.&lt;/p&gt;</em></ins></span>
-
-&lt;p&gt;&lt;strong&gt;All of the distributions that follow are installable to 
a
-computer's hard <span class="removed"><del><strong>drive 
and</strong></del></span> <span 
class="inserted"><ins><em>drive;</em></ins></span> most can be run <span 
class="removed"><del><strong>live.&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>live.  Not all hardware works
-in the free world; each distro's site should say which hardware it
-supports.&lt;/strong&gt;&lt;/p&gt;</em></ins></span>
-
-&lt;p&gt;We <span class="removed"><del><strong>cannot make a general 
recommendation</strong></del></span> <span class="inserted"><ins><em>endorse 
these distros only</em></ins></span> for <span 
class="removed"><del><strong>using one over another,
-so they are listed here</strong></del></span> <span 
class="inserted"><ins><em>freedom.  We do not try to judge
-or compare these distros based on any other criterion; therefore, we
-list them</em></ins></span> in alphabetical order.  We <span 
class="removed"><del><strong>encourage</strong></del></span> <span 
class="inserted"><ins><em>suggest</em></ins></span> you <span 
class="removed"><del><strong>to read
-these brief descriptions and even more to explore</strong></del></span> <span 
class="inserted"><ins><em>consult</em></ins></span> their
-respective web sites and other information to <span 
class="removed"><del><strong>choose the</strong></del></span> <span 
class="inserted"><ins><em>judge which</em></ins></span> one <span 
class="removed"><del><strong>best</strong></del></span> <span 
class="inserted"><ins><em>is most
-convenient</em></ins></span> for you.&lt;/p&gt;
+entirely free software so that we can</em></ins></span> list them <span 
class="removed"><del><strong>here some day.&lt;/p&gt;
+
+&lt;p&gt;&lt;strong&gt;All</strong></del></span> <span 
class="inserted"><ins><em>here.  If you wish to
+improve the state</em></ins></span> of <span class="inserted"><ins><em>free 
distros, helping to develop an existing free
+distro contributes more than starting a new one.&lt;/p&gt;
+
+&lt;p&gt;Please note that not all hardware works in the free world; each
+distro's site should say which hardware it supports. We suggest that,
+after reading</em></ins></span> the <span class="inserted"><ins><em>short 
descriptions below, you consult these sites as
+well as other available information, to judge which distro is most
+convenient for you.&lt;/p&gt;
+
+&lt;h3 id="for-pc"&gt;GNU/Linux distros for PCs and
+workstations&lt;/h3&gt;
+
+&lt;p&gt;The</em></ins></span> distributions that follow are installable to a 
computer's hard
+drive <span class="removed"><del><strong>and most</strong></del></span> <span 
class="inserted"><ins><em>and/or</em></ins></span> can be run <span 
class="removed"><del><strong>live.&lt;/strong&gt;&lt;/p&gt;
+
+&lt;p&gt;We cannot make a general recommendation for using one over another,
+so they are listed here in alphabetical order.  We encourage you to read
+these brief descriptions and even more to explore their respective web
+sites and other information to choose the one best for 
you.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>live.&lt;/p&gt;</em></ins></span>
 
 &lt;!-- Do not add or remove anything from this list without a lot of
      discussion, following the usual process, and confirmation by RMS. See 
@@ -104,10 +138,11 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
-&lt;tr class="odd"&gt;
+  &lt;tr class="odd"&gt;
    <span class="removed"><del><strong>&lt;td&gt;&lt;a</strong></del></span>
    <span class="inserted"><ins><em>&lt;td 
class="icon"&gt;&lt;a</em></ins></span> href="http://www.blagblagblag.org/"&gt;
        &lt;img src="/graphics/distros-blag.jpg" alt="BLAG Linux and GNU" 
/&gt;&lt;/a&gt;&lt;/td&gt;
@@ -115,7 +150,7 @@
 
  &lt;tr class="even"&gt;
    <span class="removed"><del><strong>&lt;td&gt;&lt;a 
href="http://www.dragora.org/en/index.html"&gt;</strong></del></span>
-   <span class="inserted"><ins><em>&lt;td class="icon"&gt;&lt;a 
href="http://dragora.org"&gt;</em></ins></span>
+   <span class="inserted"><ins><em>&lt;td class="icon"&gt;&lt;a 
href="https://dragora.org/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-dragora.png" <span 
class="removed"><del><strong>alt="Dragora"</strong></del></span>
             <span class="inserted"><ins><em>alt="Dragora 
GNU/Linux-Libre"</em></ins></span> /&gt;&lt;/a&gt;&lt;/td&gt;
    <span class="removed"><del><strong>&lt;td&gt;Dragora,</strong></del></span>
@@ -127,7 +162,10 @@
    <span class="inserted"><ins><em>&lt;td class="icon"&gt;&lt;a 
href="https://www.dyne.org/software/dynebolic/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-dyen.png" alt="Dynebolic" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Dynebolic, a GNU/Linux distribution with special emphasis on 
audio 
-       and video editing.&lt;/td&gt;&lt;/tr&gt;
+       and video
+       <span 
class="removed"><del><strong>editing.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>editing. This is a &ldquo;static&rdquo; 
distro, normally
+       run from a live CD. Since it will not receive security updates, it
+       should be used offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr class="even"&gt;
    <span class="removed"><del><strong>&lt;td&gt;&lt;a</strong></del></span>
@@ -144,16 +182,17 @@
        on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
        functional package manager for the GNU system. &lt;/td&gt;&lt;/tr&gt;
 
-    
  &lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a 
href="https://musixdistro.wordpress.com/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Musix, a GNU+Linux distribution based on Knoppix, with special
-       emphasis on audio production.&lt;/td&gt;&lt;/tr&gt;
+       emphasis on audio <span 
class="removed"><del><strong>production.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>production. This is a &ldquo;static&rdquo;
+       distro, normally run from a live CD. Since it will not receive
+       security updates, it should be used 
offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr <span class="removed"><del><strong>class="even"&gt;
    &lt;td&gt;&lt;a 
href="http://parabolagnulinux.org"&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="odd"&gt;
-   &lt;td class="icon"&gt;&lt;a 
href="http://www.parabola.nu/https/"&gt;</em></ins></span>
+   &lt;td class="icon"&gt;&lt;a 
href="https://www.parabola.nu"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-parabola.png"
             alt="Parabola <span 
class="removed"><del><strong>GNU/Linux"</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux-libre"</em></ins></span> 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Parabola <span 
class="removed"><del><strong>GNU/Linux,</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux-libre,</em></ins></span> a distribution 
based on Arch that
@@ -161,14 +200,14 @@
 
  &lt;tr <span class="inserted"><ins><em>class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="https://pureos.net/"&gt;
-       &lt;img src="/graphics/pureos-logo-small.png"
+       &lt;img src="/graphics/pureos-logo-small.png" style="max-height: 1.8em;"
             alt="PureOS" /&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;PureOS, a GNU distribution based on Debian with a focus on
        privacy, security, and convenience.&lt;/td&gt;&lt;/tr&gt;
  
  &lt;tr</em></ins></span> class="odd"&gt;
-   <span class="removed"><del><strong>&lt;td&gt;&lt;a</strong></del></span>
-   <span class="inserted"><ins><em>&lt;td 
class="icon"&gt;&lt;a</em></ins></span> href="http://trisquel.info/"&gt;
+   <span class="removed"><del><strong>&lt;td&gt;&lt;a 
href="http://trisquel.info/"&gt;</strong></del></span>
+   <span class="inserted"><ins><em>&lt;td class="icon"&gt;&lt;a 
href="https://trisquel.info/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-trisquel.png" alt="Trisquel" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Trisquel, a GNU/Linux distribution based on Ubuntu that's 
oriented 
  toward small enterprises, domestic users and educational 
centers.&lt;/td&gt;&lt;/tr&gt;
@@ -176,12 +215,16 @@
 <span class="inserted"><ins><em>&lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="http://www.ututo.org/"&gt;
        &lt;img src="/graphics/distros-ututo.png" alt="Ututo" 
/&gt;&lt;/a&gt;&lt;/td&gt;
-   &lt;td&gt;Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the 
first
+   &lt;td&gt;Ututo S, a GNU/Linux 100% free distribution.  It was the first
        fully free GNU/Linux system recognized by the GNU 
Project.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
 &lt;/table&gt;
 
-&lt;p id="small-distros"&gt;Below is a list of small system distributions. 
These 
+<span class="removed"><del><strong>&lt;p 
id="small-distros"&gt;Below</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 id="small-distros"&gt;Small GNU/Linux 
distros&lt;/h3&gt;
+
+&lt;p&gt;Below</em></ins></span> is a list of small system distributions. 
These 
    distributions are meant for devices with limited resources, like a 
    wireless router for example. A free small system distribution is not 
    self-hosting, but it must be developable and buildable on top of one of 
@@ -190,7 +233,8 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
  &lt;tr class="odd"&gt;
@@ -213,6 +257,8 @@
 
 &lt;/table&gt;
 
+<span class="inserted"><ins><em>&lt;h3 id="howto-get"&gt;How to get free 
GNU/Linux distros&lt;/h3&gt;</em></ins></span>
+
 &lt;p&gt;In addition to their own sites, many of these distributions are
 available from &lt;a href="http://mirror.fsf.org/"&gt;mirror.fsf.org&lt;/a&gt;.
 Feel free to download or mirror the distributions from there,
@@ -220,16 +266,18 @@
 mirror for their project by mailing the 
 &lt;a href="mailto:address@hidden"&gt;FSF sysadmins&lt;/a&gt;.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p id="other-free"&gt;Non-GNU-based free 
system distributions are
-listed in &lt;a href="/distros/free-non-gnu-distros.html"&gt;a separate 
file&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-
-&lt;p&gt;We list &lt;a href="/links/companies.html"&gt;companies that sell 
hardware
-preinstalled with a free GNU/Linux distribution&lt;/a&gt; separately.&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;We list &lt;a 
href="/links/companies.html"&gt;companies that sell hardware
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</strong></del></span>
 
 &lt;p&gt;&lt;a href="/software/software.html"&gt;Individual GNU
 packages&lt;/a&gt; (most of which are included in the free distributions here) 
 are described separately.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;p&gt;We list &lt;a
+href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom"&gt;
+companies that sell hardware
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</em></ins></span>
+
 &lt;h3 id="NewDistro"&gt;See something we missed?&lt;/h3&gt;
 
 &lt;p&gt;Do you know about a distribution that you expected to find on our
@@ -299,7 +347,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2011, 
2012</strong></del></span> <span class="inserted"><ins><em>2014, 2015, 2016, 
2017</em></ins></span> Free Software Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2011, 
2012</strong></del></span> <span class="inserted"><ins><em>2014, 2015, 2016, 
2017, 2018</em></ins></span> Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 <span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
@@ -312,7 +360,7 @@
 
 <span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2017/12/22 07:59:28 $
+$Date: 2018/04/14 11:33:14 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: distros/po/free-distros.hr.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.hr.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- distros/po/free-distros.hr.po       21 Dec 2017 17:59:24 -0000      1.41
+++ distros/po/free-distros.hr.po       14 Apr 2018 11:33:14 -0000      1.42
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2014-02-04 19:53+0100\n"
 "Last-Translator: Martina Bebek <address@hidden>\n"
 "Language-Team: GNU Croatian Translation Team <address@hidden>\n"
@@ -31,32 +31,83 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Slobodne distribucije GNU/Linuxa"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Sadržaj"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+# | [-See-]{+<a href=\"#NewDistro\">See+} something we [-missed?-]
+# | {+missed?</a>+}
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "Vidite li nešto što nam je promaklo?"
+
+#. type: Content of: <div><p>
+# | [-<em><span class=\"highlight\">The-]{+<em>The+} <a
+# | href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not
+# | responsible for other web[- -]sites, or how up-to-date their information
+# | [-is.</span></em>-] {+is.</em>+}
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\"><a href=\"http://www.fsf.org/\";>Zaklada za "
 "slobodan softver</a> nije odgovoran za druge mrežne stranice, niti za "
 "ažurnost informacija na njima.</span></em>"
 
+#. type: Content of: <h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "Uvod"
+
 #. type: Content of: <p>
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 
 #. type: Content of: <p>
 # | [-We cannot make a general recommendation for using one over another, so
-# | they are listed here-]{+The Free Software Foundation recommends and
-# | endorses these GNU/Linux distros, although we do not try to judge or
-# | compare them based on any criterion other than freedom; therefore, we list
-# | them+} in alphabetical order.  We encourage you to read these brief
-# | descriptions and [-even more-] to [-explore-] {+consult+} their respective
-# | web sites and other information to choose the one best for you.
+# | they are listed here in alphabetical order.  We encourage you to read
+# | these brief descriptions-]{+The Free Software Foundation recommends+} and
+# | [-even more-] {+endorses these GNU/Linux distros, although <strong>we do
+# | not try+} to [-explore their respective web sites and-] {+judge or compare
+# | them based on any criterion+} other [-information to choose the one best
+# | for you.-] {+than freedom</strong>; therefore, we list them in
+# | alphabetical order.+}
 #, fuzzy
 #| msgid ""
 #| "We cannot make a general recommendation for using one over another, so "
@@ -65,11 +116,9 @@
 #| "sites and other information to choose the one best for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "Nismo u mogućnosti preporučiti korištenje jedne distribucije ispred 
drugih, "
 "stoga su u ovoj listi navedene abecednim redom. Potičemo vas da pročitate "
@@ -82,15 +131,15 @@
 # | {+full systems whose developers have made a commitment to+} follow the <a
 # | href=\"/distros/free-system-distribution-guidelines.html\">Guidelines for
 # | Free System Distributions</a>.  [-They have a firm policy commitment to
-# | only include-]  {+This means these distros will include,+} and [-only
-# | propose-] {+propose, exclusively+} free software.  They {+will+} reject
-# | nonfree applications, nonfree programming platforms, nonfree drivers,
-# | [-or-] nonfree firmware [-&ldquo;blobs&rdquo;.  If by mistake they do
-# | include any, they remove it.  If you have found such-]
-# | {+&ldquo;blobs&rdquo;,+} nonfree [-software or documentation in one of
-# | these distributions, you can <a href=\"/help/gnu-bucks.html\">report the
-# | issue-] {+games,+} and [-earn GNU Bucks</a>.-] {+any other nonfree
-# | software, as well as nonfree manuals or documentation.+}
+# | only include-]  {+This means they will include,+} and [-only propose-]
+# | {+propose, exclusively+} free software.  They {+will+} reject nonfree
+# | applications, nonfree programming platforms, nonfree drivers, [-or-]
+# | nonfree firmware [-&ldquo;blobs&rdquo;.  If by mistake they do include
+# | any, they remove it.  If you have found such-] {+&ldquo;blobs&rdquo;,+}
+# | nonfree [-software or documentation in one of these distributions, you can
+# | <a href=\"/help/gnu-bucks.html\">report the issue-] {+games,+} and [-earn
+# | GNU Bucks</a>.-] {+any other nonfree software, as well as nonfree manuals
+# | or documentation.+}
 #, fuzzy
 #| msgid ""
 #| "Below are the complete, ready-to-use <a href=\"/gnu/linux-and-gnu.html"
@@ -107,10 +156,10 @@
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Niže donosimo potpune i spremne za uporabu distribucije <a 
href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linuxa</a>  za koje znamo da slijede <a href=\"/distros/"
@@ -167,53 +216,32 @@
 "ih jednog dana navesti u ovom popisu."
 
 #. type: Content of: <p>
-# | <strong>All of the distributions that follow are installable to a
-# | computer's hard [-drive and-] {+drive;+} most can be run
-# | [-live.</strong>-] {+live.  Not all hardware works in the free world; each
-# | distro's site should say which hardware it supports.</strong>+}
-#, fuzzy
-#| msgid ""
-#| "<strong>All of the distributions that follow are installable to a "
-#| "computer's hard drive and most can be run live.</strong>"
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
-msgstr ""
-"<strong>Sve distribucije koje slijede mogu se instalirati na tvrdi disk "
-"računala, a većinu je moguće pokrenuti i bez instalacije.</strong>"
-
-#. type: Content of: <p>
-# | We [-cannot make a general recommendation-] {+endorse these distros only+}
-# | for [-using one over another, so they are listed here-] {+freedom.  We do
-# | not try to judge or compare these distros based on any other criterion;
-# | therefore, we list them+} in alphabetical order.  We [-encourage-]
-# | {+suggest+} you [-to read these brief descriptions and even more to
-# | explore-] {+consult+} their respective web sites and other information to
-# | [-choose the-] {+judge which+} one [-best-] {+is most convenient+} for you.
-#, fuzzy
-#| msgid ""
-#| "We cannot make a general recommendation for using one over another, so "
-#| "they are listed here in alphabetical order.  We encourage you to read "
-#| "these brief descriptions and even more to explore their respective web "
-#| "sites and other information to choose the one best for you."
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
+msgstr ""
+
+#. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
 msgstr ""
-"Nismo u mogućnosti preporučiti korištenje jedne distribucije ispred 
drugih, "
-"stoga su u ovoj listi navedene abecednim redom. Potičemo vas da pročitate "
-"ove kratke opise, a još i više da potražite njihove mrežne stranice i 
druge "
-"informacije kako biste odabrali onu koja je najbolja za vas."
 
 #. type: Content of: <table><thead><tr><th>
 msgid "Distribution"
 msgstr "Distribucija"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+# | {+Brief+} Description
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Opis"
 
 #. type: Content of: <table><tr><td><a>
@@ -233,7 +261,10 @@
 msgstr "BLAG Linux and GNU, distribucija GNU/Linuxa temeljena na Fedori."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+# | <a [-href=\"http://dragora.org\";>-] {+href=\"https://dragora.org/\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -263,10 +294,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic, distribucija GNU/Linuxa s posebnim naglaskom na audio i video "
-"obradi."
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -310,13 +340,17 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix, distribucija GNU/Linuxa temeljena na Knoppixu, s posebnim naglaskom "
-"na audio produkciji."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+# | <a [-href=\"http://www.parabola.nu/https/\";>-]
+# | {+href=\"https://www.parabola.nu\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -358,7 +392,10 @@
 "strane FSF."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+# | <a href=\"http{+s+}://trisquel.info/\">
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -382,13 +419,27 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+# | Ututo [-X-]S, a GNU/Linux [-distribution based on Gentoo.-] {+100% free
+# | distribution.+}  It was the first fully free GNU/Linux system recognized
+# | by the GNU Project.
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS, distribucija GNU/Linuxa temeljena na Gentoou. Ova distribucija je "
 "bila prvi potpuno slobodan sustav GNU/Linuxa kojeg je priznao Projekt GNU."
 
+#. type: Content of: <h3>
+# | [-Free-]{+Small+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Slobodne distribucije GNU/Linuxa"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -447,6 +498,13 @@
 "build-time and run-time for different hardware and use cases."
 msgstr ""
 
+#. type: Content of: <h3>
+# | [-Free-]{+How to get free+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Slobodne distribucije GNU/Linuxa"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -464,27 +522,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
+"<a href=\"/software/software.html\">Pojedinačni GNU-ovi paketi</a> (većina "
+"kojih je uključena u ovdje navedene slobodne distribucije) opisani su "
+"odvojeno."
 
 #. type: Content of: <p>
+# | We list <a [-href=\"/links/companies.html\">companies-]
+# | 
{+href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-freedom\";>
+# | companies+} that sell hardware preinstalled with a free GNU/Linux
+# | distribution</a> separately.
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
 msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "<a href=\"/links/companies.html\">Kompanije koje prodaju hardver s "
 "predinstaliranom slobodnom distribucijom GNU/Linuxa</a> popisane su odvojeno."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"<a href=\"/software/software.html\">Pojedinačni GNU-ovi paketi</a> (većina "
-"kojih je uključena u ovdje navedene slobodne distribucije) opisani su "
-"odvojeno."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "Vidite li nešto što nam je promaklo?"
@@ -591,12 +652,14 @@
 "za prijevode</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2010, 2013-] {+2014, 2015, 2016, 2017+} Free Software
+# | Copyright &copy; 2014, 2015, 2016, [-2017-] {+2017, 2018+} Free Software
 # | Foundation, Inc.
 #, fuzzy
-#| msgid "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -618,6 +681,57 @@
 msgid "Updated:"
 msgstr "Vrijeme zadnje izmjene:"
 
+#, fuzzy
+#~| msgid ""
+#~| "<strong>All of the distributions that follow are installable to a "
+#~| "computer's hard drive and most can be run live.</strong>"
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Sve distribucije koje slijede mogu se instalirati na tvrdi disk "
+#~ "računala, a većinu je moguće pokrenuti i bez instalacije.</strong>"
+
+#, fuzzy
+#~| msgid ""
+#~| "We cannot make a general recommendation for using one over another, so "
+#~| "they are listed here in alphabetical order.  We encourage you to read "
+#~| "these brief descriptions and even more to explore their respective web "
+#~| "sites and other information to choose the one best for you."
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "Nismo u mogućnosti preporučiti korištenje jedne distribucije ispred "
+#~ "drugih, stoga su u ovoj listi navedene abecednim redom. Potičemo vas da "
+#~ "pročitate ove kratke opise, a još i više da potražite njihove mrežne "
+#~ "stranice i druge informacije kako biste odabrali onu koja je najbolja za "
+#~ "vas."
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, distribucija GNU/Linuxa s posebnim naglaskom na audio i video "
+#~ "obradi."
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix, distribucija GNU/Linuxa temeljena na Knoppixu, s posebnim "
+#~ "naglaskom na audio produkciji."
+
+#, fuzzy
+#~| msgid "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"
 

Index: distros/po/free-distros.it.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.it.po,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- distros/po/free-distros.it.po       28 Dec 2017 23:59:56 -0000      1.177
+++ distros/po/free-distros.it.po       14 Apr 2018 11:33:14 -0000      1.178
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2017-12-28 23:39+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-04-14 11:27+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 
 # type: Content of: <title>
@@ -29,23 +30,86 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Distribuzioni GNU/Linux libere"
 
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Indice"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+# | [-See-]{+<a href=\"#NewDistro\">See+} something we [-missed?-]
+# | {+missed?</a>+}
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "Abbiamo dimenticato qualcosa?"
+
 # type: Content of: <p>
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+# | [-<em><span class=\"highlight\">The-]{+<em>The+} <a
+# | href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not
+# | responsible for other web[- -]sites, or how up-to-date their information
+# | [-is.</span></em>-] {+is.</em>+}
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\">La <a href=\"http://www.fsf.org/\";>Free "
 "Software Foundation</a> non è responsabile di altri siti web, né di quanto "
 "le informazioni su tali siti siano aggiornate.</span></em>"
 
-#. type: Content of: <p>
+# type: Content of: <h3>
+#. type: Content of: <h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "Introduzione"
+
+#. type: Content of: <p>
+# | This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>
+# | distributions that are entirely <a
+# | href=\"/philosophy/free-sw.html\">free</a> as in freedom.  [-All of the-] 
+# | {+Non-GNU-based free system+} distributions [-that follow-] are
+# | [-installable to a computer's hard drive; most can be run live.-] {+listed
+# | <a href=\"/distros/free-non-gnu-distros.html\">separately</a>.+}
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "Questa pagina elenca le distribuzioni <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> che sono completamente <a href=\"/philosophy/free-sw.html"
@@ -54,13 +118,25 @@
 "possibile provarle senza installazione."
 
 #. type: Content of: <p>
+# | The Free Software Foundation recommends and endorses these GNU/Linux
+# | distros, although [-we-] {+<strong>we+} do not try to judge or compare
+# | them based on any criterion other than [-freedom;-] {+freedom</strong>;+}
+# | therefore, we list them in alphabetical order.  [-We encourage you to read
+# | these brief descriptions and to consult their respective web sites and
+# | other information to choose the one best for you.-]
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "La Free Software Foundation consiglia e sostiene queste distribuzioni GNU/"
 "Linux, anche se non si azzarda a giudicare o paragonare tra loro queste "
@@ -71,14 +147,32 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | These distros are ready-to-use full systems whose developers have made a
+# | commitment to follow the <a
+# | href=\"/distros/free-system-distribution-guidelines.html\">Guidelines for
+# | Free System Distributions</a>.  This means [-these distros-] {+they+} will
+# | include, and propose, exclusively free software.  They will reject nonfree
+# | applications, nonfree programming platforms, nonfree drivers, nonfree
+# | firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree
+# | software, as well as nonfree manuals or documentation.
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Queste distribuzioni sono sistemi completi e pronti all'uso i cui "
 "sviluppatori si sono impegnati a seguire le <a href=\"/distros/free-system-"
@@ -135,28 +229,21 @@
 
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
-msgstr ""
-"<strong>Tutte le seguenti distribuzioni possono essere installate sul disco "
-"rigido di un computer, e nella maggior parte dei casi è anche possibile "
-"provarle senza installazione. Non tutti i dispositivi hardware funzionano "
-"con software libero; il sito di ciascuna distribuzione dovrebbe chiarire "
-"quale hardware è supportato.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
-msgstr ""
-"Noi sosteniamo queste distribuzioni solo perché sono libere. Non ci "
-"azzardiamo a giudicare o paragonare tra loro queste distribuzioni (a parte "
-"controllare il criterio della libertà); quindi le elenchiamo tutte in ordine 
"
-"alfabetico. Per scegliere la più opportuna per i propri scopi è bene "
-"consultare i siti di riferimento elencati e informarsi a dovere."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
+msgstr ""
 
 # type: Content of: <table><thead><tr><th>
 #. type: Content of: <table><thead><tr><th>
@@ -165,7 +252,10 @@
 
 # type: Content of: <table><thead><tr><th>
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+# | {+Brief+} Description
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Descrizione"
 
 # type: Content of: <table><tr><td><a>
@@ -188,7 +278,10 @@
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+# | <a [-href=\"http://dragora.org\";>-] {+href=\"https://dragora.org/\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -214,14 +307,12 @@
 msgid "Dynebolic"
 msgstr "Dynebolic"
 
-# type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic, una distribuzione GNU/Linux particolarmente orientata al "
-"montaggio audio e video."
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
@@ -271,18 +362,21 @@
 msgid "Musix GNU+Linux"
 msgstr "Musix GNU+Linux"
 
-# type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix, una distribuzione GNU+Linux basata su Knoppix, particolarmente "
-"orientata alla produzione audio."
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+# | <a [-href=\"http://www.parabola.nu/https/\";>-]
+# | {+href=\"https://www.parabola.nu\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -317,7 +411,10 @@
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+# | <a href=\"http{+s+}://trisquel.info/\">
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 # type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -344,14 +441,29 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+# | Ututo [-X-]S, a GNU/Linux [-distribution based on Gentoo.-] {+100% free
+# | distribution.+}  It was the first fully free GNU/Linux system recognized
+# | by the GNU Project.
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS, una distribuzione GNU/Linux basata su Gentoo.  &Egrave; stata la "
 "prima distribuzione  GNU/Linux completamente libera riconosciuta dal "
 "progetto GNU."
 
+# type: Content of: <h2>
+#. type: Content of: <h3>
+# | [-Free-]{+Small+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Distribuzioni GNU/Linux libere"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -407,6 +519,14 @@
 "binari, sia al momento della compilazione che al momento dell'esecuzione, "
 "per diversi sistemi hardware e diversi casi d'uso."
 
+# type: Content of: <h2>
+#. type: Content of: <h3>
+# | [-Free-]{+How to get free+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Distribuzioni GNU/Linux libere"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -423,31 +543,32 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"Le distribuzioni libere non basate su GNU sono elencate in <a href=\"/"
-"distros/free-non-gnu-distros.html\">una pagina dedicata</a>."
+"I <a href=\"/software/software.html\">singoli pacchetti GNU</a> (molti dei "
+"quali sono inclusi nelle distribuzioni libere qui elencate) sono descritti a "
+"parte."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+# | We list <a [-href=\"/links/companies.html\">companies-]
+# | 
{+href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-freedom\";>
+# | companies+} that sell hardware preinstalled with a free GNU/Linux
+# | distribution</a> separately.
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
+msgid ""
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "In una pagina a parte elenchiamo le <a href=\"/links/companies.html"
 "\">aziende</a> che forniscono hardware con una distribuzione libera GNU/"
 "Linux preinstallata."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"I <a href=\"/software/software.html\">singoli pacchetti GNU</a> (molti dei "
-"quali sono inclusi nelle distribuzioni libere qui elencate) sono descritti a "
-"parte."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "Abbiamo dimenticato qualcosa?"
@@ -539,8 +660,15 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
+#| "Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+msgstr ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -565,3 +693,55 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
+
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Tutte le seguenti distribuzioni possono essere installate sul "
+#~ "disco rigido di un computer, e nella maggior parte dei casi è anche "
+#~ "possibile provarle senza installazione. Non tutti i dispositivi hardware "
+#~ "funzionano con software libero; il sito di ciascuna distribuzione "
+#~ "dovrebbe chiarire quale hardware è supportato.</strong>"
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "Noi sosteniamo queste distribuzioni solo perché sono libere. Non ci "
+#~ "azzardiamo a giudicare o paragonare tra loro queste distribuzioni (a "
+#~ "parte controllare il criterio della libertà); quindi le elenchiamo tutte "
+#~ "in ordine alfabetico. Per scegliere la più opportuna per i propri scopi 
è "
+#~ "bene consultare i siti di riferimento elencati e informarsi a dovere."
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, una distribuzione GNU/Linux particolarmente orientata al "
+#~ "montaggio audio e video."
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix, una distribuzione GNU+Linux basata su Knoppix, particolarmente "
+#~ "orientata alla produzione audio."
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "Le distribuzioni libere non basate su GNU sono elencate in <a href=\"/"
+#~ "distros/free-non-gnu-distros.html\">una pagina dedicata</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."

Index: distros/po/free-distros.ja-diff.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ja-diff.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- distros/po/free-distros.ja-diff.html        22 Dec 2017 07:59:28 -0000      
1.7
+++ distros/po/free-distros.ja-diff.html        14 Apr 2018 11:33:14 -0000      
1.8
@@ -18,38 +18,72 @@
       href="http://www.gnu.org/distros/distros.rss";
       type="application/rss+xml" /&gt;
 &lt;style type="text/css" media="screen"&gt;&lt;!--
+<span class="inserted"><ins><em>h2 { margin-bottom: 1.5em; }
+h3 { margin: 1.8em 0 1.3em; }
+.summary {
+   padding-top: .7em; padding-bottom: 1.2em;
+   margin-top: 0;
+   border: .15em dotted #ccc;
+}
+.note { margin-top: .8em; margin-bottom: 1em; }
+p.highlight {
+   border: .1em solid #ccc;
+   margin-bottom: 0;
+}
+table.listing { margin-bottom: 3em; }</em></ins></span>
 td.icon { width: 20%; }
 td.icon img { max-width: 100%; max-height: 4em; }
+<span class="inserted"><ins><em>@media (max-width: 48em) {
+   .note, .summary { width: 30em; max-width: 93%; }
+}</em></ins></span>
 --&gt;&lt;/style&gt;
-
 &lt;!--#include virtual="/distros/po/free-distros.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;h2&gt;Free GNU/Linux distributions&lt;/h2&gt;
+
 &lt;!--#include virtual="/licenses/fsf-licensing.html" --&gt;
 
-&lt;blockquote&gt;
-&lt;p&gt;&lt;em&gt;&lt;span class="highlight"&gt;The &lt;a 
href="http://www.fsf.org/"&gt;Free
-Software Foundation&lt;/a&gt; is not responsible for other web sites, or how
-up-to-date their information is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt; 
-&lt;/blockquote&gt;
+<span class="removed"><del><strong>&lt;blockquote&gt;
+&lt;p&gt;&lt;em&gt;&lt;span class="highlight"&gt;The</strong></del></span>
+<span class="inserted"><ins><em>&lt;div class="summary"&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;
+&lt;ul&gt;
+  &lt;li&gt;&lt;a href="#intro"&gt;Introduction&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#for-pc"&gt;GNU/Linux distros for PCs and 
workstations&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#small-distros"&gt;Small GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#howto-get"&gt;How to get free GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/distros/free-non-gnu-distros.html"&gt;Other free 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#NewDistro"&gt;See something we 
missed?&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p class="highlight"&gt;&lt;em&gt;The</em></ins></span> &lt;a 
href="http://www.fsf.org/"&gt;Free
+Software Foundation&lt;/a&gt; is not responsible for other <span 
class="removed"><del><strong>web sites,</strong></del></span> <span 
class="inserted"><ins><em>websites,</em></ins></span> or how
+up-to-date their information <span 
class="removed"><del><strong>is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt; 
+&lt;/blockquote&gt;</strong></del></span> <span 
class="inserted"><ins><em>is.&lt;/em&gt;&lt;/p&gt; 
+&lt;/div&gt;
+&lt;hr class="no-display" /&gt;
+
+&lt;h3 id="intro"&gt;Introduction&lt;/h3&gt;</em></ins></span>
 
 &lt;p&gt;This page lists the &lt;a 
href="/gnu/linux-and-gnu.html"&gt;GNU/Linux&lt;/a&gt;
 distributions that are
 entirely &lt;a href="/philosophy/free-sw.html"&gt;free&lt;/a&gt; as in freedom.
-All of the distributions that follow are installable to a
-computer's hard drive; most can be run live.&lt;/p&gt;
+<span class="removed"><del><strong>All of the</strong></del></span>
+<span class="inserted"><ins><em>Non-GNU-based free system</em></ins></span> 
distributions <span class="removed"><del><strong>that 
follow</strong></del></span> are <span class="removed"><del><strong>installable 
to a
+computer's hard drive; most can be run live.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>listed &lt;a
+href="/distros/free-non-gnu-distros.html"&gt;separately&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;The Free Software Foundation recommends and endorses these GNU/Linux
-distros, although we do not try to judge or compare them based on any
-criterion other than freedom; therefore, we list them in alphabetical
-order.  We encourage you to read these brief descriptions and to
+distros, although <span class="removed"><del><strong>we</strong></del></span> 
<span class="inserted"><ins><em>&lt;strong&gt;we</em></ins></span> do not try 
to judge or compare them based on any
+criterion other than <span 
class="removed"><del><strong>freedom;</strong></del></span> <span 
class="inserted"><ins><em>freedom&lt;/strong&gt;;</em></ins></span> therefore, 
we list them in alphabetical
+<span class="removed"><del><strong>order.  We encourage you to read these 
brief descriptions and to
 consult their respective web sites and other information to choose the
-one best for you.&lt;/p&gt;
+one best for you.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>order.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;These distros are ready-to-use full systems whose developers have made
 a commitment to follow the 
 &lt;a href="/distros/free-system-distribution-guidelines.html"&gt;Guidelines
-for Free System Distributions&lt;/a&gt;.  This means these distros will
+for Free System Distributions&lt;/a&gt;.  This means <span 
class="removed"><del><strong>these distros</strong></del></span> <span 
class="inserted"><ins><em>they</em></ins></span> will
 include, and propose, exclusively free software.  They will reject
 nonfree applications, nonfree programming platforms, nonfree drivers,
 nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other
@@ -74,17 +108,27 @@
 improve the state of free distros, helping to develop an existing free
 distro contributes more than starting a new one.&lt;/p&gt;
 
-&lt;p&gt;&lt;strong&gt;All of the distributions that follow are installable to 
a
-computer's hard drive; most can be run live.  Not all hardware works
-in the free world; each distro's site should say which hardware it
-supports.&lt;/strong&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;All of the 
distributions</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Please note</em></ins></span> that 
<span class="removed"><del><strong>follow are installable to a
+computer's hard drive; most can be run live.  Not</strong></del></span> <span 
class="inserted"><ins><em>not</em></ins></span> all hardware works in the free 
world; each
+distro's site should say which hardware it
+<span class="removed"><del><strong>supports.&lt;/strong&gt;&lt;/p&gt;
 
 &lt;p&gt;We endorse these distros only for freedom.  We do not try to judge
 or compare these distros based on any other criterion; therefore, we
-list them in alphabetical order.  We suggest you consult their
-respective web sites and other information to judge which one is most
+list them in alphabetical order.</strong></del></span> <span 
class="inserted"><ins><em>supports.</em></ins></span> We suggest <span 
class="inserted"><ins><em>that,
+after reading the short descriptions below,</em></ins></span> you consult 
<span class="removed"><del><strong>their
+respective web</strong></del></span> <span 
class="inserted"><ins><em>these</em></ins></span> sites <span 
class="removed"><del><strong>and</strong></del></span> <span 
class="inserted"><ins><em>as
+well as</em></ins></span> other <span 
class="removed"><del><strong>information</strong></del></span> <span 
class="inserted"><ins><em>available information,</em></ins></span> to judge 
which <span class="removed"><del><strong>one</strong></del></span> <span 
class="inserted"><ins><em>distro</em></ins></span> is most
 convenient for you.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h3 id="for-pc"&gt;GNU/Linux distros for 
PCs and
+workstations&lt;/h3&gt;
+
+&lt;p&gt;The distributions that follow are installable to a computer's hard
+drive and/or can be run live.&lt;/p&gt;</em></ins></span>
+
 &lt;!-- Do not add or remove anything from this list without a lot of
      discussion, following the usual process, and confirmation by RMS. See 
      http://www.gnu.org/server/standards/index.html#distros --&gt;
@@ -92,16 +136,17 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
-&lt;tr class="odd"&gt;
+  &lt;tr class="odd"&gt;
    &lt;td class="icon"&gt;&lt;a href="http://www.blagblagblag.org/"&gt;
        &lt;img src="/graphics/distros-blag.jpg" alt="BLAG Linux and GNU" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;BLAG Linux and GNU, a GNU/Linux distribution based on 
Fedora.&lt;/td&gt;&lt;/tr&gt;
 
  &lt;tr class="even"&gt;
-   &lt;td class="icon"&gt;&lt;a href="http://dragora.org"&gt;
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://dragora.org"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://dragora.org/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-dragora.png" <span 
class="removed"><del><strong>alt="Dragora"</strong></del></span>
             <span class="inserted"><ins><em>alt="Dragora 
GNU/Linux-Libre"</em></ins></span> /&gt;&lt;/a&gt;&lt;/td&gt;
    <span class="removed"><del><strong>&lt;td&gt;Dragora,</strong></del></span>
@@ -112,7 +157,9 @@
    &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://www.dynebolic.org"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.dyne.org/software/dynebolic/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-dyen.png" alt="Dynebolic" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Dynebolic, a GNU/Linux distribution with special emphasis on 
audio 
-       and video editing.&lt;/td&gt;&lt;/tr&gt;
+       and video <span 
class="removed"><del><strong>editing.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>editing. This is a &ldquo;static&rdquo; 
distro, normally
+       run from a live CD. Since it will not receive security updates, it
+       should be used offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="http://www.gnewsense.org/"&gt;
@@ -127,29 +174,30 @@
        on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
        functional package manager for the GNU system. &lt;/td&gt;&lt;/tr&gt;
 
-    
  &lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="https://musixdistro.wordpress.com/"&gt;
        &lt;img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Musix, a GNU+Linux distribution based on Knoppix, with special
-       emphasis on audio production.&lt;/td&gt;&lt;/tr&gt;
+       emphasis on audio <span 
class="removed"><del><strong>production.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>production. This is a &ldquo;static&rdquo;
+       distro, normally run from a live CD. Since it will not receive
+       security updates, it should be used 
offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr class="odd"&gt;
-   &lt;td class="icon"&gt;&lt;a href="http://www.parabola.nu/https/"&gt;
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://www.parabola.nu/https/"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.parabola.nu"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-parabola.png"
             alt="Parabola GNU/Linux-libre" /&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Parabola GNU/Linux-libre, a distribution based on Arch that
        prioritizes simple package and system management.&lt;/td&gt;&lt;/tr&gt;
 
  &lt;tr class="even"&gt;
-   &lt;td class="icon"&gt;&lt;a <span 
class="inserted"><ins><em>href="https://pureos.net/"&gt;
-       &lt;img src="/graphics/pureos-logo-small.png"
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://trisquel.info/"&gt;</strong></del></span>
 <span class="inserted"><ins><em>href="https://pureos.net/"&gt;
+       &lt;img src="/graphics/pureos-logo-small.png" style="max-height: 1.8em;"
             alt="PureOS" /&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;PureOS, a GNU distribution based on Debian with a focus on
        privacy, security, and convenience.&lt;/td&gt;&lt;/tr&gt;
  
  &lt;tr class="odd"&gt;
-   &lt;td class="icon"&gt;&lt;a</em></ins></span> 
href="http://trisquel.info/"&gt;
+   &lt;td class="icon"&gt;&lt;a 
href="https://trisquel.info/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-trisquel.png" alt="Trisquel" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Trisquel, a GNU/Linux distribution based on Ubuntu that's 
oriented 
  toward small enterprises, domestic users and educational 
centers.&lt;/td&gt;&lt;/tr&gt;
@@ -157,12 +205,16 @@
 &lt;tr <span 
class="removed"><del><strong>class="odd"&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="even"&gt;</em></ins></span>
    &lt;td class="icon"&gt;&lt;a href="http://www.ututo.org/"&gt;
        &lt;img src="/graphics/distros-ututo.png" alt="Ututo" 
/&gt;&lt;/a&gt;&lt;/td&gt;
-   &lt;td&gt;Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the 
first
+   &lt;td&gt;Ututo <span 
class="removed"><del><strong>XS,</strong></del></span> <span 
class="inserted"><ins><em>S,</em></ins></span> a GNU/Linux <span 
class="removed"><del><strong>distribution based on 
Gentoo.</strong></del></span> <span class="inserted"><ins><em>100% free 
distribution.</em></ins></span>  It was the first
        fully free GNU/Linux system recognized by the GNU 
Project.&lt;/td&gt;&lt;/tr&gt;
 
 &lt;/table&gt;
 
-&lt;p id="small-distros"&gt;Below is a list of small system distributions. 
These 
+<span class="removed"><del><strong>&lt;p 
id="small-distros"&gt;Below</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 id="small-distros"&gt;Small GNU/Linux 
distros&lt;/h3&gt;
+
+&lt;p&gt;Below</em></ins></span> is a list of small system distributions. 
These 
    distributions are meant for devices with limited resources, like a 
    wireless router for example. A free small system distribution is not 
    self-hosting, but it must be developable and buildable on top of one of 
@@ -171,7 +223,8 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
  &lt;tr class="odd"&gt;
@@ -191,6 +244,8 @@
 
 &lt;/table&gt;
 
+<span class="inserted"><ins><em>&lt;h3 id="howto-get"&gt;How to get free 
GNU/Linux distros&lt;/h3&gt;</em></ins></span>
+
 &lt;p&gt;In addition to their own sites, many of these distributions are
 available from &lt;a href="http://mirror.fsf.org/"&gt;mirror.fsf.org&lt;/a&gt;.
 Feel free to download or mirror the distributions from there,
@@ -198,16 +253,21 @@
 mirror for their project by mailing the 
 &lt;a href="mailto:address@hidden"&gt;FSF sysadmins&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p id="other-free"&gt;Non-GNU-based free system distributions are
+<span class="removed"><del><strong>&lt;p id="other-free"&gt;Non-GNU-based free 
system distributions are
 listed in &lt;a href="/distros/free-non-gnu-distros.html"&gt;a separate 
file&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;We list &lt;a href="/links/companies.html"&gt;companies that sell 
hardware
-preinstalled with a free GNU/Linux distribution&lt;/a&gt; separately.&lt;/p&gt;
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</strong></del></span>
 
 &lt;p&gt;&lt;a href="/software/software.html"&gt;Individual GNU
 packages&lt;/a&gt; (most of which are included in the free distributions here) 
 are described separately.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;p&gt;We list &lt;a
+href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom"&gt;
+companies that sell hardware
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</em></ins></span>
+
 &lt;h3 id="NewDistro"&gt;See something we missed?&lt;/h3&gt;
 
 &lt;p&gt;Do you know about a distribution that you expected to find on our
@@ -276,7 +336,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2014, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2017</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2017, 2018</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -286,7 +346,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2017/12/22 07:59:28 $
+$Date: 2018/04/14 11:33:14 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: distros/po/free-distros.ja.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ja.po,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- distros/po/free-distros.ja.po       21 Dec 2017 17:59:24 -0000      1.106
+++ distros/po/free-distros.ja.po       14 Apr 2018 11:33:14 -0000      1.107
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2016-12-20 14:32+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -27,22 +27,66 @@
 msgid "Free GNU/Linux distributions"
 msgstr "自由なGNU/Linuxディストリビューション"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "もくじ"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "わたちたちが見逃しているものをみつけましたか?"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\"><a 
href=\"http://www.fsf.org/\";>フリーソフト"
 
"ウェアファウンデーション</a>は、ほかのwebサイトについて責任を持ちません。その"
 "情å 
±ãŒã©ã‚Œãã‚‰ã„最新となっているかについても責任を持ちません。</span></em>"
 
+#. type: Content of: <h3>
+msgid "Introduction"
+msgstr "はじめに"
+
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "このページには、自由の意味において完全に<a 
href=\"/philosophy/free-sw.html\">"
 "フリー</a>である<a 
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>ディストリ"
@@ -51,13 +95,19 @@
 "として実行できます。"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 
"フリーソフトウェアファウンデーションはこれらのGNU/Linuxディストロを推奨し支持"
 
"します。しかし、わたしたちは、これらのディストロを自由以外の範疇をå
…ƒã«ã—て判"
@@ -66,14 +116,24 @@
 
"なたにとってもっともよいものを選択することを推奨します。"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "これらのディストロは、すぐに使える完全なシステム
で、その開発者は、<a href=\"/"
 "distros/free-system-distribution-guidelines.html\">自由なシステム
・ディストリ"
@@ -129,34 +189,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
-msgstr ""
-"<strong>以下に掲載されるすべてのディストリビューションはコンピュータのディス"
-"クにインストールできるもので、多くはライブCDなどで実行できます。自由の世界で"
-"はすべてのハードウェアが動くわけではありません。どのハードウェアがサポートさ"
-"れているかについては、それぞれのディストロのサイトをご覧くã
 ã•ã„。</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
-msgstr ""
-"わたしたちは、これらのディストロを自由についてだ
け支持します。わたしたちは、"
-"これらのディストロをそのほかの範疇をå…
ƒã«ã—て判断したり比較しないようにしてい"
-"ます。ですから、ここでは、アルファベットé 
†ã§ä¸€è¦§ã—ています。対応するウェブサ"
-"イトやほかの情å 
±ã‚’確認し、あなたにとってもっともよいものを判断することを提案"
-"します。"
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
+msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
 msgid "Distribution"
 msgstr "ディストリビューション"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "説明"
 
 #. type: Content of: <table><tr><td><a>
@@ -176,7 +232,9 @@
 msgstr "BLAG Linux and GNU, 
FedoraをもとにしたGNU/Linuxディストリビューション"
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -210,8 +268,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
-msgstr "Dynebolic, 
音声とビデオの編集に特化したGNU/Linuxディストリビューション"
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
+msgstr ""
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -258,12 +317,15 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix, 
Knoppixをもととし、音声の生成に特化したGNU+Linuxディストリビューション"
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -301,7 +363,9 @@
 "受けて作成されている)"
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -325,13 +389,23 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS, 
GentooをもとにしたGNU/Linuxディストリビューション。GNU 
Projectによ"
 "り最初に認められた完全に自由なGNU/Linuxシステムです。"
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "自由なGNU/Linuxディストリビューション"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -384,6 +458,12 @@
 "す。プラットフォーム
のコンフィグレーション機能によって、異なるハードウェアと"
 
"ユースケースに対して構築時、実行時にコンフィグすることができます。"
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "自由なGNU/Linuxディストリビューション"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -400,28 +480,25 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"GNUベースでない自由なシステム
・ディストリビューションは<a href=\"/distros/"
-"free-non-gnu-distros.html\">別のファイル</a>に掲載されています。"
+"<a href=\"/software/software.html\">個々
のGNUパッケージ</a>(ほとんどはここの"
+"自由なディストリビューションに含まれています)は別に説明があります。"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
 msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "<a 
href=\"/links/companies.html\">自由なGNU/Linuxディストリビューションをプリ"
 
"インストールしたハードウェアを売っている会社</a>の一覧は別にあります。"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"<a href=\"/software/software.html\">個々
のGNUパッケージ</a>(ほとんどはここの"
-"自由なディストリビューションに含まれています)は別に説明があります。"
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "わたちたちが見逃しているものをみつけましたか?"
@@ -511,7 +588,8 @@
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -534,6 +612,58 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ 
"<strong>以下に掲載されるすべてのディストリビューションはコンピュータのディ"
+#~ 
"スクにインストールできるもので、多くはライブCDなどで実行できます。自由の世"
+#~ 
"界ではすべてのハードウェアが動くわけではありません。どのハードウェアがサ"
+#~ 
"ポートされているかについては、それぞれのディストロのサイトをご覧くã
 ã•ã„。"
+#~ "</strong>"
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "わたしたちは、これらのディストロを自由についてだ
け支持します。わたしたち"
+#~ "は、これらのディストロをそのほかの範疇をå…
ƒã«ã—て判断したり比較しないように"
+#~ "しています。ですから、ここでは、アルファベットé 
†ã§ä¸€è¦§ã—ています。対応する"
+#~ "ウェブサイトやほかの情å 
±ã‚’確認し、あなたにとってもっともよいものを判断する"
+#~ "ことを提案します。"
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, 
音声とビデオの編集に特化したGNU/Linuxディストリビューション"
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix, 
Knoppixをもととし、音声の生成に特化したGNU+Linuxディストリビュー"
+#~ "ション"
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "GNUベースでない自由なシステム
・ディストリビューションは<a href=\"/distros/"
+#~ 
"free-non-gnu-distros.html\">別のファイル</a>に掲載されています。"
+
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"
 

Index: distros/po/free-distros.nl-diff.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.nl-diff.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- distros/po/free-distros.nl-diff.html        19 Feb 2018 18:00:45 -0000      
1.3
+++ distros/po/free-distros.nl-diff.html        14 Apr 2018 11:33:14 -0000      
1.4
@@ -18,38 +18,72 @@
       href="http://www.gnu.org/distros/distros.rss";
       type="application/rss+xml" /&gt;
 &lt;style type="text/css" media="screen"&gt;&lt;!--
+<span class="inserted"><ins><em>h2 { margin-bottom: 1.5em; }
+h3 { margin: 1.8em 0 1.3em; }
+.summary {
+   padding-top: .7em; padding-bottom: 1.2em;
+   margin-top: 0;
+   border: .15em dotted #ccc;
+}
+.note { margin-top: .8em; margin-bottom: 1em; }
+p.highlight {
+   border: .1em solid #ccc;
+   margin-bottom: 0;
+}
+table.listing { margin-bottom: 3em; }</em></ins></span>
 td.icon { width: 20%; }
 td.icon img { max-width: 100%; max-height: 4em; }
+<span class="inserted"><ins><em>@media (max-width: 48em) {
+   .note, .summary { width: 30em; max-width: 93%; }
+}</em></ins></span>
 --&gt;&lt;/style&gt;
-
 &lt;!--#include virtual="/distros/po/free-distros.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;h2&gt;Free GNU/Linux distributions&lt;/h2&gt;
+
 &lt;!--#include virtual="/licenses/fsf-licensing.html" --&gt;
 
-&lt;blockquote&gt;
-&lt;p&gt;&lt;em&gt;&lt;span class="highlight"&gt;The &lt;a 
href="http://www.fsf.org/"&gt;Free
-Software Foundation&lt;/a&gt; is not responsible for other web sites, or how
-up-to-date their information is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt; 
-&lt;/blockquote&gt;
+<span class="removed"><del><strong>&lt;blockquote&gt;
+&lt;p&gt;&lt;em&gt;&lt;span class="highlight"&gt;The</strong></del></span>
+<span class="inserted"><ins><em>&lt;div class="summary"&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;
+&lt;ul&gt;
+  &lt;li&gt;&lt;a href="#intro"&gt;Introduction&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#for-pc"&gt;GNU/Linux distros for PCs and 
workstations&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#small-distros"&gt;Small GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#howto-get"&gt;How to get free GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/distros/free-non-gnu-distros.html"&gt;Other free 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#NewDistro"&gt;See something we 
missed?&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p class="highlight"&gt;&lt;em&gt;The</em></ins></span> &lt;a 
href="http://www.fsf.org/"&gt;Free
+Software Foundation&lt;/a&gt; is not responsible for other <span 
class="removed"><del><strong>web sites,</strong></del></span> <span 
class="inserted"><ins><em>websites,</em></ins></span> or how
+up-to-date their information <span 
class="removed"><del><strong>is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt; 
+&lt;/blockquote&gt;</strong></del></span> <span 
class="inserted"><ins><em>is.&lt;/em&gt;&lt;/p&gt; 
+&lt;/div&gt;
+&lt;hr class="no-display" /&gt;
+
+&lt;h3 id="intro"&gt;Introduction&lt;/h3&gt;</em></ins></span>
 
 &lt;p&gt;This page lists the &lt;a 
href="/gnu/linux-and-gnu.html"&gt;GNU/Linux&lt;/a&gt;
 distributions that are
 entirely &lt;a href="/philosophy/free-sw.html"&gt;free&lt;/a&gt; as in freedom.
-All of the distributions that follow are installable to a
-computer's hard drive; most can be run live.&lt;/p&gt;
+<span class="removed"><del><strong>All of the</strong></del></span>
+<span class="inserted"><ins><em>Non-GNU-based free system</em></ins></span> 
distributions <span class="removed"><del><strong>that 
follow</strong></del></span> are <span class="removed"><del><strong>installable 
to a
+computer's hard drive; most can be run live.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>listed &lt;a
+href="/distros/free-non-gnu-distros.html"&gt;separately&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;The Free Software Foundation recommends and endorses these GNU/Linux
-distros, although we do not try to judge or compare them based on any
-criterion other than freedom; therefore, we list them in alphabetical
-order.  We encourage you to read these brief descriptions and to
+distros, although <span class="removed"><del><strong>we</strong></del></span> 
<span class="inserted"><ins><em>&lt;strong&gt;we</em></ins></span> do not try 
to judge or compare them based on any
+criterion other than <span 
class="removed"><del><strong>freedom;</strong></del></span> <span 
class="inserted"><ins><em>freedom&lt;/strong&gt;;</em></ins></span> therefore, 
we list them in alphabetical
+<span class="removed"><del><strong>order.  We encourage you to read these 
brief descriptions and to
 consult their respective web sites and other information to choose the
-one best for you.&lt;/p&gt;
+one best for you.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>order.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;These distros are ready-to-use full systems whose developers have made
 a commitment to follow the 
 &lt;a href="/distros/free-system-distribution-guidelines.html"&gt;Guidelines
-for Free System Distributions&lt;/a&gt;.  This means these distros will
+for Free System Distributions&lt;/a&gt;.  This means <span 
class="removed"><del><strong>these distros</strong></del></span> <span 
class="inserted"><ins><em>they</em></ins></span> will
 include, and propose, exclusively free software.  They will reject
 nonfree applications, nonfree programming platforms, nonfree drivers,
 nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other
@@ -74,17 +108,27 @@
 improve the state of free distros, helping to develop an existing free
 distro contributes more than starting a new one.&lt;/p&gt;
 
-&lt;p&gt;&lt;strong&gt;All of the distributions that follow are installable to 
a
-computer's hard drive; most can be run live.  Not all hardware works
-in the free world; each distro's site should say which hardware it
-supports.&lt;/strong&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;All of the 
distributions</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Please note</em></ins></span> that 
<span class="removed"><del><strong>follow are installable to a
+computer's hard drive; most can be run live.  Not</strong></del></span> <span 
class="inserted"><ins><em>not</em></ins></span> all hardware works in the free 
world; each
+distro's site should say which hardware it
+<span class="removed"><del><strong>supports.&lt;/strong&gt;&lt;/p&gt;
 
 &lt;p&gt;We endorse these distros only for freedom.  We do not try to judge
 or compare these distros based on any other criterion; therefore, we
-list them in alphabetical order.  We suggest you consult their
-respective web sites and other information to judge which one is most
+list them in alphabetical order.</strong></del></span> <span 
class="inserted"><ins><em>supports.</em></ins></span> We suggest <span 
class="inserted"><ins><em>that,
+after reading the short descriptions below,</em></ins></span> you consult 
<span class="removed"><del><strong>their
+respective web</strong></del></span> <span 
class="inserted"><ins><em>these</em></ins></span> sites <span 
class="removed"><del><strong>and</strong></del></span> <span 
class="inserted"><ins><em>as
+well as</em></ins></span> other <span 
class="removed"><del><strong>information</strong></del></span> <span 
class="inserted"><ins><em>available information,</em></ins></span> to judge 
which <span class="removed"><del><strong>one</strong></del></span> <span 
class="inserted"><ins><em>distro</em></ins></span> is most
 convenient for you.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h3 id="for-pc"&gt;GNU/Linux distros for 
PCs and
+workstations&lt;/h3&gt;
+
+&lt;p&gt;The distributions that follow are installable to a computer's hard
+drive and/or can be run live.&lt;/p&gt;</em></ins></span>
+
 &lt;!-- Do not add or remove anything from this list without a lot of
      discussion, following the usual process, and confirmation by RMS. See 
      http://www.gnu.org/server/standards/index.html#distros --&gt;
@@ -92,16 +136,17 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
-&lt;tr class="odd"&gt;
+  &lt;tr class="odd"&gt;
    &lt;td class="icon"&gt;&lt;a href="http://www.blagblagblag.org/"&gt;
        &lt;img src="/graphics/distros-blag.jpg" alt="BLAG Linux and GNU" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;BLAG Linux and GNU, a GNU/Linux distribution based on 
Fedora.&lt;/td&gt;&lt;/tr&gt;
 
  &lt;tr class="even"&gt;
-   &lt;td class="icon"&gt;&lt;a href="http://dragora.org"&gt;
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://dragora.org"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://dragora.org/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-dragora.png"
             alt="Dragora GNU/Linux-Libre" /&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Dragora GNU/Linux-Libre, an independent GNU/Linux distribution
@@ -111,7 +156,9 @@
    &lt;td class="icon"&gt;&lt;a 
href="https://www.dyne.org/software/dynebolic/"&gt;
        &lt;img src="/graphics/distros-dyen.png" alt="Dynebolic" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Dynebolic, a GNU/Linux distribution with special emphasis on 
audio 
-       and video editing.&lt;/td&gt;&lt;/tr&gt;
+       and video <span 
class="removed"><del><strong>editing.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>editing. This is a &ldquo;static&rdquo; 
distro, normally
+       run from a live CD. Since it will not receive security updates, it
+       should be used offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="http://www.gnewsense.org/"&gt;
@@ -126,29 +173,30 @@
        on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
        functional package manager for the GNU system. &lt;/td&gt;&lt;/tr&gt;
 
-    
  &lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="https://musixdistro.wordpress.com/"&gt;
        &lt;img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Musix, a GNU+Linux distribution based on Knoppix, with special
-       emphasis on audio production.&lt;/td&gt;&lt;/tr&gt;
+       emphasis on audio <span 
class="removed"><del><strong>production.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>production. This is a &ldquo;static&rdquo;
+       distro, normally run from a live CD. Since it will not receive
+       security updates, it should be used 
offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr class="odd"&gt;
-   &lt;td class="icon"&gt;&lt;a href="http://www.parabola.nu/https/"&gt;
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://www.parabola.nu/https/"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.parabola.nu"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-parabola.png"
             alt="Parabola GNU/Linux-libre" /&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Parabola GNU/Linux-libre, a distribution based on Arch that
        prioritizes simple package and system management.&lt;/td&gt;&lt;/tr&gt;
 
  &lt;tr class="even"&gt;
-   &lt;td class="icon"&gt;&lt;a <span 
class="inserted"><ins><em>href="https://pureos.net/"&gt;
-       &lt;img src="/graphics/pureos-logo-small.png"
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://trisquel.info/"&gt;</strong></del></span>
 <span class="inserted"><ins><em>href="https://pureos.net/"&gt;
+       &lt;img src="/graphics/pureos-logo-small.png" style="max-height: 1.8em;"
             alt="PureOS" /&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;PureOS, a GNU distribution based on Debian with a focus on
        privacy, security, and convenience.&lt;/td&gt;&lt;/tr&gt;
  
  &lt;tr class="odd"&gt;
-   &lt;td class="icon"&gt;&lt;a</em></ins></span> 
href="http://trisquel.info/"&gt;
+   &lt;td class="icon"&gt;&lt;a 
href="https://trisquel.info/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-trisquel.png" alt="Trisquel" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Trisquel, a GNU/Linux distribution based on Ubuntu that's 
oriented 
  toward small enterprises, domestic users and educational 
centers.&lt;/td&gt;&lt;/tr&gt;
@@ -156,12 +204,16 @@
 &lt;tr <span 
class="removed"><del><strong>class="odd"&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="even"&gt;</em></ins></span>
    &lt;td class="icon"&gt;&lt;a href="http://www.ututo.org/"&gt;
        &lt;img src="/graphics/distros-ututo.png" alt="Ututo" 
/&gt;&lt;/a&gt;&lt;/td&gt;
-   &lt;td&gt;Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the 
first
+   &lt;td&gt;Ututo <span 
class="removed"><del><strong>XS,</strong></del></span> <span 
class="inserted"><ins><em>S,</em></ins></span> a GNU/Linux <span 
class="removed"><del><strong>distribution based on 
Gentoo.</strong></del></span> <span class="inserted"><ins><em>100% free 
distribution.</em></ins></span>  It was the first
        fully free GNU/Linux system recognized by the GNU 
Project.&lt;/td&gt;&lt;/tr&gt;
 
 &lt;/table&gt;
 
-&lt;p id="small-distros"&gt;Below is a list of small system distributions. 
These 
+<span class="removed"><del><strong>&lt;p 
id="small-distros"&gt;Below</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 id="small-distros"&gt;Small GNU/Linux 
distros&lt;/h3&gt;
+
+&lt;p&gt;Below</em></ins></span> is a list of small system distributions. 
These 
    distributions are meant for devices with limited resources, like a 
    wireless router for example. A free small system distribution is not 
    self-hosting, but it must be developable and buildable on top of one of 
@@ -170,7 +222,8 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
  &lt;tr class="odd"&gt;
@@ -190,6 +243,8 @@
 
 &lt;/table&gt;
 
+<span class="inserted"><ins><em>&lt;h3 id="howto-get"&gt;How to get free 
GNU/Linux distros&lt;/h3&gt;</em></ins></span>
+
 &lt;p&gt;In addition to their own sites, many of these distributions are
 available from &lt;a href="http://mirror.fsf.org/"&gt;mirror.fsf.org&lt;/a&gt;.
 Feel free to download or mirror the distributions from there,
@@ -197,16 +252,21 @@
 mirror for their project by mailing the 
 &lt;a href="mailto:address@hidden"&gt;FSF sysadmins&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p id="other-free"&gt;Non-GNU-based free system distributions are
+<span class="removed"><del><strong>&lt;p id="other-free"&gt;Non-GNU-based free 
system distributions are
 listed in &lt;a href="/distros/free-non-gnu-distros.html"&gt;a separate 
file&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;We list &lt;a href="/links/companies.html"&gt;companies that sell 
hardware
-preinstalled with a free GNU/Linux distribution&lt;/a&gt; separately.&lt;/p&gt;
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</strong></del></span>
 
 &lt;p&gt;&lt;a href="/software/software.html"&gt;Individual GNU
 packages&lt;/a&gt; (most of which are included in the free distributions here) 
 are described separately.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;p&gt;We list &lt;a
+href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom"&gt;
+companies that sell hardware
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</em></ins></span>
+
 &lt;h3 id="NewDistro"&gt;See something we missed?&lt;/h3&gt;
 
 &lt;p&gt;Do you know about a distribution that you expected to find on our
@@ -275,7 +335,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, 
Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, 2016, <span 
class="removed"><del><strong>2017</strong></del></span> <span 
class="inserted"><ins><em>2017, 2018</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -285,7 +345,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/02/19 18:00:45 $
+$Date: 2018/04/14 11:33:14 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: distros/po/free-distros.nl.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.nl.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- distros/po/free-distros.nl.po       21 Dec 2017 17:59:24 -0000      1.16
+++ distros/po/free-distros.nl.po       14 Apr 2018 11:33:14 -0000      1.17
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2017-07-23 22:44+0200\n"
 "Last-Translator: Justin van Steijn <address@hidden>\n"
 "Language-Team: Dutch\n"
@@ -28,22 +28,84 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Vrije GNU/Linux-distributies"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Inhoudsopgave"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+# | [-See-]{+<a href=\"#NewDistro\">See+} something we [-missed?-]
+# | {+missed?</a>+}
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "Iets gevonden dat we vergeten zijn?"
+
+#. type: Content of: <div><p>
+# | [-<em><span class=\"highlight\">The-]{+<em>The+} <a
+# | href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not
+# | responsible for other web[- -]sites, or how up-to-date their information
+# | [-is.</span></em>-] {+is.</em>+}
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\">De <a href=\"http://www.fsf.org/\";>Free "
 "Software Foundation</a> is niet verantwoordelijk voor andere websites of hoe "
 "recent hun informatie is.</span></em>"
 
+#. type: Content of: <h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "Introductie"
+
 #. type: Content of: <p>
+# | This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>
+# | distributions that are entirely <a
+# | href=\"/philosophy/free-sw.html\">free</a> as in freedom.  [-All of the-] 
+# | {+Non-GNU-based free system+} distributions [-that follow-] are
+# | [-installable to a computer's hard drive; most can be run live.-] {+listed
+# | <a href=\"/distros/free-non-gnu-distros.html\">separately</a>.+}
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "Deze pagina toont de <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>-"
 "distributies die volledig <a href=\"/philosophy/free-sw.html\">vrij</a> "
@@ -52,13 +114,25 @@
 "uitgevoerd."
 
 #. type: Content of: <p>
+# | The Free Software Foundation recommends and endorses these GNU/Linux
+# | distros, although [-we-] {+<strong>we+} do not try to judge or compare
+# | them based on any criterion other than [-freedom;-] {+freedom</strong>;+}
+# | therefore, we list them in alphabetical order.  [-We encourage you to read
+# | these brief descriptions and to consult their respective web sites and
+# | other information to choose the one best for you.-]
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "De Free Software Foundation raadt deze GNU/Linux-distributies aan en "
 "ondersteunt ze; we proberen ze niet te vergelijken op andere criteria dan "
@@ -67,14 +141,32 @@
 "te raadplegen, om die distributie te kiezen die het beste bij je past. "
 
 #. type: Content of: <p>
+# | These distros are ready-to-use full systems whose developers have made a
+# | commitment to follow the <a
+# | href=\"/distros/free-system-distribution-guidelines.html\">Guidelines for
+# | Free System Distributions</a>.  This means [-these distros-] {+they+} will
+# | include, and propose, exclusively free software.  They will reject nonfree
+# | applications, nonfree programming platforms, nonfree drivers, nonfree
+# | firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree
+# | software, as well as nonfree manuals or documentation.
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Deze distributies zijn complete systemen die klaar zijn voor gebruik en hun "
 "ontwikkelaars hebben beloofd om de <a href=\"/distros/free-system-"
@@ -132,34 +224,31 @@
 
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
-msgstr ""
-"<strong>Alle onderstaande distributies zijn te installeren op de harde "
-"schijf van een computer, sommigen kunnen live worden uitgevoerd. Niet alle "
-"hardware werkt in de vrije wereld; elke distributie zou moeten vermelden "
-"welke hardware het ondersteunt.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
-msgstr ""
-"We raden deze distributies alleen aan vanwege vrijheid.  We proberen niet om "
-"deze distributies te beoordelen of vergelijken op andere criteria dan "
-"vrijheid; daarom staan ze in alfabetische volgorde. We raden je aan om hun "
-"websites en andere informatie te raadplegen om te beoordelen welke de beste "
-"is voor jou."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
+msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
 msgid "Distribution"
 msgstr "Distributie"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+# | {+Brief+} Description
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Beschrijving"
 
 #. type: Content of: <table><tr><td><a>
@@ -179,7 +268,10 @@
 msgstr "Blag Linux en GNU is een GNU/Linux-distributie gebaseerd op Fedora."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+# | <a [-href=\"http://dragora.org\";>-] {+href=\"https://dragora.org/\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -205,10 +297,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic is een GNU/Linux-distributie met speciale nadruk op audio- en "
-"videobewerking."
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -255,13 +346,17 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix is een GNU/Linux-distributie die is gebaseerd op Knoppix, met speciale "
-"nadruk op audioproductie."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+# | <a [-href=\"http://www.parabola.nu/https/\";>-]
+# | {+href=\"https://www.parabola.nu\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -303,7 +398,10 @@
 "gesponsord door de FSF."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+# | <a href=\"http{+s+}://trisquel.info/\">
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -327,14 +425,28 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+# | Ututo [-X-]S, a GNU/Linux [-distribution based on Gentoo.-] {+100% free
+# | distribution.+}  It was the first fully free GNU/Linux system recognized
+# | by the GNU Project.
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS is een GNU/Linux-distributie die is gebaseerd op Gentoo. Het was "
 "het eerste volledig vrije GNU/Linux-systeem dat is erkend door het GNU-"
 "project."
 
+#. type: Content of: <h3>
+# | [-Free-]{+Small+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Vrije GNU/Linux-distributies"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -389,6 +501,13 @@
 "worden geconfigureerd op build- en uitvoertijd voor verschillende hardware "
 "en gebruikersscenario's."
 
+#. type: Content of: <h3>
+# | [-Free-]{+How to get free+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Vrije GNU/Linux-distributies"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -406,29 +525,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"<a href=\"/distros/free-non-gnu-distros.html\">Niet-GNU-gebaseerde vrije "
-"systeemdistributies</a> worden apart vermeld."
+"<a href=\"/software/software.html\">Individuele GNU-pakketten</a> (waarvan "
+"de meeste in deze vrije distributies zijn opgenomen) worden apart beschreven."
 
 #. type: Content of: <p>
+# | We list <a [-href=\"/links/companies.html\">companies-]
+# | 
{+href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-freedom\";>
+# | companies+} that sell hardware preinstalled with a free GNU/Linux
+# | distribution</a> separately.
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
 msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "We vermelden ook <a href=\"/links/companies.html\">bedrijven die hardware "
 "verkopen met daarop  een vrije GNU/Linux-distributie voorge&iuml;nstalleerd</"
 "a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"<a href=\"/software/software.html\">Individuele GNU-pakketten</a> (waarvan "
-"de meeste in deze vrije distributies zijn opgenomen) worden apart beschreven."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "Iets gevonden dat we vergeten zijn?"
@@ -515,8 +635,15 @@
 "href=\"/server/standards/README.translations.html\"> Translations README</a> "
 "voor informatie over het onderhoud van vertalingen op deze website."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+# | Copyright &copy; 2014, 2015, 2016, [-2017-] {+2017, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -541,6 +668,55 @@
 msgid "Updated:"
 msgstr "Bijgewerkt:"
 
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Alle onderstaande distributies zijn te installeren op de harde "
+#~ "schijf van een computer, sommigen kunnen live worden uitgevoerd. Niet "
+#~ "alle hardware werkt in de vrije wereld; elke distributie zou moeten "
+#~ "vermelden welke hardware het ondersteunt.</strong>"
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "We raden deze distributies alleen aan vanwege vrijheid.  We proberen niet "
+#~ "om deze distributies te beoordelen of vergelijken op andere criteria dan "
+#~ "vrijheid; daarom staan ze in alfabetische volgorde. We raden je aan om "
+#~ "hun websites en andere informatie te raadplegen om te beoordelen welke de "
+#~ "beste is voor jou."
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic is een GNU/Linux-distributie met speciale nadruk op audio- en "
+#~ "videobewerking."
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix is een GNU/Linux-distributie die is gebaseerd op Knoppix, met "
+#~ "speciale nadruk op audioproductie."
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "<a href=\"/distros/free-non-gnu-distros.html\">Niet-GNU-gebaseerde vrije "
+#~ "systeemdistributies</a> worden apart vermeld."
+
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"
 

Index: distros/po/free-distros.pl-diff.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.pl-diff.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- distros/po/free-distros.pl-diff.html        22 Dec 2017 07:59:28 -0000      
1.10
+++ distros/po/free-distros.pl-diff.html        14 Apr 2018 11:33:14 -0000      
1.11
@@ -18,38 +18,72 @@
       href="http://www.gnu.org/distros/distros.rss";
       type="application/rss+xml" /&gt;
 &lt;style type="text/css" media="screen"&gt;&lt;!--
+<span class="inserted"><ins><em>h2 { margin-bottom: 1.5em; }
+h3 { margin: 1.8em 0 1.3em; }
+.summary {
+   padding-top: .7em; padding-bottom: 1.2em;
+   margin-top: 0;
+   border: .15em dotted #ccc;
+}
+.note { margin-top: .8em; margin-bottom: 1em; }
+p.highlight {
+   border: .1em solid #ccc;
+   margin-bottom: 0;
+}
+table.listing { margin-bottom: 3em; }</em></ins></span>
 td.icon { width: 20%; }
 td.icon img { max-width: 100%; max-height: 4em; }
+<span class="inserted"><ins><em>@media (max-width: 48em) {
+   .note, .summary { width: 30em; max-width: 93%; }
+}</em></ins></span>
 --&gt;&lt;/style&gt;
-
 &lt;!--#include virtual="/distros/po/free-distros.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;h2&gt;Free GNU/Linux distributions&lt;/h2&gt;
+
 &lt;!--#include virtual="/licenses/fsf-licensing.html" --&gt;
 
-&lt;blockquote&gt;
-&lt;p&gt;&lt;em&gt;&lt;span class="highlight"&gt;The &lt;a 
href="http://www.fsf.org/"&gt;Free
-Software Foundation&lt;/a&gt; is not responsible for other web sites, or how
-up-to-date their information is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt; 
-&lt;/blockquote&gt;
+<span class="removed"><del><strong>&lt;blockquote&gt;
+&lt;p&gt;&lt;em&gt;&lt;span class="highlight"&gt;The</strong></del></span>
+<span class="inserted"><ins><em>&lt;div class="summary"&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;
+&lt;ul&gt;
+  &lt;li&gt;&lt;a href="#intro"&gt;Introduction&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#for-pc"&gt;GNU/Linux distros for PCs and 
workstations&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#small-distros"&gt;Small GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#howto-get"&gt;How to get free GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/distros/free-non-gnu-distros.html"&gt;Other free 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#NewDistro"&gt;See something we 
missed?&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p class="highlight"&gt;&lt;em&gt;The</em></ins></span> &lt;a 
href="http://www.fsf.org/"&gt;Free
+Software Foundation&lt;/a&gt; is not responsible for other <span 
class="removed"><del><strong>web sites,</strong></del></span> <span 
class="inserted"><ins><em>websites,</em></ins></span> or how
+up-to-date their information <span 
class="removed"><del><strong>is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt; 
+&lt;/blockquote&gt;</strong></del></span> <span 
class="inserted"><ins><em>is.&lt;/em&gt;&lt;/p&gt; 
+&lt;/div&gt;
+&lt;hr class="no-display" /&gt;
+
+&lt;h3 id="intro"&gt;Introduction&lt;/h3&gt;</em></ins></span>
 
 &lt;p&gt;This page lists the &lt;a 
href="/gnu/linux-and-gnu.html"&gt;GNU/Linux&lt;/a&gt;
 distributions that are
 entirely &lt;a href="/philosophy/free-sw.html"&gt;free&lt;/a&gt; as in freedom.
-All of the distributions that follow are installable to a
-computer's hard drive; most can be run live.&lt;/p&gt;
+<span class="removed"><del><strong>All of the</strong></del></span>
+<span class="inserted"><ins><em>Non-GNU-based free system</em></ins></span> 
distributions <span class="removed"><del><strong>that 
follow</strong></del></span> are <span class="removed"><del><strong>installable 
to a
+computer's hard drive; most can be run live.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>listed &lt;a
+href="/distros/free-non-gnu-distros.html"&gt;separately&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;The Free Software Foundation recommends and endorses these GNU/Linux
-distros, although we do not try to judge or compare them based on any
-criterion other than freedom; therefore, we list them in alphabetical
-order.  We encourage you to read these brief descriptions and to
+distros, although <span class="removed"><del><strong>we</strong></del></span> 
<span class="inserted"><ins><em>&lt;strong&gt;we</em></ins></span> do not try 
to judge or compare them based on any
+criterion other than <span 
class="removed"><del><strong>freedom;</strong></del></span> <span 
class="inserted"><ins><em>freedom&lt;/strong&gt;;</em></ins></span> therefore, 
we list them in alphabetical
+<span class="removed"><del><strong>order.  We encourage you to read these 
brief descriptions and to
 consult their respective web sites and other information to choose the
-one best for you.&lt;/p&gt;
+one best for you.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>order.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;These distros are ready-to-use full systems whose developers have made
 a commitment to follow the 
 &lt;a href="/distros/free-system-distribution-guidelines.html"&gt;Guidelines
-for Free System Distributions&lt;/a&gt;.  This means these distros will
+for Free System Distributions&lt;/a&gt;.  This means <span 
class="removed"><del><strong>these distros</strong></del></span> <span 
class="inserted"><ins><em>they</em></ins></span> will
 include, and propose, exclusively free software.  They will reject
 nonfree applications, nonfree programming platforms, nonfree drivers,
 nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other
@@ -74,17 +108,27 @@
 improve the state of free distros, helping to develop an existing free
 distro contributes more than starting a new one.&lt;/p&gt;
 
-&lt;p&gt;&lt;strong&gt;All of the distributions that follow are installable to 
a
-computer's hard drive; most can be run live.  Not all hardware works
-in the free world; each distro's site should say which hardware it
-supports.&lt;/strong&gt;&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;All of the 
distributions</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Please note</em></ins></span> that 
<span class="removed"><del><strong>follow are installable to a
+computer's hard drive; most can be run live.  Not</strong></del></span> <span 
class="inserted"><ins><em>not</em></ins></span> all hardware works in the free 
world; each
+distro's site should say which hardware it
+<span class="removed"><del><strong>supports.&lt;/strong&gt;&lt;/p&gt;
 
 &lt;p&gt;We endorse these distros only for freedom.  We do not try to judge
 or compare these distros based on any other criterion; therefore, we
-list them in alphabetical order.  We suggest you consult their
-respective web sites and other information to judge which one is most
+list them in alphabetical order.</strong></del></span> <span 
class="inserted"><ins><em>supports.</em></ins></span> We suggest <span 
class="inserted"><ins><em>that,
+after reading the short descriptions below,</em></ins></span> you consult 
<span class="removed"><del><strong>their
+respective web</strong></del></span> <span 
class="inserted"><ins><em>these</em></ins></span> sites <span 
class="removed"><del><strong>and</strong></del></span> <span 
class="inserted"><ins><em>as
+well as</em></ins></span> other <span 
class="removed"><del><strong>information</strong></del></span> <span 
class="inserted"><ins><em>available information,</em></ins></span> to judge 
which <span class="removed"><del><strong>one</strong></del></span> <span 
class="inserted"><ins><em>distro</em></ins></span> is most
 convenient for you.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h3 id="for-pc"&gt;GNU/Linux distros for 
PCs and
+workstations&lt;/h3&gt;
+
+&lt;p&gt;The distributions that follow are installable to a computer's hard
+drive and/or can be run live.&lt;/p&gt;</em></ins></span>
+
 &lt;!-- Do not add or remove anything from this list without a lot of
      discussion, following the usual process, and confirmation by RMS. See 
      http://www.gnu.org/server/standards/index.html#distros --&gt;
@@ -92,16 +136,17 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
-&lt;tr class="odd"&gt;
+  &lt;tr class="odd"&gt;
    &lt;td class="icon"&gt;&lt;a href="http://www.blagblagblag.org/"&gt;
        &lt;img src="/graphics/distros-blag.jpg" alt="BLAG Linux and GNU" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;BLAG Linux and GNU, a GNU/Linux distribution based on 
Fedora.&lt;/td&gt;&lt;/tr&gt;
 
  &lt;tr class="even"&gt;
-   &lt;td class="icon"&gt;&lt;a href="http://dragora.org"&gt;
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://dragora.org"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://dragora.org/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-dragora.png"
             alt="Dragora GNU/Linux-Libre" /&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Dragora GNU/Linux-Libre, an independent GNU/Linux distribution
@@ -111,7 +156,9 @@
    &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://www.dynebolic.org"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.dyne.org/software/dynebolic/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-dyen.png" alt="Dynebolic" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Dynebolic, a GNU/Linux distribution with special emphasis on 
audio 
-       and video editing.&lt;/td&gt;&lt;/tr&gt;
+       and video <span 
class="removed"><del><strong>editing.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>editing. This is a &ldquo;static&rdquo; 
distro, normally
+       run from a live CD. Since it will not receive security updates, it
+       should be used offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="http://www.gnewsense.org/"&gt;
@@ -126,29 +173,30 @@
        on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
        functional package manager for the GNU system. &lt;/td&gt;&lt;/tr&gt;
 
-    
  &lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="https://musixdistro.wordpress.com/"&gt;
        &lt;img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Musix, a GNU+Linux distribution based on Knoppix, with special
-       emphasis on audio production.&lt;/td&gt;&lt;/tr&gt;
+       emphasis on audio <span 
class="removed"><del><strong>production.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>production. This is a &ldquo;static&rdquo;
+       distro, normally run from a live CD. Since it will not receive
+       security updates, it should be used 
offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr class="odd"&gt;
-   &lt;td class="icon"&gt;&lt;a href="http://www.parabola.nu/https/"&gt;
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://www.parabola.nu/https/"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.parabola.nu"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-parabola.png"
             alt="Parabola GNU/Linux-libre" /&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Parabola GNU/Linux-libre, a distribution based on Arch that
        prioritizes simple package and system management.&lt;/td&gt;&lt;/tr&gt;
 
  &lt;tr class="even"&gt;
-   &lt;td class="icon"&gt;&lt;a <span 
class="inserted"><ins><em>href="https://pureos.net/"&gt;
-       &lt;img src="/graphics/pureos-logo-small.png"
+   &lt;td class="icon"&gt;&lt;a <span 
class="removed"><del><strong>href="http://trisquel.info/"&gt;</strong></del></span>
 <span class="inserted"><ins><em>href="https://pureos.net/"&gt;
+       &lt;img src="/graphics/pureos-logo-small.png" style="max-height: 1.8em;"
             alt="PureOS" /&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;PureOS, a GNU distribution based on Debian with a focus on
        privacy, security, and convenience.&lt;/td&gt;&lt;/tr&gt;
  
  &lt;tr class="odd"&gt;
-   &lt;td class="icon"&gt;&lt;a</em></ins></span> 
href="http://trisquel.info/"&gt;
+   &lt;td class="icon"&gt;&lt;a 
href="https://trisquel.info/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-trisquel.png" alt="Trisquel" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Trisquel, a GNU/Linux distribution based on Ubuntu that's 
oriented 
  toward small enterprises, domestic users and educational 
centers.&lt;/td&gt;&lt;/tr&gt;
@@ -156,12 +204,16 @@
 &lt;tr <span 
class="removed"><del><strong>class="odd"&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="even"&gt;</em></ins></span>
    &lt;td class="icon"&gt;&lt;a href="http://www.ututo.org/"&gt;
        &lt;img src="/graphics/distros-ututo.png" alt="Ututo" 
/&gt;&lt;/a&gt;&lt;/td&gt;
-   &lt;td&gt;Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the 
first
+   &lt;td&gt;Ututo <span 
class="removed"><del><strong>XS,</strong></del></span> <span 
class="inserted"><ins><em>S,</em></ins></span> a GNU/Linux <span 
class="removed"><del><strong>distribution based on 
Gentoo.</strong></del></span> <span class="inserted"><ins><em>100% free 
distribution.</em></ins></span>  It was the first
        fully free GNU/Linux system recognized by the GNU 
Project.&lt;/td&gt;&lt;/tr&gt;
 
 &lt;/table&gt;
 
-&lt;p id="small-distros"&gt;Below is a list of small system distributions. 
These 
+<span class="removed"><del><strong>&lt;p 
id="small-distros"&gt;Below</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 id="small-distros"&gt;Small GNU/Linux 
distros&lt;/h3&gt;
+
+&lt;p&gt;Below</em></ins></span> is a list of small system distributions. 
These 
    distributions are meant for devices with limited resources, like a 
    wireless router for example. A free small system distribution is not 
    self-hosting, but it must be developable and buildable on top of one of 
@@ -170,7 +222,8 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
  &lt;tr class="odd"&gt;
@@ -190,6 +243,8 @@
 
 &lt;/table&gt;
 
+<span class="inserted"><ins><em>&lt;h3 id="howto-get"&gt;How to get free 
GNU/Linux distros&lt;/h3&gt;</em></ins></span>
+
 &lt;p&gt;In addition to their own sites, many of these distributions are
 available from &lt;a href="http://mirror.fsf.org/"&gt;mirror.fsf.org&lt;/a&gt;.
 Feel free to download or mirror the distributions from there,
@@ -197,16 +252,21 @@
 mirror for their project by mailing the 
 &lt;a href="mailto:address@hidden"&gt;FSF sysadmins&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p id="other-free"&gt;Non-GNU-based free system distributions are
+<span class="removed"><del><strong>&lt;p id="other-free"&gt;Non-GNU-based free 
system distributions are
 listed in &lt;a href="/distros/free-non-gnu-distros.html"&gt;a separate 
file&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;We list &lt;a href="/links/companies.html"&gt;companies that sell 
hardware
-preinstalled with a free GNU/Linux distribution&lt;/a&gt; separately.&lt;/p&gt;
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</strong></del></span>
 
 &lt;p&gt;&lt;a href="/software/software.html"&gt;Individual GNU
 packages&lt;/a&gt; (most of which are included in the free distributions here) 
 are described separately.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;p&gt;We list &lt;a
+href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom"&gt;
+companies that sell hardware
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</em></ins></span>
+
 &lt;h3 id="NewDistro"&gt;See something we missed?&lt;/h3&gt;
 
 &lt;p&gt;Do you know about a distribution that you expected to find on our
@@ -275,7 +335,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, 
Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, 2016, <span 
class="removed"><del><strong>2017</strong></del></span> <span 
class="inserted"><ins><em>2017, 2018</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -285,7 +345,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2017/12/22 07:59:28 $
+$Date: 2018/04/14 11:33:14 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: distros/po/free-distros.pl.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.pl.po,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- distros/po/free-distros.pl.po       21 Dec 2017 17:59:24 -0000      1.123
+++ distros/po/free-distros.pl.po       14 Apr 2018 11:33:14 -0000      1.124
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2015-07-17 21:35-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <address@hidden>\n"
@@ -31,22 +31,78 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Wolne dystrybucje GNU/Linuksa"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Spis treści"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+# | [-See-]{+<a href=\"#NewDistro\">See+} something we [-missed?-]
+# | {+missed?</a>+}
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "Pominęliśmy coś?"
+
+#. type: Content of: <div><p>
+# | [-<em><span class=\"highlight\">The-]{+<em>The+} <a
+# | href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not
+# | responsible for other web[- -]sites, or how up-to-date their information
+# | [-is.</span></em>-] {+is.</em>+}
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\"><a href=\"http://www.fsf.org/\";>Free Software "
 "Foundation</a> nie jest odpowiedzialna za&nbsp;zawartość 
lub&nbsp;aktualność "
 "zewnętrznych witryn internetowych.</span></em>"
 
+#. type: Content of: <h3>
+msgid "Introduction"
+msgstr "Wprowadzenie"
+
 #. type: Content of: <p>
+# | This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>
+# | distributions that are entirely <a
+# | href=\"/philosophy/free-sw.html\">free</a> as in freedom.  [-All of the-] 
+# | {+Non-GNU-based free system+} distributions [-that follow-] are
+# | [-installable to a computer's hard drive; most can be run live.-] {+listed
+# | <a href=\"/distros/free-non-gnu-distros.html\">separately</a>.+}
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "Na&nbsp;tej stronie jest lista dystrybucji <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a>, które zawierają wyłącznie <a 
href=\"/philosophy/free-sw."
@@ -55,13 +111,25 @@
 "&bdquo;live&rdquo;."
 
 #. type: Content of: <p>
+# | The Free Software Foundation recommends and endorses these GNU/Linux
+# | distros, although [-we-] {+<strong>we+} do not try to judge or compare
+# | them based on any criterion other than [-freedom;-] {+freedom</strong>;+}
+# | therefore, we list them in alphabetical order.  [-We encourage you to read
+# | these brief descriptions and to consult their respective web sites and
+# | other information to choose the one best for you.-]
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "Free Software Foundation poleca i&nbsp;zatwierdza te dystrybucje GNU/Linux, "
 "ale&nbsp;nie próbujemy ich osądzać ani&nbsp;porównywać według 
jakichkolwiek "
@@ -71,14 +139,32 @@
 "najlepszą dla Was."
 
 #. type: Content of: <p>
+# | These distros are ready-to-use full systems whose developers have made a
+# | commitment to follow the <a
+# | href=\"/distros/free-system-distribution-guidelines.html\">Guidelines for
+# | Free System Distributions</a>.  This means [-these distros-] {+they+} will
+# | include, and propose, exclusively free software.  They will reject nonfree
+# | applications, nonfree programming platforms, nonfree drivers, nonfree
+# | firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree
+# | software, as well as nonfree manuals or documentation.
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Poniższe dystrybucje to kompletne, gotowe do&nbsp;użycia, systemy których "
 "deweloperzy podjęły silne zobowiązanie, aby&nbsp;podporządkować się <a 
href="
@@ -137,35 +223,31 @@
 
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
-msgstr ""
-"<strong>Każdą z&nbsp;niżej wymienionych dystrybucji można zainstalować "
-"na&nbsp;dysku twardym; wiele z&nbsp;nich można uruchomić w&nbsp;trybie "
-"&bdquo;live&rdquo;. Nie każdy sprzęt działa w&nbsp;świecie wolnego "
-"oprogramowania; strona każdej dystrybucji powinna pisać na&nbsp;jakim "
-"sprzęcie działa.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
-msgstr ""
-"My zatwierdzamy te dystrybucje jedynie z&nbsp;punktu widzenia wolności. Nie "
-"próbujemy ich osądzać ani&nbsp;porównywać według jakichkolwiek innych "
-"kryteriów, dlatego&nbsp;są wymienione w&nbsp;kolejności alfabetycznej. "
-"Sugerujemy abyście odwiedzili strony dystrybucji aby&nbsp;wybrać najlepszą 
"
-"dla Was."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
+msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
 msgid "Distribution"
 msgstr "Dystrybucja"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+# | {+Brief+} Description
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Opis"
 
 #. type: Content of: <table><tr><td><a>
@@ -185,7 +267,10 @@
 msgstr "BLAG Linux i&nbsp;GNU, dystrybucja GNU/Linuksa oparta na&nbsp;Fedorze."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+# | <a [-href=\"http://dragora.org\";>-] {+href=\"https://dragora.org/\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -215,10 +300,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic, dystrybucja GNU/Linuksa koncentrująca się na&nbsp;edycji audio "
-"i&nbsp;video."
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -265,13 +349,17 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix GNU+Linux, dystrybucja GNU/Linuksa oparta na&nbsp;Knoppiksie, "
-"koncentrująca się na&nbsp;obróbce audio."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+# | <a [-href=\"http://www.parabola.nu/https/\";>-]
+# | {+href=\"https://www.parabola.nu\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -313,7 +401,10 @@
 "przez FSF."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+# | <a href=\"http{+s+}://trisquel.info/\">
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -338,13 +429,27 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+# | Ututo [-X-]S, a GNU/Linux [-distribution based on Gentoo.-] {+100% free
+# | distribution.+}  It was the first fully free GNU/Linux system recognized
+# | by the GNU Project.
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS, dystrybucja GNU/Linuksa oparta na&nbsp;Gentoo; był to pierwszy "
 "całkowicie wolny system uznany przez projekt GNU."
 
+#. type: Content of: <h3>
+# | [-Free-]{+Small+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Wolne dystrybucje GNU/Linuksa"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -399,6 +504,13 @@
 "pakiety binarne były konfigurowane zarówno przy kompilacji jak i&nbsp;przy "
 "uruchamianiu dla różnego sprzętu i&nbsp;różnych zastosowań."
 
+#. type: Content of: <h3>
+# | [-Free-]{+How to get free+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Wolne dystrybucje GNU/Linuksa"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -416,29 +528,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"Wolne dystrybucje, które nie są na&nbsp;bazie GNU są <a 
href=\"/distros/free-"
-"non-gnu-distros.html\">w&nbsp;oddzielnym pliku</a>."
+"<a href=\"/software/software.html\">Konkretne pakiety GNU</a> (w większości 
"
+"są one zawarte w&nbsp;wolnych dystrybucjach) są opisane oddzielnie."
 
 #. type: Content of: <p>
+# | We list <a [-href=\"/links/companies.html\">companies-]
+# | 
{+href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-freedom\";>
+# | companies+} that sell hardware preinstalled with a free GNU/Linux
+# | distribution</a> separately.
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
 msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "Sporządziliśmy odrębną <a href=\"/links/companies.html\">listę firm "
 "sprzedających sprzęt komputerowy z&nbsp;zainstalowanym fabrycznie wolnym 
GNU/"
 "Linuksem</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"<a href=\"/software/software.html\">Konkretne pakiety GNU</a> (w większości 
"
-"są one zawarte w&nbsp;wolnych dystrybucjach) są opisane oddzielnie."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "Pominęliśmy coś?"
@@ -531,8 +644,13 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+# | Copyright &copy; 2014, 2015, [-2016-] {+2016, 2017, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -557,6 +675,56 @@
 msgid "Updated:"
 msgstr "Aktualizowane:"
 
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Każdą z&nbsp;niżej wymienionych dystrybucji można 
zainstalować "
+#~ "na&nbsp;dysku twardym; wiele z&nbsp;nich można uruchomić w&nbsp;trybie "
+#~ "&bdquo;live&rdquo;. Nie każdy sprzęt działa w&nbsp;świecie wolnego "
+#~ "oprogramowania; strona każdej dystrybucji powinna pisać na&nbsp;jakim "
+#~ "sprzęcie działa.</strong>"
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "My zatwierdzamy te dystrybucje jedynie z&nbsp;punktu widzenia wolności. "
+#~ "Nie próbujemy ich osądzać ani&nbsp;porównywać według jakichkolwiek 
innych "
+#~ "kryteriów, dlatego&nbsp;są wymienione w&nbsp;kolejności alfabetycznej. "
+#~ "Sugerujemy abyście odwiedzili strony dystrybucji aby&nbsp;wybrać "
+#~ "najlepszą dla Was."
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, dystrybucja GNU/Linuksa koncentrująca się na&nbsp;edycji 
audio "
+#~ "i&nbsp;video."
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix GNU+Linux, dystrybucja GNU/Linuksa oparta na&nbsp;Knoppiksie, "
+#~ "koncentrująca się na&nbsp;obróbce audio."
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "Wolne dystrybucje, które nie są na&nbsp;bazie GNU są <a 
href=\"/distros/"
+#~ "free-non-gnu-distros.html\">w&nbsp;oddzielnym pliku</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"
 

Index: distros/po/free-distros.pot
===================================================================
RCS file: /web/www/www/distros/po/free-distros.pot,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- distros/po/free-distros.pot 21 Dec 2017 17:59:24 -0000      1.85
+++ distros/po/free-distros.pot 14 Apr 2018 11:33:14 -0000      1.86
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -26,30 +26,59 @@
 msgid "Free GNU/Linux distributions"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how "
-"up-to-date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "Introduction"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a "
-"href=\"/philosophy/free-sw.html\">free</a> as in freedom.  All of the "
-"distributions that follow are installable to a computer's hard drive; most "
-"can be run live."
+"href=\"/philosophy/free-sw.html\">free</a> as in freedom.  Non-GNU-based "
+"free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 
 #. type: Content of: <p>
@@ -57,9 +86,9 @@
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a "
 "href=\"/distros/free-system-distribution-guidelines.html\">Guidelines for "
-"Free System Distributions</a>.  This means these distros will include, and "
-"propose, exclusively free software.  They will reject nonfree applications, "
-"nonfree programming platforms, nonfree drivers, nonfree firmware "
+"Free System Distributions</a>.  This means they will include, and propose, "
+"exclusively free software.  They will reject nonfree applications, nonfree "
+"programming platforms, nonfree drivers, nonfree firmware "
 "&ldquo;blobs&rdquo;, nonfree games, and any other nonfree software, as well "
 "as nonfree manuals or documentation."
 msgstr ""
@@ -94,17 +123,20 @@
 
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
+"The distributions that follow are installable to a computer's hard drive "
+"and/or can be run live."
 msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
@@ -112,7 +144,7 @@
 msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+msgid "Brief Description"
 msgstr ""
 
 #. type: Content of: <table><tr><td><a>
@@ -132,7 +164,7 @@
 msgstr ""
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr ""
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -156,7 +188,8 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live "
+"CD. Since it will not receive security updates, it should be used offline."
 msgstr ""
 
 #. type: Content of: <table><tr><td><a>
@@ -199,11 +232,13 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr ""
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -231,7 +266,7 @@
 msgstr ""
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr ""
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -254,8 +289,12 @@
 
 #. type: Content of: <table><tr><td>
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "Small GNU/Linux distros"
 msgstr ""
 
 #. type: Content of: <p>
@@ -298,6 +337,10 @@
 "build-time and run-time for different hardware and use cases."
 msgstr ""
 
+#. type: Content of: <h3>
+msgid "How to get free GNU/Linux distros"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -309,21 +352,17 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a "
-"href=\"/distros/free-non-gnu-distros.html\">a separate file</a>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described "
+"separately."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described "
-"separately."
+"We list <a "
+"href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-freedom\";> "
+"companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 
 #. type: Content of: <h3>
@@ -391,7 +430,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: distros/po/free-distros.pt-br.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.pt-br.po,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- distros/po/free-distros.pt-br.po    31 Mar 2018 23:29:53 -0000      1.76
+++ distros/po/free-distros.pt-br.po    14 Apr 2018 11:33:14 -0000      1.77
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2018-03-31 01:01-0300\n"
 "Last-Translator: Rafael Fontenelle <address@hidden>\n"
 "Language-Team: Brazilian Portuguese <address@hidden>\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: 2018-04-14 11:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Virtaal 1.0.0-beta1\n"
 
@@ -33,22 +34,70 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Distribuições Livres de GNU/Linux"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Conteúdo"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "Há algo que nós esquecemos?"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\">A <a href=\"http://www.fsf.org/\";>Free "
 "Software Foundation</a> não é responsável por outros sites, ou o quão "
 "atualizada a informação está.</span></em>"
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "Introdução"
+
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "Esta página lista as distribuições <a 
href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> que são completamente <a 
href=\"/philosophy/free-sw.html\">livres</"
@@ -56,13 +105,19 @@
 "disco rígido; a maioria pode ser utilizada via “Live CD”."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "A Free Software Foundation recomenda e aprova essas distros GNU/Linux, não "
 "havendo qualquer intenção em julgar ou compará-las com base em nenhum 
outro "
@@ -72,14 +127,24 @@
 "para você."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Essas distros são sistemas completos prontos para serem usados cujos "
 "desenvolvedores fizeram o compromisso de seguir as <a href=\"/distros/free-"
@@ -138,34 +203,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
-msgstr ""
-"<strong>Todas as distribuições relacionadas abaixo podem ser instaladas no "
-"disco rígido de um computador; muitas delas operam sem a necessidade de "
-"instalação. Nem todo hardware funciona em um mundo livre; o site de cada "
-"distro deve dizer qual hardware ela suporta.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
-msgstr ""
-"Nós aprovamos essas distros apenas pela liberdade. Não tentamos julgar ou "
-"comparar as distribuições se baseando em qualquer outro critério; 
portanto, "
-"as listamos em ordem alfabética. Nós sugerimos que você consulte seus "
-"respectivos sites e outras informações para escolher qual delas é a melhor 
"
-"para você."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
+msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
 msgid "Distribution"
 msgstr "Distribuição"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Descrição"
 
 #. type: Content of: <table><tr><td><a>
@@ -186,7 +247,9 @@
 msgstr "BLAG Linux e GNU, uma distribuição de GNU/Linux baseada no Fedora."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -212,10 +275,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic, uma distribuição de GNU/Linux com ênfase especial na edição 
de "
-"áudio e vídeo."
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -262,13 +324,15 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix GNU+Linux, uma distribuição de GNU/Linux baseada no Knoppix, com "
-"ênfase especial na produção de áudio."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -300,7 +364,9 @@
 "privacidade, segurança e conveniência."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -324,13 +390,23 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS, uma distribuição de GNU/Linux baseada no Gentoo. Foi o primeiro "
 "sistema GNU/Linux totalmente livre reconhecido pelo Projeto GNU."
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Distribuições Livres de GNU/Linux"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -385,6 +461,12 @@
 "binários sejam configurados em tempo de compilação e de execução para "
 "hardwares e casos de uso diferentes."
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Distribuições Livres de GNU/Linux"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -402,30 +484,27 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"Distribuições não GNU estão listadas em <a href=\"/distros/free-non-gnu-"
-"distros.html\">um arquivo separado</a>."
+"<a href=\"/software/software.html\">Os pacotes individuais do GNU</a> (a "
+"maioria dos quais estão inclusos nas distribuições livres) estão 
descritos "
+"separadamente."
 
 #. type: Content of: <p>
-msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
+msgid ""
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "Temos outra lista em separado com <a href=\"/links/companies.html\"> as "
 "empresas que vendem hardware com uma distribuição de GNU/Linux livre pré-"
 "instalada</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"<a href=\"/software/software.html\">Os pacotes individuais do GNU</a> (a "
-"maioria dos quais estão inclusos nas distribuições livres) estão 
descritos "
-"separadamente."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "Há algo que nós esquecemos?"
@@ -517,7 +596,11 @@
 "envio de traduções das páginas desse site."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -550,6 +633,55 @@
 msgid "Updated:"
 msgstr "Última atualização: "
 
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Todas as distribuições relacionadas abaixo podem ser instaladas "
+#~ "no disco rígido de um computador; muitas delas operam sem a necessidade "
+#~ "de instalação. Nem todo hardware funciona em um mundo livre; o site de "
+#~ "cada distro deve dizer qual hardware ela suporta.</strong>"
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "Nós aprovamos essas distros apenas pela liberdade. Não tentamos julgar 
ou "
+#~ "comparar as distribuições se baseando em qualquer outro critério; "
+#~ "portanto, as listamos em ordem alfabética. Nós sugerimos que você "
+#~ "consulte seus respectivos sites e outras informações para escolher qual "
+#~ "delas é a melhor para você."
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, uma distribuição de GNU/Linux com ênfase especial na 
edição de "
+#~ "áudio e vídeo."
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix GNU+Linux, uma distribuição de GNU/Linux baseada no Knoppix, com "
+#~ "ênfase especial na produção de áudio."
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "Distribuições não GNU estão listadas em <a 
href=\"/distros/free-non-gnu-"
+#~ "distros.html\">um arquivo separado</a>."
+
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"
 

Index: distros/po/free-distros.ro-diff.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ro-diff.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- distros/po/free-distros.ro-diff.html        22 Dec 2017 07:59:28 -0000      
1.43
+++ distros/po/free-distros.ro-diff.html        14 Apr 2018 11:33:14 -0000      
1.44
@@ -18,42 +18,70 @@
       href="http://www.gnu.org/distros/distros.rss";
       type="application/rss+xml" /&gt;
 <span class="inserted"><ins><em>&lt;style type="text/css" 
media="screen"&gt;&lt;!--
+h2 { margin-bottom: 1.5em; }
+h3 { margin: 1.8em 0 1.3em; }
+.summary {
+   padding-top: .7em; padding-bottom: 1.2em;
+   margin-top: 0;
+   border: .15em dotted #ccc;
+}
+.note { margin-top: .8em; margin-bottom: 1em; }
+p.highlight {
+   border: .1em solid #ccc;
+   margin-bottom: 0;
+}
+table.listing { margin-bottom: 3em; }
 td.icon { width: 20%; }
 td.icon img { max-width: 100%; max-height: 4em; }
address@hidden (max-width: 48em) {
+   .note, .summary { width: 30em; max-width: 93%; }
+}
 --&gt;&lt;/style&gt;</em></ins></span>
-
 &lt;!--#include virtual="/distros/po/free-distros.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;h2&gt;Free GNU/Linux distributions&lt;/h2&gt;
+
+<span class="removed"><del><strong>&lt;p&gt;&lt;em&gt;&lt;span 
class="highlight"&gt;The FSF</strong></del></span>
+
 <span class="inserted"><ins><em>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;
+&lt;div class="summary"&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;
+&lt;ul&gt;
+  &lt;li&gt;&lt;a href="#intro"&gt;Introduction&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#for-pc"&gt;GNU/Linux distros for PCs and 
workstations&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#small-distros"&gt;Small GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#howto-get"&gt;How to get free GNU/Linux 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/distros/free-non-gnu-distros.html"&gt;Other free 
distros&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#NewDistro"&gt;See something we 
missed?&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p class="highlight"&gt;&lt;em&gt;The &lt;a 
href="http://www.fsf.org/"&gt;Free
+Software Foundation&lt;/a&gt;</em></ins></span> is not responsible for other
+<span class="removed"><del><strong>web sites,</strong></del></span> <span 
class="inserted"><ins><em>websites,</em></ins></span> or how
+up-to-date their information <span 
class="removed"><del><strong>is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt;
 
-&lt;blockquote&gt;</em></ins></span>
-&lt;p&gt;&lt;em&gt;&lt;span class="highlight"&gt;The <span 
class="removed"><del><strong>FSF</strong></del></span> <span 
class="inserted"><ins><em>&lt;a href="http://www.fsf.org/"&gt;Free
-Software Foundation&lt;/a&gt;</em></ins></span> is not responsible for other 
web sites, or how
-up-to-date their information is.&lt;/span&gt;&lt;/em&gt;&lt;/p&gt;
+&lt;p&gt;Below are</strong></del></span> <span 
class="inserted"><ins><em>is.&lt;/em&gt;&lt;/p&gt; 
+&lt;/div&gt;
+&lt;hr class="no-display" /&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Below are</strong></del></span> 
-<span class="inserted"><ins><em>&lt;/blockquote&gt;
+&lt;h3 id="intro"&gt;Introduction&lt;/h3&gt;
 
 &lt;p&gt;This page lists</em></ins></span> the <span 
class="removed"><del><strong>complete,
 ready-to-use</strong></del></span> &lt;a 
href="/gnu/linux-and-gnu.html"&gt;GNU/Linux&lt;/a&gt;
 distributions <span class="inserted"><ins><em>that are
 entirely &lt;a href="/philosophy/free-sw.html"&gt;free&lt;/a&gt; as in freedom.
-All of the distributions that follow are installable to a
-computer's hard drive; most can be run live.&lt;/p&gt;
+Non-GNU-based free system distributions are listed &lt;a
+href="/distros/free-non-gnu-distros.html"&gt;separately&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;The Free Software Foundation recommends and endorses these GNU/Linux
-distros, although</em></ins></span> we <span 
class="removed"><del><strong>know</strong></del></span> <span 
class="inserted"><ins><em>do not try to judge or compare them based on any
-criterion other than freedom; therefore, we list them in alphabetical
-order.  We encourage you to read these brief descriptions and to
-consult their respective web sites and other information to choose the
-one best for you.&lt;/p&gt;
+distros, although &lt;strong&gt;we do not try to judge or compare them based 
on any
+criterion other than freedom&lt;/strong&gt;; therefore,</em></ins></span> we 
<span class="removed"><del><strong>know</strong></del></span> <span 
class="inserted"><ins><em>list them in alphabetical
+order.&lt;/p&gt;
 
 &lt;p&gt;These distros are ready-to-use full systems whose developers have made
 a commitment to</em></ins></span> follow the 
 &lt;a href="/distros/free-system-distribution-guidelines.html"&gt;Guidelines
 for Free System Distributions&lt;/a&gt;.  <span 
class="removed"><del><strong>They have a firm policy commitment
-to only include</strong></del></span>  <span class="inserted"><ins><em>This 
means these distros will
+to only include</strong></del></span>  <span class="inserted"><ins><em>This 
means they will
 include,</em></ins></span> and <span class="removed"><del><strong>only 
propose</strong></del></span> <span class="inserted"><ins><em>propose, 
exclusively</em></ins></span> free software.  They <span 
class="inserted"><ins><em>will</em></ins></span> reject <span 
class="removed"><del><strong>non-free</strong></del></span>
 <span class="inserted"><ins><em>nonfree</em></ins></span> applications, <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> programming platforms, 
<span class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> drivers, <span 
class="removed"><del><strong>or
 non-free</strong></del></span>
@@ -73,29 +101,35 @@
 while we inform the developers so they can fix the problem.&lt;/p&gt;
 
 &lt;p&gt;Fixing freedom bugs is an ethical requirement</em></ins></span> for 
<span class="removed"><del><strong>their ongoing work to 
achieve</strong></del></span> <span class="inserted"><ins><em>listing a distro
-here; therefore, we list only distros with a development 
team</em></ins></span> that <span 
class="removed"><del><strong>goal,</strong></del></span> <span 
class="inserted"><ins><em>has
-told us it will remove any nonfree software that might be found in
+here; therefore, we list only distros with a development team that has
+told us it will remove any nonfree software</em></ins></span> that <span 
class="removed"><del><strong>goal,</strong></del></span> <span 
class="inserted"><ins><em>might be found in
 them.  Usually the team consists of volunteers,</em></ins></span> and <span 
class="removed"><del><strong>hope</strong></del></span> <span 
class="inserted"><ins><em>they don't make
 legally binding commitments</em></ins></span> to <span 
class="inserted"><ins><em>users; but if we find out a distro is
 not properly maintained, we will de-list it.&lt;/p&gt;
 
 &lt;p&gt;We hope the other existing GNU/Linux distributions will become
-entirely free software so that we can</em></ins></span> list them <span 
class="removed"><del><strong>here some day.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>here.  If you wish to
-improve the state of free distros, helping to develop an existing free
-distro contributes more than starting a new one.&lt;/p&gt;</em></ins></span>
-
-&lt;p&gt;&lt;strong&gt;All of the distributions that follow are installable to 
a
-computer's hard <span class="removed"><del><strong>drive 
and</strong></del></span> <span 
class="inserted"><ins><em>drive;</em></ins></span> most can be run <span 
class="removed"><del><strong>live.&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>live.  Not all hardware works
-in the free world; each distro's site should say which hardware it
-supports.&lt;/strong&gt;&lt;/p&gt;</em></ins></span>
-
-&lt;p&gt;We <span class="removed"><del><strong>cannot make a general 
recommendation</strong></del></span> <span class="inserted"><ins><em>endorse 
these distros only</em></ins></span> for <span 
class="removed"><del><strong>using one over another,
-so they are listed here</strong></del></span> <span 
class="inserted"><ins><em>freedom.  We do not try to judge
-or compare these distros based on any other criterion; therefore, we
-list them</em></ins></span> in alphabetical order.  We <span 
class="removed"><del><strong>encourage</strong></del></span> <span 
class="inserted"><ins><em>suggest</em></ins></span> you <span 
class="removed"><del><strong>to read
-these brief descriptions and even more to explore</strong></del></span> <span 
class="inserted"><ins><em>consult</em></ins></span> their
-respective web sites and other information to <span 
class="removed"><del><strong>choose the</strong></del></span> <span 
class="inserted"><ins><em>judge which</em></ins></span> one <span 
class="removed"><del><strong>best</strong></del></span> <span 
class="inserted"><ins><em>is most
-convenient</em></ins></span> for you.&lt;/p&gt;
+entirely free software so that we can</em></ins></span> list them <span 
class="removed"><del><strong>here some day.&lt;/p&gt;
+
+&lt;p&gt;&lt;strong&gt;All</strong></del></span> <span 
class="inserted"><ins><em>here.  If you wish to
+improve the state</em></ins></span> of <span class="inserted"><ins><em>free 
distros, helping to develop an existing free
+distro contributes more than starting a new one.&lt;/p&gt;
+
+&lt;p&gt;Please note that not all hardware works in the free world; each
+distro's site should say which hardware it supports. We suggest that,
+after reading</em></ins></span> the <span class="inserted"><ins><em>short 
descriptions below, you consult these sites as
+well as other available information, to judge which distro is most
+convenient for you.&lt;/p&gt;
+
+&lt;h3 id="for-pc"&gt;GNU/Linux distros for PCs and
+workstations&lt;/h3&gt;
+
+&lt;p&gt;The</em></ins></span> distributions that follow are installable to a 
computer's hard
+drive <span class="removed"><del><strong>and most</strong></del></span> <span 
class="inserted"><ins><em>and/or</em></ins></span> can be run <span 
class="removed"><del><strong>live.&lt;/strong&gt;&lt;/p&gt;
+
+&lt;p&gt;We cannot make a general recommendation for using one over another,
+so they are listed here in alphabetical order.  We encourage you to read
+these brief descriptions and even more to explore their respective web
+sites and other information to choose the one best for 
you.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>live.&lt;/p&gt;</em></ins></span>
 
 &lt;!-- Do not add or remove anything from this list without a lot of
      discussion, following the usual process, and confirmation by RMS. See 
@@ -104,10 +138,11 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
-&lt;tr class="odd"&gt;
+  &lt;tr class="odd"&gt;
    <span class="removed"><del><strong>&lt;td&gt;&lt;a</strong></del></span>
    <span class="inserted"><ins><em>&lt;td 
class="icon"&gt;&lt;a</em></ins></span> href="http://www.blagblagblag.org/"&gt;
        &lt;img src="/graphics/distros-blag.jpg" alt="BLAG Linux and GNU" 
/&gt;&lt;/a&gt;&lt;/td&gt;
@@ -115,7 +150,7 @@
 
  &lt;tr class="even"&gt;
    <span class="removed"><del><strong>&lt;td&gt;&lt;a 
href="http://www.dragora.org/en/index.html"&gt;</strong></del></span>
-   <span class="inserted"><ins><em>&lt;td class="icon"&gt;&lt;a 
href="http://dragora.org"&gt;</em></ins></span>
+   <span class="inserted"><ins><em>&lt;td class="icon"&gt;&lt;a 
href="https://dragora.org/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-dragora.png" <span 
class="removed"><del><strong>alt="Dragora"</strong></del></span>
             <span class="inserted"><ins><em>alt="Dragora 
GNU/Linux-Libre"</em></ins></span> /&gt;&lt;/a&gt;&lt;/td&gt;
    <span class="removed"><del><strong>&lt;td&gt;Dragora,</strong></del></span>
@@ -127,7 +162,10 @@
    <span class="inserted"><ins><em>&lt;td class="icon"&gt;&lt;a 
href="https://www.dyne.org/software/dynebolic/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-dyen.png" alt="Dynebolic" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Dynebolic, a GNU/Linux distribution with special emphasis on 
audio 
-       and video editing.&lt;/td&gt;&lt;/tr&gt;
+       and video
+       <span 
class="removed"><del><strong>editing.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>editing. This is a &ldquo;static&rdquo; 
distro, normally
+       run from a live CD. Since it will not receive security updates, it
+       should be used offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr class="even"&gt;
    <span class="removed"><del><strong>&lt;td&gt;&lt;a</strong></del></span>
@@ -144,16 +182,17 @@
        on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
        functional package manager for the GNU system. &lt;/td&gt;&lt;/tr&gt;
 
-    
  &lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a 
href="https://musixdistro.wordpress.com/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Musix, a GNU+Linux distribution based on Knoppix, with special
-       emphasis on audio production.&lt;/td&gt;&lt;/tr&gt;
+       emphasis on audio <span 
class="removed"><del><strong>production.&lt;/td&gt;&lt;/tr&gt;</strong></del></span>
 <span class="inserted"><ins><em>production. This is a &ldquo;static&rdquo;
+       distro, normally run from a live CD. Since it will not receive
+       security updates, it should be used 
offline.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
  &lt;tr <span class="removed"><del><strong>class="even"&gt;
    &lt;td&gt;&lt;a 
href="http://parabolagnulinux.org"&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="odd"&gt;
-   &lt;td class="icon"&gt;&lt;a 
href="http://www.parabola.nu/https/"&gt;</em></ins></span>
+   &lt;td class="icon"&gt;&lt;a 
href="https://www.parabola.nu"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-parabola.png"
             alt="Parabola <span 
class="removed"><del><strong>GNU/Linux"</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux-libre"</em></ins></span> 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Parabola <span 
class="removed"><del><strong>GNU/Linux,</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux-libre,</em></ins></span> a distribution 
based on Arch that
@@ -161,14 +200,14 @@
 
  &lt;tr <span class="inserted"><ins><em>class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="https://pureos.net/"&gt;
-       &lt;img src="/graphics/pureos-logo-small.png"
+       &lt;img src="/graphics/pureos-logo-small.png" style="max-height: 1.8em;"
             alt="PureOS" /&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;PureOS, a GNU distribution based on Debian with a focus on
        privacy, security, and convenience.&lt;/td&gt;&lt;/tr&gt;
  
  &lt;tr</em></ins></span> class="odd"&gt;
-   <span class="removed"><del><strong>&lt;td&gt;&lt;a</strong></del></span>
-   <span class="inserted"><ins><em>&lt;td 
class="icon"&gt;&lt;a</em></ins></span> href="http://trisquel.info/"&gt;
+   <span class="removed"><del><strong>&lt;td&gt;&lt;a 
href="http://trisquel.info/"&gt;</strong></del></span>
+   <span class="inserted"><ins><em>&lt;td class="icon"&gt;&lt;a 
href="https://trisquel.info/"&gt;</em></ins></span>
        &lt;img src="/graphics/distros-trisquel.png" alt="Trisquel" 
/&gt;&lt;/a&gt;&lt;/td&gt;
    &lt;td&gt;Trisquel, a GNU/Linux distribution based on Ubuntu that's 
oriented 
  toward small enterprises, domestic users and educational 
centers.&lt;/td&gt;&lt;/tr&gt;
@@ -176,12 +215,16 @@
 <span class="inserted"><ins><em>&lt;tr class="even"&gt;
    &lt;td class="icon"&gt;&lt;a href="http://www.ututo.org/"&gt;
        &lt;img src="/graphics/distros-ututo.png" alt="Ututo" 
/&gt;&lt;/a&gt;&lt;/td&gt;
-   &lt;td&gt;Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the 
first
+   &lt;td&gt;Ututo S, a GNU/Linux 100% free distribution.  It was the first
        fully free GNU/Linux system recognized by the GNU 
Project.&lt;/td&gt;&lt;/tr&gt;</em></ins></span>
 
 &lt;/table&gt;
 
-&lt;p id="small-distros"&gt;Below is a list of small system distributions. 
These 
+<span class="removed"><del><strong>&lt;p 
id="small-distros"&gt;Below</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 id="small-distros"&gt;Small GNU/Linux 
distros&lt;/h3&gt;
+
+&lt;p&gt;Below</em></ins></span> is a list of small system distributions. 
These 
    distributions are meant for devices with limited resources, like a 
    wireless router for example. A free small system distribution is not 
    self-hosting, but it must be developable and buildable on top of one of 
@@ -190,7 +233,8 @@
 &lt;table class="listing"&gt;
   &lt;thead&gt;&lt;tr&gt;
     &lt;th&gt;Distribution&lt;/th&gt;
-    &lt;th&gt;Description&lt;/th&gt;
+    <span 
class="removed"><del><strong>&lt;th&gt;Description&lt;/th&gt;</strong></del></span>
+    <span class="inserted"><ins><em>&lt;th&gt;Brief 
Description&lt;/th&gt;</em></ins></span>
   &lt;/tr&gt;&lt;/thead&gt;
 
  &lt;tr class="odd"&gt;
@@ -213,6 +257,8 @@
 
 &lt;/table&gt;
 
+<span class="inserted"><ins><em>&lt;h3 id="howto-get"&gt;How to get free 
GNU/Linux distros&lt;/h3&gt;</em></ins></span>
+
 &lt;p&gt;In addition to their own sites, many of these distributions are
 available from &lt;a href="http://mirror.fsf.org/"&gt;mirror.fsf.org&lt;/a&gt;.
 Feel free to download or mirror the distributions from there,
@@ -220,16 +266,18 @@
 mirror for their project by mailing the 
 &lt;a href="mailto:address@hidden"&gt;FSF sysadmins&lt;/a&gt;.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p id="other-free"&gt;Non-GNU-based free 
system distributions are
-listed in &lt;a href="/distros/free-non-gnu-distros.html"&gt;a separate 
file&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-
-&lt;p&gt;We list &lt;a href="/links/companies.html"&gt;companies that sell 
hardware
-preinstalled with a free GNU/Linux distribution&lt;/a&gt; separately.&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;We list &lt;a 
href="/links/companies.html"&gt;companies that sell hardware
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</strong></del></span>
 
 &lt;p&gt;&lt;a href="/software/software.html"&gt;Individual GNU
 packages&lt;/a&gt; (most of which are included in the free distributions here) 
 are described separately.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;p&gt;We list &lt;a
+href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom"&gt;
+companies that sell hardware
+preinstalled with a free GNU/Linux distribution&lt;/a&gt; 
separately.&lt;/p&gt;</em></ins></span>
+
 &lt;h3 id="NewDistro"&gt;See something we missed?&lt;/h3&gt;
 
 &lt;p&gt;Do you know about a distribution that you expected to find on our
@@ -299,7 +347,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2011, 
2012</strong></del></span> <span class="inserted"><ins><em>2014, 2015, 2016, 
2017</em></ins></span> Free Software Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2011, 
2012</strong></del></span> <span class="inserted"><ins><em>2014, 2015, 2016, 
2017, 2018</em></ins></span> Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 <span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
@@ -312,7 +360,7 @@
 
 <span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2017/12/22 07:59:28 $
+$Date: 2018/04/14 11:33:14 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: distros/po/free-distros.ro.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ro.po,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- distros/po/free-distros.ro.po       21 Dec 2017 17:59:24 -0000      1.49
+++ distros/po/free-distros.ro.po       14 Apr 2018 11:33:14 -0000      1.50
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2013-12-11 13:41+0200\n"
 "Last-Translator: Tiberiu C. Turbureanu <address@hidden>\n"
 "Language-Team: Romanian <address@hidden>\n"
@@ -29,16 +29,56 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Distribuții de GNU+Linux libere"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "Observați că am omis ceva?"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\"><a href=\"http://www.fsf.org/\";>Free Software "
 "Foundation</a> nu este responsabilă pentru alte situri sau de cât de "
 "actualizate sunt informațiile lor.</span></em>"
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "Introducere"
+
 # | {+This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>
 # | distributions that are entirely <a
 # | href=\"/philosophy/free-sw.html\">free</a> as in freedom.+}  All of the
@@ -52,8 +92,8 @@
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "Toate distribuțiile care urmează sunt instalabile pe discul fix al "
 "calculatorului și în majoritatea cazurilor pot să fie rulate fără 
instalare."
@@ -74,11 +114,9 @@
 #| "sites and other information to choose the one best for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "Nu putem să facem o recomandare generală de a folosi una în defavoarea "
 "alteia, de aceea aici sunt listate în ordine alfabetică.  Vă încurajăm 
să "
@@ -117,10 +155,10 @@
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Mai jos sunt distribuțiile de <a 
href=\"/gnu/linux-and-gnu.html\">GNU+Linux</"
 "a> complete și gata de folosit despre care noi știm că urmează <a 
href=\"/"
@@ -175,56 +213,32 @@
 "mulțumim pentru activitatea pe care o desfășoară pentru atingerea acestui 
"
 "scop și sperăm ca într-o bună zi să le listăm aici."
 
-# | <strong>All of the distributions that follow are installable to a
-# | computer's hard [-drive and-] {+drive;+} most can be run
-# | [-live.</strong>-] {+live.  Not all hardware works in the free world; each
-# | distro's site should say which hardware it supports.</strong>+}
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "<strong>All of the distributions that follow are installable to a "
-#| "computer's hard drive and most can be run live.</strong>"
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
 msgstr ""
-"<strong>Toate distribuțiile care urmează sunt instalabile pe discul fix al "
-"calculatorului și în majoritatea cazurilor pot să fie rulate fără 
instalare."
-"</strong>"
 
-# | We [-cannot make a general recommendation-] {+endorse these distros only+}
-# | for [-using one over another, so they are listed here-] {+freedom.  We do
-# | not try to judge or compare these distros based on any other criterion;
-# | therefore, we list them+} in alphabetical order.  We [-encourage-]
-# | {+suggest+} you [-to read these brief descriptions and even more to
-# | explore-] {+consult+} their respective web sites and other information to
-# | [-choose the-] {+judge which+} one [-best-] {+is most convenient+} for you.
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "We cannot make a general recommendation for using one over another, so "
-#| "they are listed here in alphabetical order.  We encourage you to read "
-#| "these brief descriptions and even more to explore their respective web "
-#| "sites and other information to choose the one best for you."
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
 msgstr ""
-"Nu putem să facem o recomandare generală de a folosi una în defavoarea "
-"alteia, de aceea aici sunt listate în ordine alfabetică.  Vă încurajăm 
să "
-"citiți cu atenție aceste scurte descrieri și mai mult, să le explorați "
-"siturile și să căutați alte informații care să vă ajute să le 
alegeți pe "
-"cele mai potrivite pentru dvs."
 
 #. type: Content of: <table><thead><tr><th>
 msgid "Distribution"
 msgstr "Distribuție"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Descriere"
 
 #. type: Content of: <table><tr><td><a>
@@ -244,7 +258,9 @@
 msgstr "BLAG Linux și GNU, o distribuție de GNU+Linux bazată pe Fedora."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -272,10 +288,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic, o distribuție de GNU+Linux cu accentul pus pe editarea de "
-"înregistrări audio și video."
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -319,13 +334,15 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix, o distribuție de GNU+Linux bazată pe Knoppix, cu accentul pus pe "
-"realizare audio."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -363,7 +380,9 @@
 "la FSF."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -387,13 +406,23 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS, o distribuție de GNU+Linux bazată pe Gentoo.  A fost primul 
sistem "
 "GNU+Linux liber recunoscut de proiectul GNU."
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Distribuții de GNU+Linux libere"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -452,6 +481,12 @@
 "build-time and run-time for different hardware and use cases."
 msgstr ""
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Distribuții de GNU+Linux libere"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -469,27 +504,26 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
+"<a href=\"/software/software.html\">Pachetele GNU individuale</a> (dintre "
+"care multe sunt incluse în distribuțiile libere de aici) sunt descrise "
+"separat."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
 msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "Listăm separat <a href=\"/links/companies.html\">firmele care vând aparate "
 "preinstalate cu distribuții de GNU+Linux libere</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"<a href=\"/software/software.html\">Pachetele GNU individuale</a> (dintre "
-"care multe sunt incluse în distribuțiile libere de aici) sunt descrise "
-"separat."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "Observați că am omis ceva?"
@@ -580,12 +614,13 @@
 "paginile noastre, consultați <a 
href=\"/server/standards/README.translations."
 "html\">ghidul de traduceri</a>."
 
-# | Copyright &copy; [-2010, 2013-] {+2014, 2015, 2016, 2017+} Free Software
+# | Copyright &copy; [-2010, 2013-] {+2014, 2015, 2016+} Free Software
 # | Foundation, Inc.
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -610,6 +645,71 @@
 msgid "Updated:"
 msgstr "Actualizat la:"
 
+# | <strong>All of the distributions that follow are installable to a
+# | computer's hard [-drive and-] {+drive;+} most can be run
+# | [-live.</strong>-] {+live.  Not all hardware works in the free world; each
+# | distro's site should say which hardware it supports.</strong>+}
+#, fuzzy
+#~| msgid ""
+#~| "<strong>All of the distributions that follow are installable to a "
+#~| "computer's hard drive and most can be run live.</strong>"
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Toate distribuțiile care urmează sunt instalabile pe discul fix "
+#~ "al calculatorului și în majoritatea cazurilor pot să fie rulate fără "
+#~ "instalare.</strong>"
+
+# | We [-cannot make a general recommendation-] {+endorse these distros only+}
+# | for [-using one over another, so they are listed here-] {+freedom.  We do
+# | not try to judge or compare these distros based on any other criterion;
+# | therefore, we list them+} in alphabetical order.  We [-encourage-]
+# | {+suggest+} you [-to read these brief descriptions and even more to
+# | explore-] {+consult+} their respective web sites and other information to
+# | [-choose the-] {+judge which+} one [-best-] {+is most convenient+} for you.
+#, fuzzy
+#~| msgid ""
+#~| "We cannot make a general recommendation for using one over another, so "
+#~| "they are listed here in alphabetical order.  We encourage you to read "
+#~| "these brief descriptions and even more to explore their respective web "
+#~| "sites and other information to choose the one best for you."
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "Nu putem să facem o recomandare generală de a folosi una în defavoarea "
+#~ "alteia, de aceea aici sunt listate în ordine alfabetică.  Vă 
încurajăm să "
+#~ "citiți cu atenție aceste scurte descrieri și mai mult, să le 
explorați "
+#~ "siturile și să căutați alte informații care să vă ajute să le 
alegeți pe "
+#~ "cele mai potrivite pentru dvs."
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, o distribuție de GNU+Linux cu accentul pus pe editarea de "
+#~ "înregistrări audio și video."
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix, o distribuție de GNU+Linux bazată pe Knoppix, cu accentul pus pe "
+#~ "realizare audio."
+
+# | Copyright &copy; [-2010, 2013-] {+2014, 2015, 2016, 2017+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#~| msgid "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"
 

Index: distros/po/free-distros.ru.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ru.po,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -b -r1.167 -r1.168
--- distros/po/free-distros.ru.po       21 Dec 2017 18:59:34 -0000      1.167
+++ distros/po/free-distros.ru.po       14 Apr 2018 11:33:14 -0000      1.168
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2017-12-21 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\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: 2018-04-14 11:27+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -29,23 +30,85 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Свободные дистрибутивы GNU/Linux"
 
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Содержание"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+# | [-See-]{+<a href=\"#NewDistro\">See+} something we [-missed?-]
+# | {+missed?</a>+}
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "Мы что-то упустили?"
+
 # type: Content of: <p>
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+# | [-<em><span class=\"highlight\">The-]{+<em>The+} <a
+# | href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not
+# | responsible for other web[- -]sites, or how up-to-date their information
+# | [-is.</span></em>-] {+is.</em>+}
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\"><a href=\"http://www.fsf.org/\";>Фонд "
 "свободного программного обеспечения</a> не 
отвечает ни за другие сайты, ни "
 "за их своевременное обновление.</span></em>"
 
-#. type: Content of: <p>
+#. type: Content of: <h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "Введение"
+
+#. type: Content of: <p>
+# | This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>
+# | distributions that are entirely <a
+# | href=\"/philosophy/free-sw.html\">free</a> as in freedom.  [-All of the-] 
+# | {+Non-GNU-based free system+} distributions [-that follow-] are
+# | [-installable to a computer's hard drive; most can be run live.-] {+listed
+# | <a href=\"/distros/free-non-gnu-distros.html\">separately</a>.+}
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "На этой странице перечислены 
дистрибутивы <a href=\"/gnu/linux-and-gnu.html"
 "\"> GNU/Linux</a>, которые полностью <a 
href=\"/philosophy/free-sw.html\"> "
@@ -54,13 +117,25 @@
 "применять без установки."
 
 #. type: Content of: <p>
+# | The Free Software Foundation recommends and endorses these GNU/Linux
+# | distros, although [-we-] {+<strong>we+} do not try to judge or compare
+# | them based on any criterion other than [-freedom;-] {+freedom</strong>;+}
+# | therefore, we list them in alphabetical order.  [-We encourage you to read
+# | these brief descriptions and to consult their respective web sites and
+# | other information to choose the one best for you.-]
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "Фонд свободного программного обеспечения 
рекомендует и одобряет эти "
 "дистрибутивы GNU/Linux, хотя мы не пытаемся 
судить или сопоставлять "
@@ -71,14 +146,32 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | These distros are ready-to-use full systems whose developers have made a
+# | commitment to follow the <a
+# | href=\"/distros/free-system-distribution-guidelines.html\">Guidelines for
+# | Free System Distributions</a>.  This means [-these distros-] {+they+} will
+# | include, and propose, exclusively free software.  They will reject nonfree
+# | applications, nonfree programming platforms, nonfree drivers, nonfree
+# | firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree
+# | software, as well as nonfree manuals or documentation.
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Эти дистрибутивы&nbsp;&mdash; полные и готовые 
к применению cистемы, "
 "разработчики которых заявили о намерении 
следовать <a href=\"/distros/free-"
@@ -134,37 +227,33 @@
 "состояние свободных дистрибутивов, то 
помощь в разработке существующего "
 "свободного дистрибутива будет большим 
вкладом, чем создание нового."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
-msgstr ""
-"<strong>Все нижеперечисленные дистрибутивы 
можно установить на жесткий диск "
-"компьютера; большинство можно применять 
без установки. В мире свободы "
-"работает не вся аппаратура; на сайте 
каждого дистрибутива должно быть "
-"указано, какую аппаратуру он 
поддерживает.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
-msgstr ""
-"Мы одобряем эти дистрибутивы GNU/Linux только 
из-за свободы. Мы не пытаемся "
-"судить или сопоставлять дистрибутивы на 
основе какого бы то ни было "
-"критерия; таким образом, мы перечисляем их 
в алфавитном порядке. Мы советуем "
-"вам изучить их сайты и другую информацию, 
чтобы судить о том, какой из них "
-"для вас наиболее удобен."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
+msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
 msgid "Distribution"
 msgstr "Дистрибутив"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+# | {+Brief+} Description
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Описание"
 
 #. type: Content of: <table><tr><td><a>
@@ -187,7 +276,10 @@
 "Linux, основанный на дистрибутиве Fedora."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+# | <a [-href=\"http://dragora.org\";>-] {+href=\"https://dragora.org/\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -211,14 +303,12 @@
 msgid "Dynebolic"
 msgstr "Dynebolic"
 
-# type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic, дистрибутив GNU/Linux, уделяющий особое 
внимание редактированию "
-"звука и видео."
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -263,17 +353,20 @@
 msgid "Musix GNU+Linux"
 msgstr "Musix GNU+Linux"
 
-# type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix GNU+Linux, дистрибутив GNU/Linux, основанный на 
Knoppix, уделяющий "
-"особое внимание производству звука."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+# | <a [-href=\"http://www.parabola.nu/https/\";>-]
+# | {+href=\"https://www.parabola.nu\";>+}
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -306,7 +399,10 @@
 "приватности, безопасности и удобству."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+# | <a href=\"http{+s+}://trisquel.info/\">
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -332,14 +428,29 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
+# | Ututo [-X-]S, a GNU/Linux [-distribution based on Gentoo.-] {+100% free
+# | distribution.+}  It was the first fully free GNU/Linux system recognized
+# | by the GNU Project.
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS, дистрибутив GNU/Linux, основанный на Gentoo. 
Этот дистрибутив стал "
 "первой официально признанной проектом GNU 
полностью свободной системой GNU/"
 "Linux."
 
+# type: Content of: <h2>
+#. type: Content of: <h3>
+# | [-Free-]{+Small+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Свободные дистрибутивы GNU/Linux"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -395,6 +506,14 @@
 "двоичные пакеты во&nbsp;время сборки и во 
время выполнения для различной "
 "аппаратуры и применений."
 
+# type: Content of: <h2>
+#. type: Content of: <h3>
+# | [-Free-]{+How to get free+} GNU/Linux [-distributions-] {+distros+}
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Свободные дистрибутивы GNU/Linux"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -412,29 +531,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"<a href=\"/distros/free-non-gnu-distros.html\">Свободные 
дистрибутивы "
-"систем, не основанные на GNU</a>, перечислены 
в отдельном файле."
+"<a href=\"/software/software.html\">Отдельные пакеты GNU</a> 
(большинство из "
+"которых включается в эти свободные 
дистрибутивы) описываются отдельно."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+# | We list <a [-href=\"/links/companies.html\">companies-]
+# | 
{+href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-freedom\";>
+# | companies+} that sell hardware preinstalled with a free GNU/Linux
+# | distribution</a> separately.
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
+msgid ""
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "Отдельно мы перечисляем <a 
href=\"/links/companies.html\">компании, которые "
 "продают технику с предустановленным 
свободным дистрибутивом GNU/Linux</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"<a href=\"/software/software.html\">Отдельные пакеты GNU</a> 
(большинство из "
-"которых включается в эти свободные 
дистрибутивы) описываются отдельно."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "Мы что-то упустили?"
@@ -525,7 +645,13 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+# | Copyright &copy; 2014, 2015, 2016, [-2017-] {+2017, 2018+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -554,6 +680,59 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
+# type: Content of: <p>
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Все нижеперечисленные дистрибутивы 
можно установить на жесткий "
+#~ "диск компьютера; большинство можно 
применять без установки. В мире "
+#~ "свободы работает не вся аппаратура; на 
сайте каждого дистрибутива должно "
+#~ "быть указано, какую аппаратуру он 
поддерживает.</strong>"
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "Мы одобряем эти дистрибутивы GNU/Linux 
только из-за свободы. Мы не "
+#~ "пытаемся судить или сопоставлять 
дистрибутивы на основе какого бы то ни "
+#~ "было критерия; таким образом, мы 
перечисляем их в алфавитном порядке. Мы "
+#~ "советуем вам изучить их сайты и другую 
информацию, чтобы судить о том, "
+#~ "какой из них для вас наиболее удобен."
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, дистрибутив GNU/Linux, уделяющий 
особое внимание "
+#~ "редактированию звука и видео."
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix GNU+Linux, дистрибутив GNU/Linux, основанный 
на Knoppix, уделяющий "
+#~ "особое внимание производству звука."
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "<a href=\"/distros/free-non-gnu-distros.html\">Свободные 
дистрибутивы "
+#~ "систем, не основанные на GNU</a>, 
перечислены в отдельном файле."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"
 

Index: distros/po/free-distros.sk.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.sk.po,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- distros/po/free-distros.sk.po       21 Dec 2017 17:59:24 -0000      1.89
+++ distros/po/free-distros.sk.po       14 Apr 2018 11:33:14 -0000      1.90
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2009-09-27 22:36+0200\n"
 "Last-Translator: Dominik Smatana <address@hidden>\n"
 "Language-Team: Slovak <address@hidden>\n"
@@ -29,16 +29,52 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Slobodné distribúcie GNU/Linux"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\"><a href=\"http://www.fsf.org/\";>Nadácia pre "
 "slobodný software</a> nezodpovedá za obsah ostatných webových stránok 
ani za "
 "ich aktuálnosť.</span></em>"
 
+#. type: Content of: <h3>
+msgid "Introduction"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -47,8 +83,8 @@
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "Všetky nižšie uvedené distribúcie je možné nainštalovať na pevný 
disk a "
 "väčšina z nich dokáže bežať aj naživo.  Nie sú zoradené podľa 
žiadneho "
@@ -57,11 +93,9 @@
 #. type: Content of: <p>
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 
 # Preštylizovať prvú vetu.
@@ -80,10 +114,10 @@
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Tu sú uvedené tie distribúcie <a 
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</"
 "a>, o ktorých vieme, že záväzne dodržiavajú prísne zásady o tom, že 
budú "
@@ -136,29 +170,21 @@
 msgstr ""
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "All of the distributions that follow are installable to a computer hard "
-#| "drive and most can be run live.  They are listed in no particular order.  "
-#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
-#| "preinstalled with a free GNU/Linux distribution</a> separately."
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
 msgstr ""
-"Všetky nižšie uvedené distribúcie je možné nainštalovať na pevný 
disk a "
-"väčšina z nich dokáže bežať aj naživo.  Nie sú zoradené podľa 
žiadneho "
-"zvláštneho kritéria.  Zoznam <a 
href=\"/links/companies.html\">spoločností, "
-"ktoré predávajú hardware s predinštalovanou slobodnou distribúciou GNU/"
-"Linux</a>, je uvedený osobitne."
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
 msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
@@ -166,7 +192,9 @@
 msgstr "Distribúcia"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Popis"
 
 #. type: Content of: <table><tr><td><a>
@@ -188,7 +216,9 @@
 "Fedora."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -222,10 +252,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic, distribúcia GNU/Linux zameraná špeciálne na prácu s audio a 
video "
-"súbormi."
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -269,13 +298,15 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix, distribúcia GNU+Linux založená na systéme Knoppix so zameraním na 
"
-"audio produkciu."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -313,7 +344,9 @@
 "nadáciou FSF."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -337,13 +370,23 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS, distribúcia GNU/Linux založená na Gentoo.  Bola to prvá "
 "distribúcia, ktorú projekt GNU uznal ako kompletne slobodnú."
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Slobodné distribúcie GNU/Linux"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -384,6 +427,12 @@
 "build-time and run-time for different hardware and use cases."
 msgstr ""
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Slobodné distribúcie GNU/Linux"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -395,25 +444,24 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
 msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "Zoznam <a href=\"/links/companies.html\">spoločností, ktoré predávajú "
 "hardware s predinštalovanou slobodnou distribúciou GNU/Linux</a>, je 
uvedený "
 "osobitne."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr ""
@@ -505,8 +553,10 @@
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
-#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
+#| "Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2009 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -529,6 +579,46 @@
 msgid "Updated:"
 msgstr "Aktualizované:"
 
+#, fuzzy
+#~| msgid ""
+#~| "All of the distributions that follow are installable to a computer hard "
+#~| "drive and most can be run live.  They are listed in no particular "
+#~| "order.  We list <a href=\"/links/companies.html\">companies that sell "
+#~| "hardware preinstalled with a free GNU/Linux distribution</a> separately."
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "Všetky nižšie uvedené distribúcie je možné nainštalovať na pevný 
disk a "
+#~ "väčšina z nich dokáže bežať aj naživo.  Nie sú zoradené podľa 
žiadneho "
+#~ "zvláštneho kritéria.  Zoznam <a href=\"/links/companies.html"
+#~ "\">spoločností, ktoré predávajú hardware s predinštalovanou 
slobodnou "
+#~ "distribúciou GNU/Linux</a>, je uvedený osobitne."
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, distribúcia GNU/Linux zameraná špeciálne na prácu s audio 
a "
+#~ "video súbormi."
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix, distribúcia GNU+Linux založená na systéme Knoppix so zameraním 
na "
+#~ "audio produkciu."
+
+# type: Content of: <title>
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2009 Free Software Foundation, Inc."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"
 

Index: distros/po/free-distros.uk.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.uk.po,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- distros/po/free-distros.uk.po       1 Jan 2018 07:20:30 -0000       1.78
+++ distros/po/free-distros.uk.po       14 Apr 2018 11:33:14 -0000      1.79
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2018-01-01 07:31+0200\n"
 "Last-Translator: Andriy Bandura <address@hidden>\n"
 "Language-Team: Ukrainian <>\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: 2018-04-14 11:27+0000\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
@@ -29,22 +30,70 @@
 msgid "Free GNU/Linux distributions"
 msgstr "Вільні дистрибутиви GNU/Linux"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Зміст"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "Виявили щось пропущене нами?"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Фонд "
 "вільного програмного забезпечення</a> не 
несе відповідальності за інші "
 "сайти, ні за їхнє своєчасне 
оновлення.</span></em>"
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "Вступ"
+
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "На цій сторінці перераховані 
дистрибутиви <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a>, які є повністю <a 
href=\"/philosophy/free-sw.html\"> "
@@ -52,13 +101,19 @@
 "диск комп'ютера; більшість можна 
застосовувати без установки."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 "Ми не намагаємося судити або зіставляти 
дистрибутиви GNU/Linux на основі "
 "якого б то не було іншого критерію, крім 
свободи; таким чином, ми "
@@ -67,14 +122,24 @@
 "вибрати найзручніший для вас."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "Ці дистрибутиви&nbsp;&nbsp; самодостатні і 
готові до застосування системи, "
 "розробники яких заявили про намір 
дотримуватися <a href=\"/distros/free-"
@@ -133,34 +198,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
-msgstr ""
-"<strong>Всі нижче перелічені дистрибутиви 
можна встановити на жорсткий диск "
-"комп'ютера; більшість можна застосовувати 
без установки. У світі свободи "
-"працює не вся апаратура; на сайті кожного 
дистрибутива повинно бути "
-"зазначено, яку апаратуру він 
підтримує.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
-msgstr ""
-"Ми схвалюємо ці дистрибутиви GNU/Linux тільки 
через свободу. Ми не "
-"намагаємося судити або зіставляти 
дистрибутиви на основі якого б то не було "
-"критерію; таким чином, ми перераховуємо їх 
в алфавітному порядку. Ми радимо "
-"вам вивчити їхні сайти та іншу інформацію, 
щоб судити про те, який з них для "
-"вас найзручніший."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
+msgstr ""
 
 #. type: Content of: <table><thead><tr><th>
 msgid "Distribution"
 msgstr "Дистрибутив"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "Опис"
 
 #. type: Content of: <table><tr><td><a>
@@ -182,7 +243,9 @@
 "Linux, який базується на дистрибутиві Fedora."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -208,10 +271,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
 msgstr ""
-"Dynebolic, дистрибутив GNU/Linux, що приділяє 
особливу увагу редагуванню "
-"звуку і відео."
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -258,13 +320,15 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
 msgstr ""
-"Musix GNU+Linux дистрибутив GNU/Linux, заснований на 
Knoppix, приділяє "
-"особливу увагу відтворенні звуку і 
суміжних задачах."
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -297,7 +361,9 @@
 "приватності, безпеці та зручності. "
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -321,13 +387,23 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo XS - дистрибутив GNU/Linux на основі Gentoo. Це 
була перша повністю "
 "вільна операційна система GNU/Linux, яку 
визнав проект GNU."
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "Вільні дистрибутиви GNU/Linux"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -382,6 +458,12 @@
 "пакунки під&nbsp;час складання і під час 
виконання для різної апаратури і "
 "застосувань."
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "Вільні дистрибутиви GNU/Linux"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -399,28 +481,25 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"<a href=\"/distros/free-non-gnu-distros.html\">Вільні 
дистрибутиви систем, "
-"які базуються не на GNU</a>, перераховані в 
окремому файлі."
+"<a href=\"/software/software.html\">Окремі пакети GNU</a> 
(більшість з яких "
+"включається в ці вільні дистрибутиви) 
описуються окремо."
 
 #. type: Content of: <p>
-msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
+msgid ""
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "Окремо ми перераховуємо <a 
href=\"/links/companies.html\">компанії, які "
 "продають техніку з попередньо 
встановленим вільним дистрибутивом Linux</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"<a href=\"/software/software.html\">Окремі пакети GNU</a> 
(більшість з яких "
-"включається в ці вільні дистрибутиви) 
описуються окремо."
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "Виявили щось пропущене нами?"
@@ -513,7 +592,11 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 2014, 2015, 2016, 2017 Фонд вільного 
програмного "
 "забезпечення, Inc."
@@ -540,6 +623,56 @@
 msgid "Updated:"
 msgstr "Оновлено:"
 
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Всі нижче перелічені дистрибутиви 
можна встановити на жорсткий "
+#~ "диск комп'ютера; більшість можна 
застосовувати без установки. У світі "
+#~ "свободи працює не вся апаратура; на 
сайті кожного дистрибутива повинно "
+#~ "бути зазначено, яку апаратуру він 
підтримує.</strong>"
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "Ми схвалюємо ці дистрибутиви GNU/Linux 
тільки через свободу. Ми не "
+#~ "намагаємося судити або зіставляти 
дистрибутиви на основі якого б то не "
+#~ "було критерію; таким чином, ми перерах
овуємо їх в алфавітному порядку. Ми "
+#~ "радимо вам вивчити їхні сайти та іншу 
інформацію, щоб судити про те, який "
+#~ "з них для вас найзручніший."
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr ""
+#~ "Dynebolic, дистрибутив GNU/Linux, що приділяє 
особливу увагу редагуванню "
+#~ "звуку і відео."
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr ""
+#~ "Musix GNU+Linux дистрибутив GNU/Linux, заснований 
на Knoppix, приділяє "
+#~ "особливу увагу відтворенні звуку і 
суміжних задачах."
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "<a href=\"/distros/free-non-gnu-distros.html\">Вільні 
дистрибутиви "
+#~ "систем, які базуються не на GNU</a>, перерах
овані в окремому файлі."
+
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Фонд вільного 
програмного "
+#~ "забезпечення, Inc."
+
 #~ msgid "<a href=\"http://www.dynebolic.org\";>"
 #~ msgstr "<a href=\"http://www.dynebolic.org\";>"
 

Index: distros/po/free-distros.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- distros/po/free-distros.zh-cn.po    22 Feb 2018 13:29:36 -0000      1.1
+++ distros/po/free-distros.zh-cn.po    14 Apr 2018 11:33:14 -0000      1.2
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-distros.html\n"
-"POT-Creation-Date: 2017-12-21 17:56+0000\n"
+"POT-Creation-Date: 2018-04-14 11:27+0000\n"
 "PO-Revision-Date: 2018-02-22 21:23+0800\n"
 "Last-Translator: Wensheng Xie <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\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: 2018-04-14 11:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -24,21 +25,69 @@
 msgid "Free GNU/Linux distributions"
 msgstr "自由的GNU/Linux发行版"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "目录"
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#for-pc\">GNU/Linux distros for PCs and workstations</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#small-distros\">Small GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"#howto-get\">How to get free GNU/Linux distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/free-non-gnu-distros.html\">Other free distros</a>"
+msgstr ""
+
+#. type: Content of: <div><ul><li>
+#, fuzzy
+#| msgid "See something we missed?"
+msgid "<a href=\"#NewDistro\">See something we missed?</a>"
+msgstr "发现我们有所缺失?"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
+#| "Software Foundation</a> is not responsible for other web sites, or how up-"
+#| "to-date their information is.</span></em>"
 msgid ""
-"<em><span class=\"highlight\">The <a href=\"http://www.fsf.org/\";>Free "
-"Software Foundation</a> is not responsible for other web sites, or how up-to-"
-"date their information is.</span></em>"
+"<em>The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> is not "
+"responsible for other websites, or how up-to-date their information is.</em>"
 msgstr ""
 "<em><span class=\"highlight\"><a 
href=\"http://www.fsf.org/\";>自由软件基金会"
 "</a>不负责其他网站及其信息的有效性。</span></em>"
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Introduction"
+msgid "Introduction"
+msgstr "简介"
+
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
+#| "distributions that are entirely <a href=\"/philosophy/free-sw.html"
+#| "\">free</a> as in freedom.  All of the distributions that follow are "
+#| "installable to a computer's hard drive; most can be run live."
 msgid ""
 "This page lists the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "distributions that are entirely <a href=\"/philosophy/free-sw.html\">free</"
-"a> as in freedom.  All of the distributions that follow are installable to a "
-"computer's hard drive; most can be run live."
+"a> as in freedom.  Non-GNU-based free system distributions are listed <a "
+"href=\"/distros/free-non-gnu-distros.html\">separately</a>."
 msgstr ""
 "本页面列举了完全是自由言论般<a 
href=\"/philosophy/free-sw.html\">自由的</"
 "a><a 
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>发行版。所有这些发行版都可"
@@ -46,27 +95,43 @@
 "a></sup>。"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The Free Software Foundation recommends and endorses these GNU/Linux "
+#| "distros, although we do not try to judge or compare them based on any "
+#| "criterion other than freedom; therefore, we list them in alphabetical "
+#| "order.  We encourage you to read these brief descriptions and to consult "
+#| "their respective web sites and other information to choose the one best "
+#| "for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
-"distros, although we do not try to judge or compare them based on any "
-"criterion other than freedom; therefore, we list them in alphabetical "
-"order.  We encourage you to read these brief descriptions and to consult "
-"their respective web sites and other information to choose the one best for "
-"you."
+"distros, although <strong>we do not try to judge or compare them based on "
+"any criterion other than freedom</strong>; therefore, we list them in "
+"alphabetical order."
 msgstr ""
 
"自由软件基金会推荐并支持这些GNU/Linux发行版,虽然我们除了自由之外没有使用å
…¶ä»–"
 "任何评判标准;所以,我们按ç…
§å­—母顺序列举它们。我们建议你阅读这些简介并参考其"
 "相关网站及其他信息做出最适合你的选择。"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "These distros are ready-to-use full systems whose developers have made a "
+#| "commitment to follow the <a href=\"/distros/free-system-distribution-"
+#| "guidelines.html\">Guidelines for Free System Distributions</a>.  This "
+#| "means these distros will include, and propose, exclusively free "
+#| "software.  They will reject nonfree applications, nonfree programming "
+#| "platforms, nonfree drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree "
+#| "games, and any other nonfree software, as well as nonfree manuals or "
+#| "documentation."
 msgid ""
 "These distros are ready-to-use full systems whose developers have made a "
 "commitment to follow the <a href=\"/distros/free-system-distribution-"
 "guidelines.html\">Guidelines for Free System Distributions</a>.  This means "
-"these distros will include, and propose, exclusively free software.  They "
-"will reject nonfree applications, nonfree programming platforms, nonfree "
-"drivers, nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other "
-"nonfree software, as well as nonfree manuals or documentation."
+"they will include, and propose, exclusively free software.  They will reject "
+"nonfree applications, nonfree programming platforms, nonfree drivers, "
+"nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other nonfree "
+"software, as well as nonfree manuals or documentation."
 msgstr ""
 "这些发行版都是可以直接使用的完整系统,它们的开发者
承诺会遵守<a href=\"/"
 
"distros/free-system-distribution-guidelines.html\">自由系统发行指南</a>。这意"
@@ -113,29 +178,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"<strong>All of the distributions that follow are installable to a computer's "
-"hard drive; most can be run live.  Not all hardware works in the free world; "
-"each distro's site should say which hardware it supports.</strong>"
+"Please note that not all hardware works in the free world; each distro's "
+"site should say which hardware it supports. We suggest that, after reading "
+"the short descriptions below, you consult these sites as well as other "
+"available information, to judge which distro is most convenient for you."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "GNU/Linux distros for PCs and workstations"
 msgstr ""
-"<strong>所有这些发行版都可以安装到电脑的硬盘;å…
¶ä¸­å¤šæ•°å¯ä»¥æ— å®‰è£…运行。并非所"
-"有的硬件都支持自由软件;每个发行版的网站都会说明它支持哪些硬件。</strong>"
 
 #. type: Content of: <p>
 msgid ""
-"We endorse these distros only for freedom.  We do not try to judge or "
-"compare these distros based on any other criterion; therefore, we list them "
-"in alphabetical order.  We suggest you consult their respective web sites "
-"and other information to judge which one is most convenient for you."
+"The distributions that follow are installable to a computer's hard drive and/"
+"or can be run live."
 msgstr ""
-"我们只是为了自由的原因支持这些发行版。我们没有任何å…
¶ä»–评判标准;所以它们按照"
-"字母顺序排列。我们建议你参考发行版的相关网站及å…
¶ä»–信息做出最适合你的选择。"
 
 #. type: Content of: <table><thead><tr><th>
 msgid "Distribution"
 msgstr "发行版"
 
 #. type: Content of: <table><thead><tr><th>
-msgid "Description"
+#, fuzzy
+#| msgid "Description"
+msgid "Brief Description"
 msgstr "描述"
 
 #. type: Content of: <table><tr><td><a>
@@ -155,7 +221,9 @@
 msgstr "BLAG Linux and GNU,一个基于Fedora的GNU/Linux发行版。"
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://dragora.org\";>"
+#, fuzzy
+#| msgid "<a href=\"http://dragora.org\";>"
+msgid "<a href=\"https://dragora.org/\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -179,8 +247,9 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Dynebolic, a GNU/Linux distribution with special emphasis on audio and video "
-"editing."
-msgstr "Dynebolic,一个特别重视音视频编辑的GNU/Linux发行版。"
+"editing. This is a &ldquo;static&rdquo; distro, normally run from a live CD. "
+"Since it will not receive security updates, it should be used offline."
+msgstr ""
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.gnewsense.org/\";>"
@@ -224,11 +293,15 @@
 #. type: Content of: <table><tr><td>
 msgid ""
 "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis on "
-"audio production."
-msgstr 
"Musix,一个基于Knoppix的GNU+Linux发行版,特别注重音频处理。"
+"audio production. This is a &ldquo;static&rdquo; distro, normally run from a "
+"live CD. Since it will not receive security updates, it should be used "
+"offline."
+msgstr ""
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://www.parabola.nu/https/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://www.parabola.nu/https/\";>"
+msgid "<a href=\"https://www.parabola.nu\";>"
 msgstr "<a href=\"http://www.parabola.nu/https/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -257,7 +330,9 @@
 msgstr "PureOS,基于Debian的GNU发行版,专注于隐私、安å…
¨å’Œä¾¿åˆ©ã€‚"
 
 #. type: Content of: <table><tr><td><a>
-msgid "<a href=\"http://trisquel.info/\";>"
+#, fuzzy
+#| msgid "<a href=\"http://trisquel.info/\";>"
+msgid "<a href=\"https://trisquel.info/\";>"
 msgstr "<a href=\"http://trisquel.info/\";>"
 
 #. type: Attribute 'alt' of: <table><tr><td><a><img>
@@ -281,13 +356,23 @@
 msgstr "Ututo"
 
 #. type: Content of: <table><tr><td>
+#, fuzzy
+#| msgid ""
+#| "Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first "
+#| "fully free GNU/Linux system recognized by the GNU Project."
 msgid ""
-"Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first fully "
-"free GNU/Linux system recognized by the GNU Project."
+"Ututo S, a GNU/Linux 100% free distribution.  It was the first fully free "
+"GNU/Linux system recognized by the GNU Project."
 msgstr ""
 "Ututo 
XS,一个基于Gentoo的GNU/Linux发行版。它是第一个由GNU工程确认的完å
…¨è‡ªç”±"
 "的GNU/Linux系统。"
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "Small GNU/Linux distros"
+msgstr "自由的GNU/Linux发行版"
+
 #. type: Content of: <p>
 msgid ""
 "Below is a list of small system distributions. These distributions are meant "
@@ -335,6 +420,12 @@
 "ProteanOS是一个针对嵌入式设备的小快新发行版。它的平台é…
ç½®åŠŸèƒ½å…è®¸åœ¨æž„造和运行"
 "时对不同硬件和应用场景配置二进制软件包。"
 
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Free GNU/Linux distributions"
+msgid "How to get free GNU/Linux distros"
+msgstr "自由的GNU/Linux发行版"
+
 #. type: Content of: <p>
 msgid ""
 "In addition to their own sites, many of these distributions are available "
@@ -350,28 +441,25 @@
 
 #. type: Content of: <p>
 msgid ""
-"Non-GNU-based free system distributions are listed in <a href=\"/distros/"
-"free-non-gnu-distros.html\">a separate file</a>."
+"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
+"which are included in the free distributions here)  are described separately."
 msgstr ""
-"基于非GNU系统的自由系统发行版单独列在<a 
href=\"/distros/free-non-gnu-distros."
-"html\">此处</a>。"
+"<a href=\"/software/software.html\">单独的GNU软件包
</a>(大多数都包含在列在此"
+"处的自由发行版中)会单独介绍。"
 
 #. type: Content of: <p>
-msgid ""
-"We list <a href=\"/links/companies.html\">companies that sell hardware "
-"preinstalled with a free GNU/Linux distribution</a> separately."
+#, fuzzy
+#| msgid ""
+#| "We list <a href=\"/links/companies.html\">companies that sell hardware "
+#| "preinstalled with a free GNU/Linux distribution</a> separately."
+msgid ""
+"We list <a href=\"https://www.fsf.org/resources/hw/endorsement/respects-your-";
+"freedom\"> companies that sell hardware preinstalled with a free GNU/Linux "
+"distribution</a> separately."
 msgstr ""
 "我们单独列举了<a href=\"/links/companies.html\">销售预先安装
了自由GNU/Linux系"
 "统的硬件的公司</a>。"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/software/software.html\">Individual GNU packages</a> (most of "
-"which are included in the free distributions here)  are described separately."
-msgstr ""
-"<a href=\"/software/software.html\">单独的GNU软件包
</a>(大多数都包含在列在此"
-"处的自由发行版中)会单独介绍。"
-
 #. type: Content of: <h3>
 msgid "See something we missed?"
 msgstr "发现我们有所缺失?"
@@ -458,7 +546,11 @@
 "翻译须知</a>。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -482,3 +574,45 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最后更新:"
+
+#~ msgid ""
+#~ "<strong>All of the distributions that follow are installable to a "
+#~ "computer's hard drive; most can be run live.  Not all hardware works in "
+#~ "the free world; each distro's site should say which hardware it supports."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>所有这些发行版都可以安装到电脑的硬盘;å…
¶ä¸­å¤šæ•°å¯ä»¥æ— å®‰è£…运行。并非"
+#~ 
"所有的硬件都支持自由软件;每个发行版的网站都会说明它支持哪些硬件。</"
+#~ "strong>"
+
+#~ msgid ""
+#~ "We endorse these distros only for freedom.  We do not try to judge or "
+#~ "compare these distros based on any other criterion; therefore, we list "
+#~ "them in alphabetical order.  We suggest you consult their respective web "
+#~ "sites and other information to judge which one is most convenient for you."
+#~ msgstr ""
+#~ "我们只是为了自由的原因
支持这些发行版。我们没有任何其他评判标准;所以它们按"
+#~ "照字母顺序排列。我们建议你参考发行版的相关网站及å…
¶ä»–信息做出最适合你的选"
+#~ "择。"
+
+#~ msgid ""
+#~ "Dynebolic, a GNU/Linux distribution with special emphasis on audio and "
+#~ "video editing."
+#~ msgstr 
"Dynebolic,一个特别重视音视频编辑的GNU/Linux发行版。"
+
+#~ msgid ""
+#~ "Musix, a GNU+Linux distribution based on Knoppix, with special emphasis "
+#~ "on audio production."
+#~ msgstr 
"Musix,一个基于Knoppix的GNU+Linux发行版,特别注重音频处理。"
+
+#~ msgid ""
+#~ "Non-GNU-based free system distributions are listed in <a href=\"/distros/"
+#~ "free-non-gnu-distros.html\">a separate file</a>."
+#~ msgstr ""
+#~ "基于非GNU系统的自由系统发行版单独列在<a 
href=\"/distros/free-non-gnu-"
+#~ "distros.html\">此处</a>。"
+
+#~ msgid ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."

Index: server/gnun/compendia/compendium.af.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.af.po,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- server/gnun/compendia/compendium.af.po      13 Apr 2018 13:03:13 -0000      
1.83
+++ server/gnun/compendia/compendium.af.po      14 Apr 2018 11:33:14 -0000      
1.84
@@ -100,14 +100,18 @@
 "Kopiereg &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
 "2006, 2007 Free Software Foundation, Inc.,"
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
 msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr ""
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr ""
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -116,10 +120,6 @@
 "Kopiereg &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
 "2006, 2007 Free Software Foundation, Inc.,"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 # type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <p>
 #, fuzzy

Index: server/gnun/compendia/compendium.ar.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ar.po,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/gnun/compendia/compendium.ar.po      13 Apr 2018 13:03:14 -0000      
1.86
+++ server/gnun/compendia/compendium.ar.po      14 Apr 2018 11:33:14 -0000      
1.87
@@ -121,15 +121,19 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2011, 2012 مؤسسة البرمجيات الحرة، 
المحدودة."
 
-# type: Content of: <table><tr><td>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "مقدمة"
 
+# type: Content of: <table><tr><td>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -141,10 +145,6 @@
 "حقوق النشر &copy; 2004، 2005، 2006، 2007، 2008، 2009 مؤسسة 
البرمجيات الحرة، "
 "المحدودة،"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.bg.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.bg.po,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/gnun/compendia/compendium.bg.po      13 Apr 2018 13:03:14 -0000      
1.86
+++ server/gnun/compendia/compendium.bg.po      14 Apr 2018 11:33:14 -0000      
1.87
@@ -134,15 +134,19 @@
 "Авторски права &copy; 2004, 2005, 2006, 2007, 2008, 2009 
Фондация за "
 "свободен софтуер"
 
-# type: Content of: <p>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Въведение"
 
+# type: Content of: <p>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -150,10 +154,6 @@
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Авторски права &copy; 2007, 2008 Фондация за 
свободен софтуер"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.ca.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ca.po,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/gnun/compendia/compendium.ca.po      13 Apr 2018 13:03:14 -0000      
1.89
+++ server/gnun/compendia/compendium.ca.po      14 Apr 2018 11:33:14 -0000      
1.90
@@ -108,26 +108,26 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
-# type: Content of: <div><p>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Índex de continguts"
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Introducció"
 
+# type: Content of: <div><p>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2013 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Índex de continguts"
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.cs.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.cs.po,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/gnun/compendia/compendium.cs.po      13 Apr 2018 13:03:14 -0000      
1.87
+++ server/gnun/compendia/compendium.cs.po      14 Apr 2018 11:33:14 -0000      
1.88
@@ -108,24 +108,24 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 1999-2002 Free Software Foundation, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Obsah"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Základy"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Obsah"
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.da.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.da.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/gnun/compendia/compendium.da.po      13 Apr 2018 13:03:14 -0000      
1.27
+++ server/gnun/compendia/compendium.da.po      14 Apr 2018 11:33:14 -0000      
1.28
@@ -88,14 +88,18 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2013, 2015 Free Software Foundation, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr ""
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Indhold"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Introduktion"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr ""
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -103,10 +107,6 @@
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2007 Richard Stallman"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Indhold"
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""

Index: server/gnun/compendia/compendium.de.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.de.po,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- server/gnun/compendia/compendium.de.po      13 Apr 2018 13:03:14 -0000      
1.134
+++ server/gnun/compendia/compendium.de.po      14 Apr 2018 11:33:14 -0000      
1.135
@@ -106,22 +106,22 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; <ins>2010-</ins>2017 Free Software Foundation, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Inhaltsverzeichnis"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Einführung"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Inhaltsverzeichnis"
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""

Index: server/gnun/compendia/compendium.el.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.el.po,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- server/gnun/compendia/compendium.el.po      13 Apr 2018 13:03:14 -0000      
1.91
+++ server/gnun/compendia/compendium.el.po      14 Apr 2018 11:33:14 -0000      
1.92
@@ -105,22 +105,22 @@
 msgstr ""
 "Πνευματικά δικαιώματα &copy; 2014, 2015 Ίδρυμα 
Ελεύθερου Λογισμικού, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Πίνακας περιεχομένων"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Εισαγωγή"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Πνευματικά δικαιώματα &copy; 2014 Ίδρυμα 
Ελεύθερου Λογισμικού, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Πίνακας περιεχομένων"
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "από τον <a href=\"http://www.stallman.org/\";>Richard 
Stallman</a>"

Index: server/gnun/compendia/compendium.es.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.es.po,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- server/gnun/compendia/compendium.es.po      13 Apr 2018 13:03:14 -0000      
1.94
+++ server/gnun/compendia/compendium.es.po      14 Apr 2018 11:33:14 -0000      
1.95
@@ -109,24 +109,24 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
-# type: Content of: <div><p>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Índice general"
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Introducción"
 
+# type: Content of: <div><p>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Índice general"
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.fa.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fa.po,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/gnun/compendia/compendium.fa.po      13 Apr 2018 13:03:14 -0000      
1.85
+++ server/gnun/compendia/compendium.fa.po      14 Apr 2018 11:33:14 -0000      
1.86
@@ -115,15 +115,19 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010 Free Software Foundation, Inc."
 
-# type: Content of: <table><tr><td><p>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "مقدمه"
 
+# type: Content of: <table><tr><td><p>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -132,10 +136,6 @@
 msgstr ""
 "حق نسخه برداری &copy;  ۲۰۱۰ بنیاد نرم
‌افزار‌های آزاد (به عنوان یک شخصیت حقوقی)"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.fr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fr.po,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/gnun/compendia/compendium.fr.po      13 Apr 2018 13:03:14 -0000      
1.92
+++ server/gnun/compendia/compendium.fr.po      14 Apr 2018 11:33:14 -0000      
1.93
@@ -108,22 +108,22 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Table des matières"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Introduction"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Table des matières"
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "par <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.he.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.he.po,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- server/gnun/compendia/compendium.he.po      13 Apr 2018 13:03:14 -0000      
1.83
+++ server/gnun/compendia/compendium.he.po      14 Apr 2018 11:33:14 -0000      
1.84
@@ -80,20 +80,20 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
 msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+#. type: Content of: <table><tr><td>
+msgid "</a>"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
+#. type: Content of: <div><p>
+msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <p>

Index: server/gnun/compendia/compendium.hr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.hr.po,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- server/gnun/compendia/compendium.hr.po      13 Apr 2018 13:03:14 -0000      
1.67
+++ server/gnun/compendia/compendium.hr.po      14 Apr 2018 11:33:14 -0000      
1.68
@@ -122,24 +122,24 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Sadržaj"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Uvod"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "The Free Software Foundation"
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Zaklada za slobodan softver"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Sadržaj"
-
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""

Index: server/gnun/compendia/compendium.id.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.id.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- server/gnun/compendia/compendium.id.po      13 Apr 2018 13:03:14 -0000      
1.84
+++ server/gnun/compendia/compendium.id.po      14 Apr 2018 11:33:14 -0000      
1.85
@@ -104,14 +104,18 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Apa itu Free Software Foundation?"
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr ""
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Daftar Isi"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Pendahuluan"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr ""
+
 # type: Content of: <table><tr><td><h3>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -119,10 +123,6 @@
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Apa itu Free Software Foundation?"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Daftar Isi"
-
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy

Index: server/gnun/compendia/compendium.it.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.it.po,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- server/gnun/compendia/compendium.it.po      13 Apr 2018 13:03:14 -0000      
1.111
+++ server/gnun/compendia/compendium.it.po      14 Apr 2018 11:33:14 -0000      
1.112
@@ -103,24 +103,24 @@
 msgstr ""
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 
-# type: Content of: <table><tr><td>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Indice"
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Introduzione"
 
+# type: Content of: <table><tr><td>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Indice"
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.ja.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ja.po,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/gnun/compendia/compendium.ja.po      13 Apr 2018 13:03:14 -0000      
1.100
+++ server/gnun/compendia/compendium.ja.po      14 Apr 2018 11:33:15 -0000      
1.101
@@ -96,22 +96,22 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "もくじ"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "はじめに"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "もくじ"
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a 
href=\"http://www.stallman.org/\";>リチャード・ストールマン</a>著"

Index: server/gnun/compendia/compendium.ko.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ko.po,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/gnun/compendia/compendium.ko.po      13 Apr 2018 13:03:14 -0000      
1.89
+++ server/gnun/compendia/compendium.ko.po      14 Apr 2018 11:33:15 -0000      
1.90
@@ -100,24 +100,24 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr ""
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "글: <a href=\"http://www.stallman.org\";>리처드 스톨먼</a>"

Index: server/gnun/compendia/compendium.lt.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.lt.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/gnun/compendia/compendium.lt.po      13 Apr 2018 13:03:14 -0000      
1.32
+++ server/gnun/compendia/compendium.lt.po      14 Apr 2018 11:33:15 -0000      
1.33
@@ -112,22 +112,22 @@
 "Copyright &copy; 2011, 2012, 2016 Laisvos programinės įrangos fondas, "
 "korporacija"
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Įvadas"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Laisvos programinės įrangos fondas, 
korporacija"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""

Index: server/gnun/compendia/compendium.ml.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ml.po,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/gnun/compendia/compendium.ml.po      13 Apr 2018 13:03:14 -0000      
1.85
+++ server/gnun/compendia/compendium.ml.po      14 Apr 2018 11:33:15 -0000      
1.86
@@ -115,16 +115,20 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010 Free Software Foundation, Inc."
 
-# type: Content of: <div><div><div>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "ആമുഖം"
 
+# type: Content of: <div><div><div>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -132,10 +136,6 @@
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.nb.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.nb.po,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/gnun/compendia/compendium.nb.po      13 Apr 2018 13:03:14 -0000      
1.85
+++ server/gnun/compendia/compendium.nb.po      14 Apr 2018 11:33:15 -0000      
1.86
@@ -108,14 +108,18 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Hva er Free Software Foundation?"
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr ""
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <table><tr><td><h3>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -123,10 +127,6 @@
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Hva er Free Software Foundation?"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""

Index: server/gnun/compendia/compendium.nl.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.nl.po,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/gnun/compendia/compendium.nl.po      13 Apr 2018 13:03:14 -0000      
1.80
+++ server/gnun/compendia/compendium.nl.po      14 Apr 2018 11:33:15 -0000      
1.81
@@ -114,15 +114,19 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
-# type: Content of: <div><div><p>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Inhoudsopgave"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Introductie"
 
+# type: Content of: <div><div><p>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <div><p>
 # | Copyright &copy; 201[-1-]{+3+} Free Software Foundation, Inc.
 #. type: Content of: <div><p>
@@ -131,10 +135,6 @@
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Inhoudsopgave"
-
 # type: Content of: <ul><li><ul><li>
 #. type: Content of: <p>
 #, fuzzy

Index: server/gnun/compendia/compendium.pl.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pl.po,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/gnun/compendia/compendium.pl.po      13 Apr 2018 13:03:14 -0000      
1.100
+++ server/gnun/compendia/compendium.pl.po      14 Apr 2018 11:33:15 -0000      
1.101
@@ -107,22 +107,22 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Spis treści"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Wprowadzenie"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Spis treści"
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.pot
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pot,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/gnun/compendia/compendium.pot        13 Apr 2018 13:03:14 -0000      
1.89
+++ server/gnun/compendia/compendium.pot        14 Apr 2018 11:33:15 -0000      
1.90
@@ -82,20 +82,20 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr ""
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
 msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+#. type: Content of: <table><tr><td>
+msgid "</a>"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
+#. type: Content of: <div><p>
+msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <p>

Index: server/gnun/compendia/compendium.pt-br.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pt-br.po,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/gnun/compendia/compendium.pt-br.po   13 Apr 2018 13:03:14 -0000      
1.86
+++ server/gnun/compendia/compendium.pt-br.po   14 Apr 2018 11:33:15 -0000      
1.87
@@ -103,22 +103,22 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Conteúdo"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Introdução"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Conteúdo"
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "por <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.ro.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ro.po,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- server/gnun/compendia/compendium.ro.po      13 Apr 2018 13:03:14 -0000      
1.88
+++ server/gnun/compendia/compendium.ro.po      14 Apr 2018 11:33:15 -0000      
1.89
@@ -111,15 +111,19 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
 
-# type: Content of: <div><div><div>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Introducere"
 
+# type: Content of: <div><div><div>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -127,10 +131,6 @@
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy

Index: server/gnun/compendia/compendium.ru.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ru.po,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/gnun/compendia/compendium.ru.po      13 Apr 2018 13:03:14 -0000      
1.87
+++ server/gnun/compendia/compendium.ru.po      14 Apr 2018 11:33:15 -0000      
1.88
@@ -104,23 +104,23 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Содержание"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Введение"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Содержание"
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.sk.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sk.po,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- server/gnun/compendia/compendium.sk.po      13 Apr 2018 13:03:14 -0000      
1.83
+++ server/gnun/compendia/compendium.sk.po      14 Apr 2018 11:33:15 -0000      
1.84
@@ -103,15 +103,19 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2009 Free Software Foundation, Inc."
 
-# type: Content of: <div><p>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr ""
 
+# type: Content of: <div><p>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <title>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -119,10 +123,6 @@
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Softvér - Projekt GNU - Nadácia pre slobodný softvér (FSF)"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""

Index: server/gnun/compendia/compendium.sq.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sq.po,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/gnun/compendia/compendium.sq.po      13 Apr 2018 13:03:14 -0000      
1.102
+++ server/gnun/compendia/compendium.sq.po      14 Apr 2018 11:33:15 -0000      
1.103
@@ -113,22 +113,22 @@
 "Të drejta kopjimi &copy; 2014, 2015, 2016, 2017 Free Software Foundation, "
 "Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Tryeza e Lëndës"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Hyrje"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Të drejta kopjimi &copy; 2014 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Tryeza e Lëndës"
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.sr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sr.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- server/gnun/compendia/compendium.sr.po      13 Apr 2018 13:03:14 -0000      
1.84
+++ server/gnun/compendia/compendium.sr.po      14 Apr 2018 11:33:15 -0000      
1.85
@@ -122,16 +122,20 @@
 "<b>Ауторска права:</b><br />Copyright &copy; 2004, 2005, 2006, 
2007, 2008, "
 "2009 Free Software Foundation, Inc.,"
 
-# type: Content of: <body><div><div>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Увод"
 
+# type: Content of: <body><div><div>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -141,10 +145,6 @@
 "<b>Ауторска права:</b><br />Copyright &copy; 2007, 2008 Free 
Software "
 "Foundation, Inc.,"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.sv.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sv.po,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/gnun/compendia/compendium.sv.po      13 Apr 2018 13:03:14 -0000      
1.85
+++ server/gnun/compendia/compendium.sv.po      14 Apr 2018 11:33:15 -0000      
1.86
@@ -112,14 +112,18 @@
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2007 Free Software Foundation, Inc.,"
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
 msgstr ""
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr ""
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr ""
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
@@ -129,10 +133,6 @@
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2007 Free Software Foundation, Inc.,"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""

Index: server/gnun/compendia/compendium.ta.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ta.po,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/gnun/compendia/compendium.ta.po      13 Apr 2018 13:03:14 -0000      
1.86
+++ server/gnun/compendia/compendium.ta.po      14 Apr 2018 11:33:15 -0000      
1.87
@@ -117,15 +117,20 @@
 "காப்பீட்டுரிமை &copy; 2001, 2008, 2009 Free 
Software Foundation, Inc. (கட்டற்ற "
 "மென்பொருள் அறக்கட்டளை., 
நிறுவப்பட்டது.)"
 
-# type: Content of: <div><div><div>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+# type: Content of: <h3>
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "விவர அட்டவணை"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "அறிமுகம்"
 
+# type: Content of: <div><div><div>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -134,11 +139,6 @@
 msgstr ""
 "காப்பீட்டுரிமை &copy; 2001, 2008, 2009 
கட்டற்ற மென்பொருள் அ
றக்கட்டளை., நிறுவப்பட்டது.,"
 
-# type: Content of: <h3>
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "விவர அட்டவணை"
-
 # type: Content of: <div><div><div><div><ul><li>
 #. type: Content of: <p>
 #, fuzzy

Index: server/gnun/compendia/compendium.tr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.tr.po,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/gnun/compendia/compendium.tr.po      13 Apr 2018 13:03:14 -0000      
1.85
+++ server/gnun/compendia/compendium.tr.po      14 Apr 2018 11:33:15 -0000      
1.86
@@ -120,16 +120,20 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2006, 2007 Free Software Foundation, Inc."
 
-# type: Content of: <p>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr ""
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Giriş"
 
+# type: Content of: <p>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -137,10 +141,6 @@
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2006, 2007 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr ""
-
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.uk.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.uk.po,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/gnun/compendia/compendium.uk.po      13 Apr 2018 13:03:14 -0000      
1.89
+++ server/gnun/compendia/compendium.uk.po      14 Apr 2018 11:33:15 -0000      
1.90
@@ -116,15 +116,19 @@
 "Copyright &copy; 2014, 2015, 2016, 2017 Фонд вільного 
програмного "
 "забезпечення, Inc."
 
-# type: Content of: <div><div><div>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "Зміст"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "Вступ"
 
+# type: Content of: <div><div><div>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -136,10 +140,6 @@
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
 "2006, 2007, 2008 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "Зміст"
-
 # type: Content of: <ul><li><ul><li>
 #. type: Content of: <p>
 #, fuzzy

Index: server/gnun/compendia/compendium.zh-cn.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-cn.po,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/gnun/compendia/compendium.zh-cn.po   13 Apr 2018 13:03:14 -0000      
1.86
+++ server/gnun/compendia/compendium.zh-cn.po   14 Apr 2018 11:33:15 -0000      
1.87
@@ -109,25 +109,25 @@
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
-# type: Content of: <div><p>
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "目录"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "简介"
 
+# type: Content of: <div><p>
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "版权所有 &copy; 2011 自由软件基金会"
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "目录"
-
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy

Index: server/gnun/compendia/compendium.zh-tw.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-tw.po,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/gnun/compendia/compendium.zh-tw.po   13 Apr 2018 13:03:14 -0000      
1.80
+++ server/gnun/compendia/compendium.zh-tw.po   14 Apr 2018 11:33:15 -0000      
1.81
@@ -95,22 +95,22 @@
 msgstr ""
 "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 
-#. type: Content of: <table><tr><td>
-msgid "</a>"
-msgstr "</a>"
+#. type: Content of: <div><h3>
+msgid "Table of Contents"
+msgstr "目錄"
 
 #. type: Content of: <h3>
 msgid "Introduction"
 msgstr "簡介"
 
+#. type: Content of: <table><tr><td>
+msgid "</a>"
+msgstr "</a>"
+
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
-#. type: Content of: <h3>
-msgid "Table of Contents"
-msgstr "目錄"
-
 #. type: Content of: <p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "作者為 <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"



reply via email to

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