[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/distros/po common-distros.ar-diff.html comm...
|
From: |
GNUN |
|
Subject: |
www/distros/po common-distros.ar-diff.html comm... |
|
Date: |
Wed, 14 Aug 2019 15:58:58 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 19/08/14 15:58:57
Modified files:
distros/po : common-distros.ar-diff.html
common-distros.ar.po common-distros.de.po
common-distros.es.po common-distros.fr.po
common-distros.hr-diff.html
common-distros.hr.po
common-distros.it-diff.html
common-distros.it.po common-distros.ja.po
common-distros.lt-diff.html
common-distros.lt.po
common-distros.nl-diff.html
common-distros.nl.po
common-distros.pl-diff.html
common-distros.pl.po common-distros.pot
common-distros.pt-br.po
common-distros.ro-diff.html
common-distros.ro.po common-distros.ru.po
common-distros.tr.po
common-distros.uk-diff.html
common-distros.uk.po common-distros.zh-cn.po
common-distros.zh-tw.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ar-diff.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ar.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.de.po?cvsroot=www&r1=1.126&r2=1.127
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.es.po?cvsroot=www&r1=1.138&r2=1.139
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.fr.po?cvsroot=www&r1=1.149&r2=1.150
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.hr-diff.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.hr.po?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.it-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.it.po?cvsroot=www&r1=1.138&r2=1.139
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ja.po?cvsroot=www&r1=1.111&r2=1.112
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.lt-diff.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.lt.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.nl-diff.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.nl.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pl-diff.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pl.po?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pot?cvsroot=www&r1=1.85&r2=1.86
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pt-br.po?cvsroot=www&r1=1.67&r2=1.68
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ro-diff.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ro.po?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ru.po?cvsroot=www&r1=1.165&r2=1.166
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.tr.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.uk-diff.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.uk.po?cvsroot=www&r1=1.62&r2=1.63
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-cn.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-tw.po?cvsroot=www&r1=1.36&r2=1.37
Patches:
Index: common-distros.ar-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ar-diff.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- common-distros.ar-diff.html 31 Jul 2019 11:31:07 -0000 1.26
+++ common-distros.ar-diff.html 14 Aug 2019 19:58:53 -0000 1.27
@@ -69,12 +69,12 @@
<span class="removed"><del><strong>about what</strong></del></span> <span
class="inserted"><ins><em>against distributing nonfree</em></ins></span>
software <span class="removed"><del><strong>can be
included,</strong></del></span> <span class="inserted"><ins><em>through
their normal channels,</em></ins></span> and nonfree blobs are shipped with
their kernel, <span class="removed"><del><strong>Linux. Arch also has no
policy about not distributing</strong></del></span>
<span class="inserted"><ins><em>Linux.</p>
-
+<!--
<p>Instead of this</em></ins></span> nonfree <span
class="removed"><del><strong>software through their normal
channels.</p></strong></del></span> <span
class="inserted"><ins><em>distribution, use <a
href="/distros/free-distros.html#for-pc">Parabola</a> or <a
href="https://www.hyperbola.info/?gnu-free-stros-page">Hyperbola</a>,
-free distros which are made from it.</p></em></ins></span>
-
+free distros which are made from it.</p>
+--></em></ins></span>
<h3 id="Canaima">Canaima</h3>
<p>Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -83,7 +83,7 @@
<p>Its main menu has an option, “Install nonfree
software”, which installs all the nonfree drivers (even the
-ones that are not necessary). The distro also provides blobs for the
+ones that are not necessary). The distro also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> blobs for the
kernel, Linux, and invites installing nonfree applications including
Flash Player.</p>
@@ -99,7 +99,7 @@
<p>Debian's Social Contract states the goal of making Debian entirely
free software, and Debian conscientiously keeps nonfree software out
-of the official Debian system. However, Debian also provides a
+of the official Debian system. However, Debian also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> a
repository of nonfree software. According to the project, this
software is “not part of the Debian system,” but the
repository is hosted on many of the project's main servers, and people
@@ -131,12 +131,12 @@
<p>Debian's wiki also includes pages about installing nonfree
firmware.</p>
<!-- https://wiki.debian.org/ATIProprietary -->
-
+<!--
<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">gNewSense</a>, and <a
-href="/distros/free-distros.html#for-pc">PureOS</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">PureOS</a>.</p>
+--></em></ins></span>
<h3 id="Fedora">Fedora</h3>
<p>Fedora does have a clear policy about what can be included in the
@@ -159,10 +159,17 @@
permits software released under the original Artistic License to be
included, even though that's a nonfree license.</p>
-<p>Mandriva also provides nonfree software through dedicated
+<p>Mandriva also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> nonfree software through
dedicated
repositories.</p>
-<h3 id="Mint">Mint GNU/Linux</h3>
+<h3 <span class="inserted"><ins><em>id="Manjaro">Manjaro
GNU/Linux</h3>
+
+<p>Manjaro includes nonfree software through its normal channels, and
ships
+nonfree blobs with its kernel, Linux. It includes a proprietary office
+suite and proprietary games with DRM. The distro also recommends the
+installation of nonfree drivers.</p>
+
+<h3</em></ins></span> id="Mint">Mint GNU/Linux</h3>
<p>Mint does not have a policy against including nonfree software, it
includes nonfree binary blobs in drivers packaged with the kernel, and
@@ -222,7 +229,7 @@
<h3</em></ins></span> id="Ubuntu">Ubuntu GNU/Linux</h3>
-<p>Ubuntu provides specific repositories of nonfree software, and
+<p>Ubuntu <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> specific repositories of
nonfree software, and
Canonical expressly promotes and recommends nonfree software under the
Ubuntu name in some of their distribution channels. Ubuntu offers the
option to install only free packages, which means it also offers the
@@ -264,7 +271,7 @@
it. However, that is not</em></ins></span> a <span
class="removed"><del><strong>company <a
href="http://DefectiveByDesign.org/">associated
with DRM</a> as well</strong></del></span> <span
class="inserted"><ins><em>substantive issue about Ubuntu</em></ins></span> as
<span class="removed"><del><strong>mistreatment</strong></del></span> <span
class="inserted"><ins><em>a
GNU/Linux distribution.</p>
-
+<!--
<p>Instead</em></ins></span> of <span
class="removed"><del><strong>workers, authors and publishers.</p>
<p>This adware is</strong></del></span> <span
class="inserted"><ins><em>this nonfree distribution, use</em></ins></span> one
of the <span class="removed"><del><strong>rare occasions in which
a</strong></del></span> free <span class="removed"><del><strong>software
@@ -273,8 +280,8 @@
which are made from it: <a
href="/distros/free-distros.html#for-pc">Dyne:bolic</a>, <a
href="/distros/free-distros.html#for-pc">Trisquel</a>, and <a
-href="/distros/free-distros.html#for-pc">Ututo
S</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">Ututo S</a>.</p>
+--></em></ins></span>
<h2>Some Other Distros</h2>
<p>Here we discuss some <span
class="removed"><del><strong>systems</strong></del></span> <span
class="inserted"><ins><em>well-known or significant non-GNU/Linux system
@@ -397,7 +404,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/07/31 11:31:07 $
+$Date: 2019/08/14 19:58:53 $
<!-- timestamp end -->
</p>
</div>
Index: common-distros.ar.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ar.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- common-distros.ar.po 31 Jul 2019 11:31:07 -0000 1.27
+++ common-distros.ar.po 14 Aug 2019 19:58:53 -0000 1.28
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2015-02-04 21:24+0100\n"
"Last-Translator: faycal <address@hidden>\n"
"Language-Team: Arabic <>\n"
@@ -126,13 +126,6 @@
"normal channels, and nonfree blobs are shipped with their kernel, Linux."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "ÙاÙÙÙ
ا"
@@ -148,10 +141,20 @@
"تعاÙÙ Ù
٠دÙ
ج اÙبرÙ
جÙات اÙغÙر Øرة."
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"تتÙÙر اÙÙائÙ
Ø© اÙرئÙسÙØ© ÙÙاÙÙÙ
ا عÙÙ Ø®Ùار
”تÙصÙب اÙبراÙ
ج اÙغÙر "
@@ -184,12 +187,12 @@
#. type: Content of: <p>
# | Debian's Social Contract states the goal of making Debian entirely free
# | software, and Debian conscientiously keeps nonfree software out of the
-# | official Debian system. However, Debian also provides a repository of
-# | nonfree software. According to the project, this software is “not
-# | part of the Debian system,” but the repository is hosted on many of
-# | the project's main servers, and people can readily [-learn about-]
-# | {+find+} these nonfree packages by browsing Debian's online package
-# | [-database.-] {+database and its wiki.+}
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily
+# | [-learn about-] {+find+} these nonfree packages by browsing Debian's
+# | online package [-database.-] {+database and its wiki.+}
#, fuzzy
#| msgid ""
#| "Debian's Social Contract states the goal of making Debian entirely free "
@@ -202,7 +205,7 @@
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -247,13 +250,6 @@
msgid "Debian's wiki also includes pages about installing nonfree firmware."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "ÙÙدÙرا"
@@ -303,11 +299,31 @@
"برخصة غÙر Øرة. "
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"تÙÙر تÙزÙعة Ù
اÙدرÙÙا Ø£Ùضا٠برÙ
جÙات غÙر
Øرة Ù
Ù Ø®Ùا٠Ù
ستÙدعات Ù
خصصة ÙÙذ٠اÙغاÙØ©."
#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Ù
اÙدرÙÙا غÙÙ/ÙÙÙÙس"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Ù
Ùت غÙÙ/ÙÙÙÙس"
@@ -446,8 +462,22 @@
msgstr "Ø£ÙبÙت٠غÙÙ/ÙÙÙÙس"
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -492,14 +522,6 @@
"substantive issue about Ubuntu as a GNU/Linux distribution."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "تÙزÙعات أخرÙ"
Index: common-distros.de.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.de.po,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- common-distros.de.po 31 Jul 2019 11:31:07 -0000 1.126
+++ common-distros.de.po 14 Aug 2019 19:58:54 -0000 1.127
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: common-distros.html\n"
"Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2019-01-19 22:00+0100\n"
"Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
@@ -133,16 +133,6 @@
"über ihre regulären Kanäle, und mit dem Linux-Kern werden unfreie Blobs "
"ausgeliefert."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-"Die freien Abspaltungen <a href=\"/distros/free-distros#for-pc\">Parabola</"
-"a> bzw. <a href=\"https://www.hyperbola.info/?\";>Hyperbola</a> werden "
-"alternativ empfohlen."
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -159,10 +149,20 @@
"Software mängelbehaftet."
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"Das Hauptmenü verfügt über eine Option âUnfreie Software
installierenâ, "
@@ -192,10 +192,27 @@
msgstr "Debian GNU/Linux"
#. type: Content of: <p>
+# | Debian's Social Contract states the goal of making Debian entirely free
+# | software, and Debian conscientiously keeps nonfree software out of the
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily find
+# | these nonfree packages by browsing Debian's online package database and
+# | its wiki.
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -253,16 +270,6 @@
msgstr ""
"Das Debian-Wiki enthält Informationen zur Installation unfreier Firmware."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-"Die freien Abspaltungen <a href=\"/distros/free-distros.html#for-pc"
-"\">gNewSense</a> und <a href=\"/distros/free-distros.html#for-pc\">PureOS</"
-"a> werden alternativ empfohlen."
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -317,10 +324,32 @@
"freigegeben wurde, obwohl das eine unfreie Lizenz ist."
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"Mandriva bietet ebenfalls über dedizierte Paketarchive unfreie Software an."
+# Mandriva SA is liquidated according French company register until June 2nd.
+# -> OpenMandriva now?
+#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva Linux [sic]"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -440,8 +469,22 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -510,18 +553,6 @@
"diesen Begriff verwendet, sollte man dies gänzlich zurückweisen. Jedoch ist
"
"das keine inhaltliche Frage zum Thema Ubuntu als GNU/Linux-Verteilung."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-"Die freien Abspaltungen <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
-"bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a> und <a "
-"href=\"/distros/free-distros.html#for-pc\">Ututo S</a> werden alternativ "
-"empfohlen."
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Einige andere Verteilungen"
@@ -763,6 +794,36 @@
msgstr "Letzte Ãnderung:"
#~ msgid ""
+#~ "Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
+#~ "html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-";
+#~ "free-stros-page\">Hyperbola</a>, free distros which are made from it."
+#~ msgstr ""
+#~ "Die freien Abspaltungen <a href=\"/distros/free-distros#for-pc"
+#~ "\">Parabola</a> bzw. <a href=\"https://www.hyperbola.info/?\";>Hyperbola</"
+#~ "a> werden alternativ empfohlen."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a>, and <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">PureOS</a>."
+#~ msgstr ""
+#~ "Die freien Abspaltungen <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a> und <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">PureOS</a> werden alternativ empfohlen."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
+#~ "bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, "
+#~ "and <a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
+#~ msgstr ""
+#~ "Die freien Abspaltungen <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">Dyne:bolic</a>, <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">Trisquel</a> und <a href=\"/distros/free-distros.html#for-pc\">Ututo "
+#~ "S</a> werden alternativ empfohlen."
+
+#~ msgid ""
#~ "Arch has the two usual problems: there's no clear policy about what "
#~ "software can be included, and nonfree blobs are shipped with their "
#~ "kernel, Linux. Arch also has no policy about not distributing nonfree "
Index: common-distros.es.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.es.po,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- common-distros.es.po 3 Aug 2019 11:32:38 -0000 1.138
+++ common-distros.es.po 14 Aug 2019 19:58:54 -0000 1.139
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: common-distros.es.html\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2019-08-03 12:53+0200\n"
"Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
"Language-Team: Spanish <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: 2019-08-14 19:55+0000\n"
"X-Poedit-SourceCharset: utf-8\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Generator: Poedit 1.8.11\n"
@@ -147,17 +148,6 @@
"sea libre a través de sus canales de distribución normales. Y con su
núcleo, "
"Linux, se suministran blobs no libres."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-"En vez de esta distribución no libre, utilice <a href=\"/distros/free-"
-"distros.html#for-pc\">Parabola</a> o <a href=\"https://www.hyperbola.info/?";
-"gnu-free-stros-page\">Hyperbola</a>, distribuciones libres hechas a partir "
-"de ella."
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -173,10 +163,20 @@
"pero la falla de Canaima es que incluye software que no es libre."
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"En el menú principal de Canaima hay una opción para «instalar software que
"
@@ -212,10 +212,27 @@
# type: Content of: <p>
#. type: Content of: <p>
+# | Debian's Social Contract states the goal of making Debian entirely free
+# | software, and Debian conscientiously keeps nonfree software out of the
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily find
+# | these nonfree packages by browsing Debian's online package database and
+# | its wiki.
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -276,17 +293,6 @@
"El wiki de Debian incluye también páginas en las que se explica cómo "
"instalar <cite>firmware</cite> que no es libre."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-"En vez de esta distribución que no es libre, utilice una de las "
-"distribuciones libres que se han hecho a partir de ella: <a href=\"/distros/"
-"free-distros.html#for-pc\">gNewSense</a> y <a href=\"/distros/free-distros."
-"html#for-pc\">PureOS</a>."
-
# type: Content of: <h3>
#. type: Content of: <h3>
msgid "Fedora"
@@ -347,13 +353,34 @@
# type: Content of: <p>
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"Mandriva también provee software que no es libre a través de repositorios "
"dedicados."
# type: Content of: <h3>
#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -483,8 +510,22 @@
# type: Content of: <p>
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -554,19 +595,6 @@
"cualquier caso, esta no es una cuestión esencial en lo que se refiere a "
"Ubuntu en cuanto distribución de GNU/Linux."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-"En vez de esta distribución que no es libre, utilice una de las "
-"distribuciones libres que se han hecho a partir de ella: <a href=\"/distros/"
-"free-distros.html#for-pc\">Dyne:bolic</a>, <a href=\"/distros/free-distros."
-"html#for-pc\">Trisquel</a> y <a href=\"/distros/free-distros.html#for-pc"
-"\">Ututo S</a>."
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Otras distribuciones"
@@ -790,6 +818,39 @@
msgstr "Ãltima actualización:"
#~ msgid ""
+#~ "Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
+#~ "html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-";
+#~ "free-stros-page\">Hyperbola</a>, free distros which are made from it."
+#~ msgstr ""
+#~ "En vez de esta distribución no libre, utilice <a href=\"/distros/free-"
+#~ "distros.html#for-pc\">Parabola</a> o <a href=\"https://www.hyperbola.";
+#~ "info/?gnu-free-stros-page\">Hyperbola</a>, distribuciones libres hechas a "
+#~ "partir de ella."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a>, and <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">PureOS</a>."
+#~ msgstr ""
+#~ "En vez de esta distribución que no es libre, utilice una de las "
+#~ "distribuciones libres que se han hecho a partir de ella: <a href=\"/"
+#~ "distros/free-distros.html#for-pc\">gNewSense</a> y <a href=\"/distros/"
+#~ "free-distros.html#for-pc\">PureOS</a>."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
+#~ "bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, "
+#~ "and <a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
+#~ msgstr ""
+#~ "En vez de esta distribución que no es libre, utilice una de las "
+#~ "distribuciones libres que se han hecho a partir de ella: <a href=\"/"
+#~ "distros/free-distros.html#for-pc\">Dyne:bolic</a>, <a href=\"/distros/"
+#~ "free-distros.html#for-pc\">Trisquel</a> y <a href=\"/distros/free-distros."
+#~ "html#for-pc\">Ututo S</a>."
+
+#~ msgid ""
#~ "Previous releases of Debian included nonfree blobs with Linux, the "
#~ "kernel. With the release of Debian 6.0 (“squeeze”) in "
#~ "February 2011, these blobs have been moved out of the main distribution "
Index: common-distros.fr.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.fr.po,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -b -r1.149 -r1.150
--- common-distros.fr.po 31 Jul 2019 22:01:53 -0000 1.149
+++ common-distros.fr.po 14 Aug 2019 19:58:54 -0000 1.150
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2019-08-01 00:01+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2019-08-14 19:55+0000\n"
"Plural-Forms: \n"
"X-Generator: Gtranslator 2.91.5\n"
@@ -135,17 +136,6 @@
"ses canaux de distribution normaux, et des blobs non libres sont fournis "
"avec son noyau Linux."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-"Plutôt que cette distribution non libre, utilisez <a href=\"/distros/free-"
-"distros.html#for-pc\">Parabola</a> ou <a href=\"https://www.hyperbola.info/?";
-"gnu-free-stros-page\">Hyperbola</a>, les distributions libres qui en "
-"dérivent."
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -162,10 +152,20 @@
"non libres."
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"Son menu principal a une option, « Installez des logiciels non libres »,
qui "
@@ -195,10 +195,27 @@
msgstr "Debian GNU/Linux"
#. type: Content of: <p>
+# | Debian's Social Contract states the goal of making Debian entirely free
+# | software, and Debian conscientiously keeps nonfree software out of the
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily find
+# | these nonfree packages by browsing Debian's online package database and
+# | its wiki.
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -257,16 +274,6 @@
"Il y a également dans le wiki de Debian des pages expliquant comment "
"installer des micrologiciels privateurs."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-"Plutôt que cette distribution non libre, utilisez l'une des distributions "
-"libres qui en dérivent : <a href=\"/distros/free-distros.html#for-pc"
-"\">gNewSense</a> et <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -319,11 +326,31 @@
"non libre."
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"Mandriva propose aussi des logiciels non libres au moyen de dépôts
dédiés."
#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -442,8 +469,22 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -512,18 +553,6 @@
"Cependant, c'est sans grande conséquence sur la qualification d'Ubuntu comme
"
"distribution GNU/Linux."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-"Plutôt que cette distribution non libre, utilisez l'une des distributions "
-"libres qui en dérivent : <a
href=\"/distros/free-distros.html#for-pc\">Dyne:"
-"bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a> et <a "
-"href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Quelques autres distributions"
@@ -745,3 +774,36 @@
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
+#~ "html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-";
+#~ "free-stros-page\">Hyperbola</a>, free distros which are made from it."
+#~ msgstr ""
+#~ "Plutôt que cette distribution non libre, utilisez <a
href=\"/distros/free-"
+#~ "distros.html#for-pc\">Parabola</a> ou <a href=\"https://www.hyperbola.";
+#~ "info/?gnu-free-stros-page\">Hyperbola</a>, les distributions libres qui "
+#~ "en dérivent."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a>, and <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">PureOS</a>."
+#~ msgstr ""
+#~ "Plutôt que cette distribution non libre, utilisez l'une des distributions
"
+#~ "libres qui en dérivent : <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a> et <a href=\"/distros/free-distros.html#for-pc\">PureOS</"
+#~ "a>."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
+#~ "bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, "
+#~ "and <a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
+#~ msgstr ""
+#~ "Plutôt que cette distribution non libre, utilisez l'une des distributions
"
+#~ "libres qui en dérivent : <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">Dyne:bolic</a>, <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">Trisquel</a> et <a href=\"/distros/free-distros.html#for-pc\">Ututo S</"
+#~ "a>."
Index: common-distros.hr-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.hr-diff.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- common-distros.hr-diff.html 31 Jul 2019 11:31:08 -0000 1.32
+++ common-distros.hr-diff.html 14 Aug 2019 19:58:54 -0000 1.33
@@ -69,12 +69,12 @@
<span class="removed"><del><strong>about what</strong></del></span> <span
class="inserted"><ins><em>against distributing nonfree</em></ins></span>
software <span class="removed"><del><strong>can be
included,</strong></del></span> <span class="inserted"><ins><em>through
their normal channels,</em></ins></span> and nonfree blobs are shipped with
their kernel, <span class="removed"><del><strong>Linux. Arch also has no
policy about not distributing</strong></del></span>
<span class="inserted"><ins><em>Linux.</p>
-
+<!--
<p>Instead of this</em></ins></span> nonfree <span
class="removed"><del><strong>software through their normal
channels.</p></strong></del></span> <span
class="inserted"><ins><em>distribution, use <a
href="/distros/free-distros.html#for-pc">Parabola</a> or <a
href="https://www.hyperbola.info/?gnu-free-stros-page">Hyperbola</a>,
-free distros which are made from it.</p></em></ins></span>
-
+free distros which are made from it.</p>
+--></em></ins></span>
<h3 id="Canaima">Canaima</h3>
<p>Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -83,7 +83,7 @@
<p>Its main menu has an option, “Install nonfree
software”, which installs all the nonfree drivers (even the
-ones that are not necessary). The distro also provides blobs for the
+ones that are not necessary). The distro also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> blobs for the
kernel, Linux, and invites installing nonfree applications including
Flash Player.</p>
@@ -99,7 +99,7 @@
<p>Debian's Social Contract states the goal of making Debian entirely
free software, and Debian conscientiously keeps nonfree software out
-of the official Debian system. However, Debian also provides a
+of the official Debian system. However, Debian also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> a
repository of nonfree software. According to the project, this
software is “not part of the Debian system,” but the
repository is hosted on many of the project's main servers, and people
@@ -131,12 +131,12 @@
<p>Debian's wiki also includes pages about installing nonfree
firmware.</p>
<!-- https://wiki.debian.org/ATIProprietary -->
-
+<!--
<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">gNewSense</a>, and <a
-href="/distros/free-distros.html#for-pc">PureOS</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">PureOS</a>.</p>
+--></em></ins></span>
<h3 id="Fedora">Fedora</h3>
<p>Fedora does have a clear policy about what can be included in the
@@ -159,10 +159,17 @@
permits software released under the original Artistic License to be
included, even though that's a nonfree license.</p>
-<p>Mandriva also provides nonfree software through dedicated
+<p>Mandriva also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> nonfree software through
dedicated
repositories.</p>
-<h3 id="Mint">Mint GNU/Linux</h3>
+<h3 <span class="inserted"><ins><em>id="Manjaro">Manjaro
GNU/Linux</h3>
+
+<p>Manjaro includes nonfree software through its normal channels, and
ships
+nonfree blobs with its kernel, Linux. It includes a proprietary office
+suite and proprietary games with DRM. The distro also recommends the
+installation of nonfree drivers.</p>
+
+<h3</em></ins></span> id="Mint">Mint GNU/Linux</h3>
<p>Mint does not have a policy against including nonfree software, it
includes nonfree binary blobs in drivers packaged with the kernel, and
@@ -222,7 +229,7 @@
<h3</em></ins></span> id="Ubuntu">Ubuntu GNU/Linux</h3>
-<p>Ubuntu provides specific repositories of nonfree software, and
+<p>Ubuntu <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> specific repositories of
nonfree software, and
Canonical expressly promotes and recommends nonfree software under the
Ubuntu name in some of their distribution channels. Ubuntu offers the
option to install only free packages, which means it also offers the
@@ -264,7 +271,7 @@
it. However, that is not</em></ins></span> a <span
class="removed"><del><strong>company <a
href="http://DefectiveByDesign.org/">associated
with DRM</a> as well</strong></del></span> <span
class="inserted"><ins><em>substantive issue about Ubuntu</em></ins></span> as
<span class="removed"><del><strong>mistreatment</strong></del></span> <span
class="inserted"><ins><em>a
GNU/Linux distribution.</p>
-
+<!--
<p>Instead</em></ins></span> of <span
class="removed"><del><strong>workers, authors and publishers.</p>
<p>This adware is</strong></del></span> <span
class="inserted"><ins><em>this nonfree distribution, use</em></ins></span> one
of the <span class="removed"><del><strong>rare occasions in which
a</strong></del></span> free <span class="removed"><del><strong>software
@@ -273,8 +280,8 @@
which are made from it: <a
href="/distros/free-distros.html#for-pc">Dyne:bolic</a>, <a
href="/distros/free-distros.html#for-pc">Trisquel</a>, and <a
-href="/distros/free-distros.html#for-pc">Ututo
S</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">Ututo S</a>.</p>
+--></em></ins></span>
<h2>Some Other Distros</h2>
<p>Here we discuss some <span
class="removed"><del><strong>systems</strong></del></span> <span
class="inserted"><ins><em>well-known or significant non-GNU/Linux system
@@ -397,7 +404,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/07/31 11:31:08 $
+$Date: 2019/08/14 19:58:54 $
<!-- timestamp end -->
</p>
</div>
Index: common-distros.hr.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.hr.po,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- common-distros.hr.po 31 Jul 2019 11:31:08 -0000 1.50
+++ common-distros.hr.po 14 Aug 2019 19:58:54 -0000 1.51
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2014-04-10 23:22+0100\n"
"Last-Translator: Martina Bebek <address@hidden>\n"
"Language-Team: GNU Croatian Translation Team <address@hidden>\n"
@@ -138,13 +138,6 @@
"njihove normalne kanale, i neslobodni blobovi su isporuÄeni s njihovom "
"jezgrom, Linuxom."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -160,10 +153,20 @@
"manjkava zbog ukljuÄivanja neslobodnog softvera."
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"Njezin glavni izbornik ima opciju, “Instaliraj neslobodni "
@@ -194,12 +197,12 @@
#. type: Content of: <p>
# | Debian's Social Contract states the goal of making Debian entirely free
# | software, and Debian conscientiously keeps nonfree software out of the
-# | official Debian system. However, Debian also provides a repository of
-# | nonfree software. According to the project, this software is “not
-# | part of the Debian system,” but the repository is hosted on many of
-# | the project's main servers, and people can readily [-learn about-]
-# | {+find+} these nonfree packages by browsing Debian's online package
-# | [-database.-] {+database and its wiki.+}
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily
+# | [-learn about-] {+find+} these nonfree packages by browsing Debian's
+# | online package [-database.-] {+database and its wiki.+}
#, fuzzy
#| msgid ""
#| "Debian's Social Contract states the goal of making Debian entirely free "
@@ -212,7 +215,7 @@
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -257,13 +260,6 @@
msgid "Debian's wiki also includes pages about installing nonfree firmware."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -315,11 +311,31 @@
"iako je to neslobodna licenca."
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"Madriva isto tako pruža neslobodni softver kroz namjenske repozitorije."
#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -459,8 +475,22 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -506,14 +536,6 @@
"substantive issue about Ubuntu as a GNU/Linux distribution."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Neke druge distribucije"
Index: common-distros.it-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.it-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- common-distros.it-diff.html 31 Jul 2019 11:31:08 -0000 1.8
+++ common-distros.it-diff.html 14 Aug 2019 19:58:54 -0000 1.9
@@ -69,12 +69,12 @@
<span class="removed"><del><strong>about what</strong></del></span> <span
class="inserted"><ins><em>against distributing nonfree</em></ins></span>
software <span class="removed"><del><strong>can be
included,</strong></del></span> <span class="inserted"><ins><em>through
their normal channels,</em></ins></span> and nonfree blobs are shipped with
their kernel, <span class="removed"><del><strong>Linux. Arch also has no
policy about not distributing</strong></del></span>
<span class="inserted"><ins><em>Linux.</p>
-
+<!--
<p>Instead of this</em></ins></span> nonfree <span
class="removed"><del><strong>software through their normal
channels.</p></strong></del></span> <span
class="inserted"><ins><em>distribution, use <a
href="/distros/free-distros.html#for-pc">Parabola</a> or <a
href="https://www.hyperbola.info/?gnu-free-stros-page">Hyperbola</a>,
-free distros which are made from it.</p></em></ins></span>
-
+free distros which are made from it.</p>
+--></em></ins></span>
<h3 id="Canaima">Canaima</h3>
<p>Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -83,7 +83,7 @@
<p>Its main menu has an option, “Install nonfree
software”, which installs all the nonfree drivers (even the
-ones that are not necessary). The distro also provides blobs for the
+ones that are not necessary). The distro also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> blobs for the
kernel, Linux, and invites installing nonfree applications including
Flash Player.</p>
@@ -99,7 +99,7 @@
<p>Debian's Social Contract states the goal of making Debian entirely
free software, and Debian conscientiously keeps nonfree software out
-of the official Debian system. However, Debian also provides a
+of the official Debian system. However, Debian also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> a
repository of nonfree software. According to the project, this
software is “not part of the Debian system,” but the
repository is hosted on many of the project's main servers, and people
@@ -131,12 +131,12 @@
<p>Debian's wiki <span class="inserted"><ins><em>also</em></ins></span>
includes pages about installing nonfree
firmware.</p>
<!-- https://wiki.debian.org/ATIProprietary -->
-
-<span class="inserted"><ins><em><p>Instead of this nonfree distribution,
use one of the free distros
+<span class="inserted"><ins><em><!--
+<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">gNewSense</a>, and <a
-href="/distros/free-distros.html#for-pc">PureOS</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">PureOS</a>.</p>
+--></em></ins></span>
<h3 id="Fedora">Fedora</h3>
<p>Fedora does have a clear policy about what can be included in the
@@ -159,10 +159,17 @@
permits software released under the original Artistic License to be
included, even though that's a nonfree license.</p>
-<p>Mandriva also provides nonfree software through dedicated
+<p>Mandriva also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> nonfree software through
dedicated
repositories.</p>
-<h3 id="Mint">Mint GNU/Linux</h3>
+<h3 <span class="inserted"><ins><em>id="Manjaro">Manjaro
GNU/Linux</h3>
+
+<p>Manjaro includes nonfree software through its normal channels, and
ships
+nonfree blobs with its kernel, Linux. It includes a proprietary office
+suite and proprietary games with DRM. The distro also recommends the
+installation of nonfree drivers.</p>
+
+<h3</em></ins></span> id="Mint">Mint GNU/Linux</h3>
<p>Mint does not have a policy against including nonfree software, it
includes nonfree binary blobs in drivers packaged with the kernel, and
@@ -216,7 +223,7 @@
<h3 id="Ubuntu">Ubuntu GNU/Linux</h3>
-<p>Ubuntu provides specific repositories of nonfree software, and
+<p>Ubuntu <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> specific repositories of
nonfree software, and
Canonical expressly promotes and recommends nonfree software under the
Ubuntu name in some of their distribution channels. Ubuntu offers the
option to install only free packages, which means it also offers the
@@ -245,13 +252,13 @@
reference to someone else's use of the term, we should always reject
it. However, that is not a substantive issue about Ubuntu as a
GNU/Linux distribution.</p>
-
-<span class="inserted"><ins><em><p>Instead of this nonfree distribution,
use one of the free distros
+<span class="inserted"><ins><em><!--
+<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">Dyne:bolic</a>, <a
href="/distros/free-distros.html#for-pc">Trisquel</a>, and <a
-href="/distros/free-distros.html#for-pc">Ututo
S</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">Ututo S</a>.</p>
+--></em></ins></span>
<h2>Some Other Distros</h2>
<p>Here we discuss some well-known or significant non-GNU/Linux system
@@ -384,7 +391,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/07/31 11:31:08 $
+$Date: 2019/08/14 19:58:54 $
<!-- timestamp end -->
</p>
</div>
Index: common-distros.it.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.it.po,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- common-distros.it.po 31 Jul 2019 11:31:08 -0000 1.138
+++ common-distros.it.po 14 Aug 2019 19:58:54 -0000 1.139
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2019-02-02 19:18+0100\n"
"Last-Translator: Andrea Pescetti <address@hidden>\n"
"Language-Team: Italian\n"
@@ -127,13 +127,6 @@
"normal channels, and nonfree blobs are shipped with their kernel, Linux."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -150,10 +143,20 @@
"dell'inclusione di software non libero."
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"Il suo menù principale ha un'opzione, “Installa software non "
@@ -183,10 +186,27 @@
msgstr "Debian GNU/Linux"
#. type: Content of: <p>
+# | Debian's Social Contract states the goal of making Debian entirely free
+# | software, and Debian conscientiously keeps nonfree software out of the
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily find
+# | these nonfree packages by browsing Debian's online package database and
+# | its wiki.
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -237,13 +257,6 @@
msgstr ""
"Il wiki di Debian contiene istruzioni su come installare software non libero."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -296,11 +309,31 @@
"Licenza Artistica originale, benché questa sia una licenza non libera."
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"Mandriva fornisce anche programmi non liberi attraverso repository dedicati."
#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -417,8 +450,22 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -486,14 +533,6 @@
"non è un problema rilevante per quanto riguarda Ubuntu come distribuzione "
"GNU/Linux."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Alcune altre distribuzioni"
Index: common-distros.ja.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ja.po,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- common-distros.ja.po 31 Jul 2019 11:31:08 -0000 1.111
+++ common-distros.ja.po 14 Aug 2019 19:58:54 -0000 1.112
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2019-06-26 16:06+0900\n"
"Last-Translator: NIIBE Yutaka <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -130,17 +130,6 @@
"Archã¯ä¸èªç±ãªã½ããã¦ã§ã¢ããã®é常ã®çµè·¯ã§é
å¸ããªããã¨ã«ã¤ãã¦ãªãã®ããª"
"ã·ã¼ããªããä¸èªç±ãªãããã¯ã«ã¼ãã«Linuxã¨ã¨ãã«é
å¸ããã¦ãã¾ãã"
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-"ãã®ä¸èªç±ãªãã£ã¹ããªãã¥ã¼ã·ã§ã³ã§ã¯ãªãã<a
href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a>ãããã¯<a
href=\"https://www.hyperbola.info/?gnu-";
-"free-stros-page\">Hyperbola</a>ã使ãã¾ããããããã¯èªç±ãªãã£ã¹ããã§Archã"
-"å
ã«ä½ããã¦ãã¾ãã"
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -156,10 +145,16 @@
"ã¹ãã§ãããCanaimaã¯ä¸èªç±ãªã½ããã¦ã§ã¢ãå«ãã¨ããæ¬
ç¹ãããã¾ãã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"“ä¸èªç±ãªã½ããã¦ã§ã¢ãã¤ã³ã¹ãã¼ã«ãã”ã¨ãããªãã·ã§ã³ãã¡ã¤"
@@ -189,10 +184,19 @@
msgstr "Debian GNU/Linux"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -247,17 +251,6 @@
"Debianã®wikiã«ã¯ä¸èªç±ãªãã¡ã¼ã
ã¦ã§ã¢ãã¤ã³ã¹ãã¼ã«ãããã¨ã«ã¤ãã¦ã®ãã¼ã¸"
"ãããã¾ãã"
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-"ãã®ä¸èªç±ãªãã£ã¹ããªãã¥ã¼ã·ã§ã³ã§ã¯ãªããDebianãå
ã«ä½ãããèªç±ãªãã£ã¹"
-"ããã®ä¸ã¤ã使ãã¾ããã: <a
href=\"/distros/free-distros.html#for-pc"
-"\">gNewSense</a>㨠<a
href=\"/distros/free-distros.html#for-pc\">PureOS</a>ã§"
-"ãã"
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -310,11 +303,28 @@
"ã¹ãªã®ã«ããããããã"
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"Mandrivaã¯ä¸èªç±ãªã½ããã¦ã§ã¢ãããå°ç¨ã®ãªãã¸ããªã«ãã£ã¦æä¾ãã¦ãã¾ãã"
#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -430,8 +440,16 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -496,18 +514,6 @@
"ãã§ããããããããã¯ãUbuntuã®GNU/Linuxãã£ã¹ããªãã¥ã¼ã·ã§ã³ã¨ãã¦ã®ä¸»è¦ãª"
"åé¡ã§ã¯ããã¾ããã"
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-"ãã®ä¸èªç±ãªãã£ã¹ããªãã¥ã¼ã·ã§ã³ã§ã¯ãªãããããå
ã«ä½ãããèªç±ãªãã£ã¹ã"
-"ãã®ä¸ã¤ã使ãã¾ããã: <a
href=\"/distros/free-distros.html#for-pc\">Dyne:"
-"bolic</a>ã<a
href=\"/distros/free-distros.html#for-pc\">Trisquel</a>ãããã¦"
-"<a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>ã§ãã"
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "ãã®ã»ãã®ãã£ã¹ãã"
@@ -713,6 +719,39 @@
msgstr "æçµæ´æ°:"
#~ msgid ""
+#~ "Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
+#~ "html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-";
+#~ "free-stros-page\">Hyperbola</a>, free distros which are made from it."
+#~ msgstr ""
+#~ "ãã®ä¸èªç±ãªãã£ã¹ããªãã¥ã¼ã·ã§ã³ã§ã¯ãªãã<a
href=\"/distros/free-"
+#~ "distros.html#for-pc\">Parabola</a>ãããã¯<a
href=\"https://www.hyperbola.";
+#~
"info/?gnu-free-stros-page\">Hyperbola</a>ã使ãã¾ããããããã¯èªç±ãªãã£"
+#~ "ã¹ããã§Archãå
ã«ä½ããã¦ãã¾ãã"
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a>, and <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">PureOS</a>."
+#~ msgstr ""
+#~
"ãã®ä¸èªç±ãªãã£ã¹ããªãã¥ã¼ã·ã§ã³ã§ã¯ãªããDebianãå
ã«ä½ãããèªç±ãªãã£"
+#~ "ã¹ããã®ä¸ã¤ã使ãã¾ããã: <a
href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a>㨠<a href=\"/distros/free-distros.html#for-pc\">PureOS</"
+#~ "a>ã§ãã"
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
+#~ "bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, "
+#~ "and <a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
+#~ msgstr ""
+#~
"ãã®ä¸èªç±ãªãã£ã¹ããªãã¥ã¼ã·ã§ã³ã§ã¯ãªãããããå
ã«ä½ãããèªç±ãªãã£ã¹"
+#~ "ããã®ä¸ã¤ã使ãã¾ããã: <a
href=\"/distros/free-distros.html#for-pc"
+#~ "\">Dyne:bolic</a>ã<a href=\"/distros/free-distros.html#for-pc"
+#~ "\">Trisquel</a>ãããã¦<a href=\"/distros/free-distros.html#for-pc"
+#~ "\">Ututo S</a>ã§ãã"
+
+#~ msgid ""
#~ "Previous releases of Debian included nonfree blobs with Linux, the "
#~ "kernel. With the release of Debian 6.0 (“squeeze”) in "
#~ "February 2011, these blobs have been moved out of the main distribution "
Index: common-distros.lt-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.lt-diff.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- common-distros.lt-diff.html 31 Jul 2019 11:31:08 -0000 1.22
+++ common-distros.lt-diff.html 14 Aug 2019 19:58:54 -0000 1.23
@@ -69,12 +69,12 @@
<span class="removed"><del><strong>about what</strong></del></span> <span
class="inserted"><ins><em>against distributing nonfree</em></ins></span>
software <span class="removed"><del><strong>can be
included,</strong></del></span> <span class="inserted"><ins><em>through
their normal channels,</em></ins></span> and nonfree blobs are shipped with
their kernel, <span class="removed"><del><strong>Linux. Arch also has no
policy about not distributing</strong></del></span>
<span class="inserted"><ins><em>Linux.</p>
-
+<!--
<p>Instead of this</em></ins></span> nonfree <span
class="removed"><del><strong>software through their normal
channels.</p></strong></del></span> <span
class="inserted"><ins><em>distribution, use <a
href="/distros/free-distros.html#for-pc">Parabola</a> or <a
href="https://www.hyperbola.info/?gnu-free-stros-page">Hyperbola</a>,
-free distros which are made from it.</p></em></ins></span>
-
+free distros which are made from it.</p>
+--></em></ins></span>
<h3 id="Canaima">Canaima</h3>
<p>Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -83,7 +83,7 @@
<p>Its main menu has an option, “Install nonfree
software”, which installs all the nonfree drivers (even the
-ones that are not necessary). The distro also provides blobs for the
+ones that are not necessary). The distro also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> blobs for the
kernel, Linux, and invites installing nonfree applications including
Flash Player.</p>
@@ -99,7 +99,7 @@
<p>Debian's Social Contract states the goal of making Debian entirely
free software, and Debian conscientiously keeps nonfree software out
-of the official Debian system. However, Debian also provides a
+of the official Debian system. However, Debian also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> a
repository of nonfree software. According to the project, this
software is “not part of the Debian system,” but the
repository is hosted on many of the project's main servers, and people
@@ -131,12 +131,12 @@
<p>Debian's wiki also includes pages about installing nonfree
firmware.</p>
<!-- https://wiki.debian.org/ATIProprietary -->
-
+<!--
<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">gNewSense</a>, and <a
-href="/distros/free-distros.html#for-pc">PureOS</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">PureOS</a>.</p>
+--></em></ins></span>
<h3 id="Fedora">Fedora</h3>
<p>Fedora does have a clear policy about what can be included in the
@@ -159,10 +159,17 @@
permits software released under the original Artistic License to be
included, even though that's a nonfree license.</p>
-<p>Mandriva also provides nonfree software through dedicated
+<p>Mandriva also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> nonfree software through
dedicated
repositories.</p>
-<h3 id="Mint">Mint GNU/Linux</h3>
+<h3 <span class="inserted"><ins><em>id="Manjaro">Manjaro
GNU/Linux</h3>
+
+<p>Manjaro includes nonfree software through its normal channels, and
ships
+nonfree blobs with its kernel, Linux. It includes a proprietary office
+suite and proprietary games with DRM. The distro also recommends the
+installation of nonfree drivers.</p>
+
+<h3</em></ins></span> id="Mint">Mint GNU/Linux</h3>
<p>Mint does not have a policy against including nonfree software, it
includes nonfree binary blobs in drivers packaged with the kernel, and
@@ -216,7 +223,7 @@
<h3 id="Ubuntu">Ubuntu GNU/Linux</h3>
-<p>Ubuntu provides specific repositories of nonfree software, and
+<p>Ubuntu <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> specific repositories of
nonfree software, and
Canonical expressly promotes and recommends nonfree software under the
Ubuntu name in some of their distribution channels. Ubuntu offers the
option to install only free packages, which means it also offers the
@@ -259,13 +266,13 @@
reference to someone else's use of the term, we should always reject
it. However, that is not a substantive issue about Ubuntu as a
GNU/Linux distribution.</p>
-
-<span class="inserted"><ins><em><p>Instead of this nonfree distribution,
use one of the free distros
+<span class="inserted"><ins><em><!--
+<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">Dyne:bolic</a>, <a
href="/distros/free-distros.html#for-pc">Trisquel</a>, and <a
-href="/distros/free-distros.html#for-pc">Ututo
S</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">Ututo S</a>.</p>
+--></em></ins></span>
<h2>Some Other Distros</h2>
<p>Here we discuss some well-known or significant non-GNU/Linux system
@@ -396,7 +403,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/07/31 11:31:08 $
+$Date: 2019/08/14 19:58:54 $
<!-- timestamp end -->
</p>
</div>
Index: common-distros.lt.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.lt.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- common-distros.lt.po 31 Jul 2019 11:31:08 -0000 1.23
+++ common-distros.lt.po 14 Aug 2019 19:58:54 -0000 1.24
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2016-01-25 20:36+0200\n"
"Last-Translator: Donatas Klimašauskas <address@hidden>\n"
"Language-Team: Lithuanian <address@hidden>\n"
@@ -127,13 +127,6 @@
"normal channels, and nonfree blobs are shipped with their kernel, Linux."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -149,10 +142,20 @@
"Canaima yra brokuota įtraukiant nelaisvÄ
programinÄ Ä¯rangÄ
."
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"Jos pagrindiniame meniu yra parinktis „Ä®diegti nelaisvÄ
programinÄ "
@@ -184,12 +187,12 @@
#. type: Content of: <p>
# | Debian's Social Contract states the goal of making Debian entirely free
# | software, and Debian conscientiously keeps nonfree software out of the
-# | official Debian system. However, Debian also provides a repository of
-# | nonfree software. According to the project, this software is “not
-# | part of the Debian system,” but the repository is hosted on many of
-# | the project's main servers, and people can readily [-learn about-]
-# | {+find+} these nonfree packages by browsing Debian's online package
-# | [-database.-] {+database and its wiki.+}
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily
+# | [-learn about-] {+find+} these nonfree packages by browsing Debian's
+# | online package [-database.-] {+database and its wiki.+}
#, fuzzy
#| msgid ""
#| "Debian's Social Contract states the goal of making Debian entirely free "
@@ -202,7 +205,7 @@
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -249,13 +252,6 @@
msgid "Debian's wiki also includes pages about installing nonfree firmware."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -308,12 +304,32 @@
"ArtistinÄ licencijÄ
, nors ji yra nelaisva licencija."
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"Mandriva taip pat pateikia nelaisvÄ
programinÄ Ä¯rangÄ
per dedikuotas "
"saugyklas."
#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -430,8 +446,22 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -518,14 +548,6 @@
"atmesti. TaÄiau, tai nÄra svari Ubuntu, kaip GNU/Linux distribucijos, "
"problema."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Kai kurios kitos distribucijos"
Index: common-distros.nl-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.nl-diff.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- common-distros.nl-diff.html 31 Jul 2019 11:31:08 -0000 1.14
+++ common-distros.nl-diff.html 14 Aug 2019 19:58:55 -0000 1.15
@@ -69,12 +69,12 @@
<span class="removed"><del><strong>about what</strong></del></span> <span
class="inserted"><ins><em>against distributing nonfree</em></ins></span>
software <span class="removed"><del><strong>can be
included,</strong></del></span> <span class="inserted"><ins><em>through
their normal channels,</em></ins></span> and nonfree blobs are shipped with
their kernel, <span class="removed"><del><strong>Linux. Arch also has no
policy about not distributing</strong></del></span>
<span class="inserted"><ins><em>Linux.</p>
-
+<!--
<p>Instead of this</em></ins></span> nonfree <span
class="removed"><del><strong>software through their normal
channels.</p></strong></del></span> <span
class="inserted"><ins><em>distribution, use <a
href="/distros/free-distros.html#for-pc">Parabola</a> or <a
href="https://www.hyperbola.info/?gnu-free-stros-page">Hyperbola</a>,
-free distros which are made from it.</p></em></ins></span>
-
+free distros which are made from it.</p>
+--></em></ins></span>
<h3 id="Canaima">Canaima</h3>
<p>Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -83,7 +83,7 @@
<p>Its main menu has an option, “Install nonfree
software”, which installs all the nonfree drivers (even the
-ones that are not necessary). The distro also provides blobs for the
+ones that are not necessary). The distro also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> blobs for the
kernel, Linux, and invites installing nonfree applications including
Flash Player.</p>
@@ -99,7 +99,7 @@
<p>Debian's Social Contract states the goal of making Debian entirely
free software, and Debian conscientiously keeps nonfree software out
-of the official Debian system. However, Debian also provides a
+of the official Debian system. However, Debian also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> a
repository of nonfree software. According to the project, this
software is “not part of the Debian system,” but the
repository is hosted on many of the project's main servers, and people
@@ -131,12 +131,12 @@
<p>Debian's wiki <span class="inserted"><ins><em>also</em></ins></span>
includes pages about installing nonfree
firmware.</p>
<!-- https://wiki.debian.org/ATIProprietary -->
-
-<span class="inserted"><ins><em><p>Instead of this nonfree distribution,
use one of the free distros
+<span class="inserted"><ins><em><!--
+<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">gNewSense</a>, and <a
-href="/distros/free-distros.html#for-pc">PureOS</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">PureOS</a>.</p>
+--></em></ins></span>
<h3 id="Fedora">Fedora</h3>
<p>Fedora does have a clear policy about what can be included in the
@@ -159,10 +159,17 @@
permits software released under the original Artistic License to be
included, even though that's a nonfree license.</p>
-<p>Mandriva also provides nonfree software through dedicated
+<p>Mandriva also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> nonfree software through
dedicated
repositories.</p>
-<h3 id="Mint">Mint GNU/Linux</h3>
+<h3 <span class="inserted"><ins><em>id="Manjaro">Manjaro
GNU/Linux</h3>
+
+<p>Manjaro includes nonfree software through its normal channels, and
ships
+nonfree blobs with its kernel, Linux. It includes a proprietary office
+suite and proprietary games with DRM. The distro also recommends the
+installation of nonfree drivers.</p>
+
+<h3</em></ins></span> id="Mint">Mint GNU/Linux</h3>
<p>Mint does not have a policy against including nonfree software, it
includes nonfree binary blobs in drivers packaged with the kernel, and
@@ -216,7 +223,7 @@
<h3 id="Ubuntu">Ubuntu GNU/Linux</h3>
-<p>Ubuntu provides specific repositories of nonfree software, and
+<p>Ubuntu <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> specific repositories of
nonfree software, and
Canonical expressly promotes and recommends nonfree software under the
Ubuntu name in some of their distribution channels. Ubuntu offers the
option to install only free packages, which means it also offers the
@@ -245,13 +252,13 @@
reference to someone else's use of the term, we should always reject
it. However, that is not a substantive issue about Ubuntu as a
GNU/Linux distribution.</p>
-
-<span class="inserted"><ins><em><p>Instead of this nonfree distribution,
use one of the free distros
+<span class="inserted"><ins><em><!--
+<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">Dyne:bolic</a>, <a
href="/distros/free-distros.html#for-pc">Trisquel</a>, and <a
-href="/distros/free-distros.html#for-pc">Ututo
S</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">Ututo S</a>.</p>
+--></em></ins></span>
<h2>Some Other Distros</h2>
<p>Here we discuss some well-known or significant non-GNU/Linux system
@@ -379,7 +386,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/07/31 11:31:08 $
+$Date: 2019/08/14 19:58:55 $
<!-- timestamp end -->
</p>
</div>
Index: common-distros.nl.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.nl.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- common-distros.nl.po 31 Jul 2019 11:31:08 -0000 1.23
+++ common-distros.nl.po 14 Aug 2019 19:58:55 -0000 1.24
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2017-07-04 22:37+0200\n"
"Last-Translator: Justin van Steijn <address@hidden>\n"
"Language-Team: Dutch\n"
@@ -131,13 +131,6 @@
"Arch heeft geen beleid over het blokkeren van niet-vrije software via hun "
"normale kanalen, en niet-vrije blobs worden geleverd met hun kernel, Linux."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -154,10 +147,20 @@
"meegeleverd wordt."
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"Het hoofdmenu heeft een optie, “niet-vrije software "
@@ -187,10 +190,27 @@
msgstr "Debian GNU/Linux"
#. type: Content of: <p>
+# | Debian's Social Contract states the goal of making Debian entirely free
+# | software, and Debian conscientiously keeps nonfree software out of the
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily find
+# | these nonfree packages by browsing Debian's online package database and
+# | its wiki.
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -265,13 +285,6 @@
"De wiki van Debian bevat pagina's over het installeren van niet-vrije "
"firmware."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -323,11 +336,31 @@
"terwijl dit een niet-vrije licentie is."
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"Mandriva levert ook niet-vrije software door middel van aparte pakketbronnen."
#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -445,8 +478,22 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -513,14 +560,6 @@
"een pagina die die term gebruikt, moeten we het altijd afwijzen. Echter zegt "
"dat niets over Ubuntu als GNU/Linux-distributie."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Enkele andere distributies"
Index: common-distros.pl-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pl-diff.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- common-distros.pl-diff.html 31 Jul 2019 11:31:08 -0000 1.17
+++ common-distros.pl-diff.html 14 Aug 2019 19:58:56 -0000 1.18
@@ -69,12 +69,12 @@
<span class="removed"><del><strong>about what</strong></del></span> <span
class="inserted"><ins><em>against distributing nonfree</em></ins></span>
software <span class="removed"><del><strong>can be
included,</strong></del></span> <span class="inserted"><ins><em>through
their normal channels,</em></ins></span> and nonfree blobs are shipped with
their kernel, <span class="removed"><del><strong>Linux. Arch also has no
policy about not distributing</strong></del></span>
<span class="inserted"><ins><em>Linux.</p>
-
+<!--
<p>Instead of this</em></ins></span> nonfree <span
class="removed"><del><strong>software through their normal
channels.</p></strong></del></span> <span
class="inserted"><ins><em>distribution, use <a
href="/distros/free-distros.html#for-pc">Parabola</a> or <a
href="https://www.hyperbola.info/?gnu-free-stros-page">Hyperbola</a>,
-free distros which are made from it.</p></em></ins></span>
-
+free distros which are made from it.</p>
+--></em></ins></span>
<h3 id="Canaima">Canaima</h3>
<p>Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -83,7 +83,7 @@
<p>Its main menu has an option, “Install nonfree
software”, which installs all the nonfree drivers (even the
-ones that are not necessary). The distro also provides blobs for the
+ones that are not necessary). The distro also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> blobs for the
kernel, Linux, and invites installing nonfree applications including
Flash Player.</p>
@@ -99,7 +99,7 @@
<p>Debian's Social Contract states the goal of making Debian entirely
free software, and Debian conscientiously keeps nonfree software out
-of the official Debian system. However, Debian also provides a
+of the official Debian system. However, Debian also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> a
repository of nonfree software. According to the project, this
software is “not part of the Debian system,” but the
repository is hosted on many of the project's main servers, and people
@@ -131,12 +131,12 @@
<p>Debian's wiki <span class="inserted"><ins><em>also</em></ins></span>
includes pages about installing nonfree
firmware.</p>
<!-- https://wiki.debian.org/ATIProprietary -->
-
-<span class="inserted"><ins><em><p>Instead of this nonfree distribution,
use one of the free distros
+<span class="inserted"><ins><em><!--
+<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">gNewSense</a>, and <a
-href="/distros/free-distros.html#for-pc">PureOS</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">PureOS</a>.</p>
+--></em></ins></span>
<h3 id="Fedora">Fedora</h3>
<p>Fedora does have a clear policy about what can be included in the
@@ -159,10 +159,17 @@
permits software released under the original Artistic License to be
included, even though that's a nonfree license.</p>
-<p>Mandriva also provides nonfree software through dedicated
+<p>Mandriva also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> nonfree software through
dedicated
repositories.</p>
-<h3 id="Mint">Mint GNU/Linux</h3>
+<h3 <span class="inserted"><ins><em>id="Manjaro">Manjaro
GNU/Linux</h3>
+
+<p>Manjaro includes nonfree software through its normal channels, and
ships
+nonfree blobs with its kernel, Linux. It includes a proprietary office
+suite and proprietary games with DRM. The distro also recommends the
+installation of nonfree drivers.</p>
+
+<h3</em></ins></span> id="Mint">Mint GNU/Linux</h3>
<p>Mint does not have a policy against including nonfree software, it
includes nonfree binary blobs in drivers packaged with the kernel, and
@@ -216,7 +223,7 @@
<h3 id="Ubuntu">Ubuntu GNU/Linux</h3>
-<p>Ubuntu provides specific repositories of nonfree software, and
+<p>Ubuntu <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> specific repositories of
nonfree software, and
Canonical expressly promotes and recommends nonfree software under the
Ubuntu name in some of their distribution channels. Ubuntu offers the
option to install only free packages, which means it also offers the
@@ -245,13 +252,13 @@
reference to someone else's use of the term, we should always reject
it. However, that is not a substantive issue about Ubuntu as a
GNU/Linux distribution.</p>
-
-<span class="inserted"><ins><em><p>Instead of this nonfree distribution,
use one of the free distros
+<span class="inserted"><ins><em><!--
+<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">Dyne:bolic</a>, <a
href="/distros/free-distros.html#for-pc">Trisquel</a>, and <a
-href="/distros/free-distros.html#for-pc">Ututo
S</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">Ututo S</a>.</p>
+--></em></ins></span>
<h2>Some Other Distros</h2>
<p>Here we discuss some well-known or significant non-GNU/Linux system
@@ -379,7 +386,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/07/31 11:31:08 $
+$Date: 2019/08/14 19:58:56 $
<!-- timestamp end -->
</p>
</div>
Index: common-distros.pl.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pl.po,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- common-distros.pl.po 31 Jul 2019 11:31:08 -0000 1.132
+++ common-distros.pl.po 14 Aug 2019 19:58:56 -0000 1.133
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: common-distros.html\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2017-08-01 10:25-0600\n"
"Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -136,13 +136,6 @@
"normal channels, and nonfree blobs are shipped with their kernel, Linux."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -158,10 +151,20 @@
"podziwu, Canaima ma wadÄ zaÅÄ
czania niewolnego oprogramowania."
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"Jej gÅówne menu ma opcjÄ „Zainstaluj niewolne oprogramowanie”,
"
@@ -191,10 +194,27 @@
msgstr "Debian GNU/Linux"
#. type: Content of: <p>
+# | Debian's Social Contract states the goal of making Debian entirely free
+# | software, and Debian conscientiously keeps nonfree software out of the
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily find
+# | these nonfree packages by browsing Debian's online package database and
+# | its wiki.
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -244,13 +264,6 @@
msgid "Debian's wiki also includes pages about installing nonfree firmware."
msgstr "Wiki Debiana zawiera strony o instalowaniu niewolnego firmware."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -303,12 +316,32 @@
"Artistic, która również nie jest wolnÄ
licencjÄ
."
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"Mandriva dostarcza również niewolne oprogramowanie poprzez dedykowane "
"repozytoria."
#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -427,8 +460,22 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -513,14 +560,6 @@
"wyjÄ
tku, szkodliwe, wiÄc zawsze musimy to potÄpiÄ. Jednakże, nie
jest "
"to ważnym zagadnieniem o Ubuntu jako dystrybucji GNU/Linux."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Kilka pozostaÅych dystrybucji"
Index: common-distros.pot
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pot,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- common-distros.pot 31 Jul 2019 11:31:08 -0000 1.85
+++ common-distros.pot 14 Aug 2019 19:58:56 -0000 1.86
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -96,14 +96,6 @@
"normal channels, and nonfree blobs are shipped with their kernel, Linux."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a "
-"href=\"/distros/free-distros.html#for-pc\">Parabola</a> or <a "
-"href=\"https://www.hyperbola.info/?gnu-free-stros-page\";>Hyperbola</a>, free "
-"distros which are made from it."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr ""
@@ -119,7 +111,7 @@
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
@@ -143,7 +135,7 @@
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -178,13 +170,6 @@
msgid "Debian's wiki also includes pages about installing nonfree firmware."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr ""
@@ -223,7 +208,19 @@
msgstr ""
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "Manjaro GNU/Linux"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
msgstr ""
#. type: Content of: <h3>
@@ -315,7 +312,7 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -354,14 +351,6 @@
"is not a substantive issue about Ubuntu as a GNU/Linux distribution."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a "
-"href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr ""
Index: common-distros.pt-br.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pt-br.po,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- common-distros.pt-br.po 1 Aug 2019 20:59:05 -0000 1.67
+++ common-distros.pt-br.po 14 Aug 2019 19:58:56 -0000 1.68
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2019-08-01 17:09-0200\n"
"Last-Translator: Rafael Fontenelle <address@hidden>\n"
"Language-Team: Brazilian Portuguese <address@hidden>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2019-08-14 19:55+0000\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Virtaal 1.0.0-beta1\n"
@@ -132,16 +133,6 @@
"através de seus canais normais, e os blobs não livres são fornecidos com o
"
"kernel, o Linux."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-"Em vez dessa distribuição não livre, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> ou <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, distros livres que são feita a partir desta."
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -157,10 +148,16 @@
"o Canaima falha porque inclui software não livre."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"O menu principal da distro contém uma opção, âInstalar software não
livreâ, "
@@ -190,10 +187,19 @@
msgstr "Debian GNU/Linux"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -252,16 +258,6 @@
"O wiki do Debian também inclui páginas sobre instalação de firmware não "
"livre."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-"Em vez dessa distribuição não livre, use uma das distros livres que são "
-"feitas a partir desta: <a href=\"/distros/free-distros.html#for-pc"
-"\">gNewSense</a> e <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -314,12 +310,29 @@
"seja incluÃdo, embora essa seja uma licença não livre."
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"O Mandriva também provê software não livre por meio de seus repositórios "
"dedicados."
#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -436,8 +449,16 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -503,18 +524,6 @@
"referência ao uso do termo por outra pessoa, você deve rejeitá-lo. Porém,
"
"não é uma questão substantiva sobre Ubuntu como uma distribuição
GNU/Linux."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-"Em vez dessa distribuição não livre, use uma das distros livres que são "
-"feitas a partir desta: <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
-"bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a> e <a "
-"href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Algumas Outras Distros"
@@ -732,6 +741,38 @@
msgstr "Ãltima atualização:"
#~ msgid ""
+#~ "Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
+#~ "html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-";
+#~ "free-stros-page\">Hyperbola</a>, free distros which are made from it."
+#~ msgstr ""
+#~ "Em vez dessa distribuição não livre, use <a
href=\"/distros/free-distros."
+#~ "html#for-pc\">Parabola</a> ou <a href=\"https://www.hyperbola.info/?gnu-";
+#~ "free-stros-page\">Hyperbola</a>, distros livres que são feita a partir "
+#~ "desta."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a>, and <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">PureOS</a>."
+#~ msgstr ""
+#~ "Em vez dessa distribuição não livre, use uma das distros livres que
são "
+#~ "feitas a partir desta: <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a> e <a href=\"/distros/free-distros.html#for-pc\">PureOS</"
+#~ "a>."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
+#~ "bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, "
+#~ "and <a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
+#~ msgstr ""
+#~ "Em vez dessa distribuição não livre, use uma das distros livres que
são "
+#~ "feitas a partir desta: <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
+#~ "bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a> e "
+#~ "<a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
+
+#~ msgid ""
#~ "Previous releases of Debian included nonfree blobs with Linux, the "
#~ "kernel. With the release of Debian 6.0 (“squeeze”) in "
#~ "February 2011, these blobs have been moved out of the main distribution "
Index: common-distros.ro-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ro-diff.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- common-distros.ro-diff.html 31 Jul 2019 11:31:08 -0000 1.41
+++ common-distros.ro-diff.html 14 Aug 2019 19:58:56 -0000 1.42
@@ -69,12 +69,12 @@
<span class="removed"><del><strong>about what</strong></del></span> <span
class="inserted"><ins><em>against distributing nonfree</em></ins></span>
software <span class="removed"><del><strong>can be
included,</strong></del></span> <span class="inserted"><ins><em>through
their normal channels,</em></ins></span> and nonfree blobs are shipped with
their kernel, <span class="removed"><del><strong>Linux. Arch also has no
policy about not distributing</strong></del></span>
<span class="inserted"><ins><em>Linux.</p>
-
+<!--
<p>Instead of this</em></ins></span> nonfree <span
class="removed"><del><strong>software through their normal
channels.</p></strong></del></span> <span
class="inserted"><ins><em>distribution, use <a
href="/distros/free-distros.html#for-pc">Parabola</a> or <a
href="https://www.hyperbola.info/?gnu-free-stros-page">Hyperbola</a>,
-free distros which are made from it.</p></em></ins></span>
-
+free distros which are made from it.</p>
+--></em></ins></span>
<h3 id="Canaima">Canaima</h3>
<p>Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -83,7 +83,7 @@
<p>Its main menu has an option, “Install nonfree
software”, which installs all the nonfree drivers (even the
-ones that are not necessary). The distro also provides blobs for the
+ones that are not necessary). The distro also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> blobs for the
kernel, Linux, and invites installing nonfree applications including
Flash Player.</p>
@@ -99,7 +99,7 @@
<p>Debian's Social Contract states the goal of making Debian entirely
free software, and Debian conscientiously keeps nonfree software out
-of the official Debian system. However, Debian also provides a
+of the official Debian system. However, Debian also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> a
repository of nonfree software. According to the project, this
software is “not part of the Debian system,” but the
repository is hosted on many of the project's main servers, and people
@@ -131,12 +131,12 @@
<p>Debian's wiki also includes pages about installing nonfree
firmware.</p>
<!-- https://wiki.debian.org/ATIProprietary -->
-
+<!--
<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">gNewSense</a>, and <a
-href="/distros/free-distros.html#for-pc">PureOS</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">PureOS</a>.</p>
+--></em></ins></span>
<h3 id="Fedora">Fedora</h3>
<p>Fedora does have a clear policy about what can be included in the
@@ -159,10 +159,17 @@
permits software released under the original Artistic License to be
included, even though that's a nonfree license.</p>
-<p>Mandriva also provides nonfree software through dedicated
+<p>Mandriva also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> nonfree software through
dedicated
repositories.</p>
-<h3 id="Mint">Mint GNU/Linux</h3>
+<h3 <span class="inserted"><ins><em>id="Manjaro">Manjaro
GNU/Linux</h3>
+
+<p>Manjaro includes nonfree software through its normal channels, and
ships
+nonfree blobs with its kernel, Linux. It includes a proprietary office
+suite and proprietary games with DRM. The distro also recommends the
+installation of nonfree drivers.</p>
+
+<h3</em></ins></span> id="Mint">Mint GNU/Linux</h3>
<p>Mint does not have a policy against including nonfree software, it
includes nonfree binary blobs in drivers packaged with the kernel, and
@@ -222,7 +229,7 @@
<h3</em></ins></span> id="Ubuntu">Ubuntu GNU/Linux</h3>
-<p>Ubuntu provides specific repositories of nonfree software, and
+<p>Ubuntu <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> specific repositories of
nonfree software, and
Canonical expressly promotes and recommends nonfree software under the
Ubuntu name in some of their distribution channels. Ubuntu offers the
option to install only free packages, which means it also offers the
@@ -264,7 +271,7 @@
it. However, that is not</em></ins></span> a <span
class="removed"><del><strong>company <a
href="http://DefectiveByDesign.org/">associated
with DRM</a> as well</strong></del></span> <span
class="inserted"><ins><em>substantive issue about Ubuntu</em></ins></span> as
<span class="removed"><del><strong>mistreatment</strong></del></span> <span
class="inserted"><ins><em>a
GNU/Linux distribution.</p>
-
+<!--
<p>Instead</em></ins></span> of <span
class="removed"><del><strong>workers, authors and publishers.</p>
<p>This adware is</strong></del></span> <span
class="inserted"><ins><em>this nonfree distribution, use</em></ins></span> one
of the <span class="removed"><del><strong>rare occasions in which
a</strong></del></span> free <span class="removed"><del><strong>software
@@ -273,8 +280,8 @@
which are made from it: <a
href="/distros/free-distros.html#for-pc">Dyne:bolic</a>, <a
href="/distros/free-distros.html#for-pc">Trisquel</a>, and <a
-href="/distros/free-distros.html#for-pc">Ututo
S</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">Ututo S</a>.</p>
+--></em></ins></span>
<h2>Some Other Distros</h2>
<p>Here we discuss some <span
class="removed"><del><strong>systems</strong></del></span> <span
class="inserted"><ins><em>well-known or significant non-GNU/Linux system
@@ -398,7 +405,7 @@
<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
<!-- timestamp start -->
-$Date: 2019/07/31 11:31:08 $
+$Date: 2019/08/14 19:58:56 $
<!-- timestamp end -->
</p>
</div>
Index: common-distros.ro.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ro.po,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- common-distros.ro.po 31 Jul 2019 11:31:08 -0000 1.45
+++ common-distros.ro.po 14 Aug 2019 19:58:57 -0000 1.46
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2013-12-11 12:59+0200\n"
"Last-Translator: Tiberiu C. Turbureanu <address@hidden>\n"
"Language-Team: Romanian <address@hidden>\n"
@@ -129,13 +129,6 @@
"normal channels, and nonfree blobs are shipped with their kernel, Linux."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -151,10 +144,20 @@
"admirabil, Canaima este defectuoasÄ fiindcÄ include programe nelibere."
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"Meniul ei principal are o opÈiune, âInstaleazÄ programe nelibereâ, care
"
@@ -186,12 +189,12 @@
#. type: Content of: <p>
# | Debian's Social Contract states the goal of making Debian entirely free
# | software, and Debian conscientiously keeps nonfree software out of the
-# | official Debian system. However, Debian also provides a repository of
-# | nonfree software. According to the project, this software is “not
-# | part of the Debian system,” but the repository is hosted on many of
-# | the project's main servers, and people can readily [-learn about-]
-# | {+find+} these nonfree packages by browsing Debian's online package
-# | [-database.-] {+database and its wiki.+}
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily
+# | [-learn about-] {+find+} these nonfree packages by browsing Debian's
+# | online package [-database.-] {+database and its wiki.+}
#, fuzzy
#| msgid ""
#| "Debian's Social Contract states the goal of making Debian entirely free "
@@ -204,7 +207,7 @@
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -250,13 +253,6 @@
msgid "Debian's wiki also includes pages about installing nonfree firmware."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -309,12 +305,32 @@
"neliberÄ."
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"De asemenea, Mandriva pune la dispoziÈie programe nelibere prin depozite "
"dedicate."
#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "GNU+Linux Mandriva"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "GNU+Linux Mint"
@@ -458,8 +474,22 @@
msgstr "GNU+Linux Ubuntu"
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -505,14 +535,6 @@
"substantive issue about Ubuntu as a GNU/Linux distribution."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Câteva alte distribuÈii"
Index: common-distros.ru.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ru.po,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- common-distros.ru.po 31 Jul 2019 11:59:21 -0000 1.165
+++ common-distros.ru.po 14 Aug 2019 19:58:57 -0000 1.166
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2019-07-31 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <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: 2019-08-14 19:55+0000\n"
# type: Content of: <title>
#. type: Content of: <title>
@@ -144,16 +145,6 @@
"Ð Arch Ð½ÐµÑ Ð¿Ñавила, запÑеÑаÑÑего
ÑаÑпÑоÑÑÑанение неÑвободнÑÑ
пÑогÑамм по иÑ
"
"обÑÑнÑм каналам, и неÑвободнÑе клÑкÑÑ
поÑÑавлÑÑÑÑÑ Ñ Ð¸Ñ
ÑдÑом, Linux."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-"ÐмеÑÑо ÑÑого неÑвободного диÑÑÑибÑÑива
полÑзÑйÑеÑÑ <a href=\"/distros/free-"
-"distros.html#for-pc\">Parabola</a> или <a
href=\"https://www.hyperbola.info/?";
-"gnu-free-stros-page\">Hyperbola</a>, ÑвободнÑми
диÑÑÑибÑÑивами на его оÑнове."
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -170,10 +161,20 @@
"ÑвÑзаннÑÑ
Ñ Ð²Ñ
ождением в него
неÑвободнÑÑ
пÑогÑамм."
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"Рего главном Ð¼ÐµÐ½Ñ ÐµÑÑÑ Ð¿ÑнкÑ
“УÑÑановка неÑвободнÑÑ
пÑогÑамм”, "
@@ -207,10 +208,27 @@
# type: Content of: <p>
#. type: Content of: <p>
+# | Debian's Social Contract states the goal of making Debian entirely free
+# | software, and Debian conscientiously keeps nonfree software out of the
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily find
+# | these nonfree packages by browsing Debian's online package database and
+# | its wiki.
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -269,16 +287,6 @@
"Ðики Debian ÑодеÑÐ¶Ð¸Ñ Ñакже ÑÑÑаниÑÑ Ð¾Ð±
ÑÑÑановке неÑвободнÑÑ
пÑогÑамм Ð´Ð»Ñ "
"пеÑиÑеÑийнÑÑ
ÑÑÑÑойÑÑв."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-"ÐмеÑÑо ÑÑого неÑвободного диÑÑÑибÑÑива
полÑзÑйÑеÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ÑвободнÑÑ
"
-"диÑÑÑибÑÑивов на базе его: <a
href=\"/distros/free-distros.html#for-pc"
-"\">gNewSense</a>, и <a
href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-
# type: Content of: <h3>
#. type: Content of: <h3>
msgid "Fedora"
@@ -340,13 +348,34 @@
# type: Content of: <p>
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"Mandriva Ñакже пÑÐµÐ´Ð»Ð°Ð³Ð°ÐµÑ Ð½ÐµÑвободнÑе
пÑогÑÐ°Ð¼Ð¼Ñ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ \n"
"оÑобÑÑ
Ñазделов."
# type: Content of: <h3>
#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+# type: Content of: <h3>
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -473,8 +502,22 @@
# type: Content of: <p>
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -543,18 +586,6 @@
"дÑÑгим, нам ÑледÑÐµÑ Ð¾ÑвеÑгаÑÑ ÐµÐ³Ð¾. Ðднако
ÑÑо не вÑ
Ð¾Ð´Ð¸Ñ Ð² ÑÑÑеÑÑво вопÑоÑа "
"об Ubuntu как диÑÑÑибÑÑиве GNU/Linux."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-"ÐмеÑÑо ÑÑого неÑвободного диÑÑÑибÑÑива
полÑзÑйÑеÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ÑвободнÑÑ
"
-"диÑÑÑибÑÑивов на базе его: <a
href=\"/distros/free-distros.html#for-pc"
-"\">Dyne:bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</"
-"a> и <a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "ÐекоÑоÑÑе дÑÑгие диÑÑÑибÑÑивÑ"
@@ -777,6 +808,39 @@
msgstr "Ðбновлено:"
#~ msgid ""
+#~ "Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
+#~ "html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-";
+#~ "free-stros-page\">Hyperbola</a>, free distros which are made from it."
+#~ msgstr ""
+#~ "ÐмеÑÑо ÑÑого неÑвободного диÑÑÑибÑÑива
полÑзÑйÑеÑÑ <a href=\"/distros/"
+#~ "free-distros.html#for-pc\">Parabola</a> или <a href=\"https://www.";
+#~ "hyperbola.info/?gnu-free-stros-page\">Hyperbola</a>, ÑвободнÑми "
+#~ "диÑÑÑибÑÑивами на его оÑнове."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a>, and <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">PureOS</a>."
+#~ msgstr ""
+#~ "ÐмеÑÑо ÑÑого неÑвободного диÑÑÑибÑÑива
полÑзÑйÑеÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ÑвободнÑÑ
"
+#~ "диÑÑÑибÑÑивов на базе его: <a
href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a>, и <a
href=\"/distros/free-distros.html#for-pc\">PureOS</"
+#~ "a>."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
+#~ "bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, "
+#~ "and <a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
+#~ msgstr ""
+#~ "ÐмеÑÑо ÑÑого неÑвободного диÑÑÑибÑÑива
полÑзÑйÑеÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ÑвободнÑÑ
"
+#~ "диÑÑÑибÑÑивов на базе его: <a
href=\"/distros/free-distros.html#for-pc"
+#~ "\">Dyne:bolic</a>, <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">Trisquel</a> и <a href=\"/distros/free-distros.html#for-pc\">Ututo S</"
+#~ "a>."
+
+#~ msgid ""
#~ "Previous releases of Debian included nonfree blobs with Linux, the "
#~ "kernel. With the release of Debian 6.0 (“squeeze”) in "
#~ "February 2011, these blobs have been moved out of the main distribution "
Index: common-distros.tr.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.tr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- common-distros.tr.po 31 Jul 2019 11:31:08 -0000 1.3
+++ common-distros.tr.po 14 Aug 2019 19:58:57 -0000 1.4
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2019-04-05 06:17+0300\n"
"Last-Translator: Umutcan OLÄUN <address@hidden>\n"
"Language-Team: Turkish <address@hidden>\n"
@@ -127,16 +127,6 @@
"ile birlikte geliyor. Arch ayrıca özgür olmayan yazılımları normal
kanalları "
"üzerinden daÄıtmama konusunda da bir politikaya sahip deÄildir."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-"Bu özgür olmayan daÄıtım yerine ondan yapılan özgür daÄıtım <a
href=\"/"
-"distros/free-distros.html#for-pc\">Parabolaâyı</a> veya <a href=\"https://";
-"www.hyperbola.info/?gnu-free-stros-page\">Hyperbola</a> kullanın."
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -152,10 +142,16 @@
"özgür olmayan yazılımın eklenmesiyle Canaima kusurludur."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"Ana menüsü, tüm özgür olmayan sürücüleri -gerekli olmayanları bile-
yükleyen "
@@ -183,10 +179,19 @@
msgstr "Debian GNU/Linux"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -240,16 +245,6 @@
"Debianâın wikiâsinde özgür olmayan ürün yazılımı (firmware)
kurulumu ile "
"ilgili sayfalar bulunur."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-"Bu özgür olmayan daÄıtım yerine ondan yapılan özgür daÄıtımlardan
birini "
-"kullanın: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a> ve <a "
-"href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -301,10 +296,27 @@
"License) kapsamında yayımlanan yazılımların dâhil edilmesine izin
verir."
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr "Mandriva ayrıca özel depolar üzerinden özgür olmayan yazılım
saÄlar."
#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -419,8 +431,16 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -486,18 +506,6 @@
"gösterdikten sonra her zaman onu reddetmeliyiz ancak bu, Ubuntu hakkında
bir "
"GNU/Linux daÄıtımı olarak önemli bir konu deÄildir."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-"Bu özgür olmayan daÄıtım yerine ondan yapılan özgür daÄıtımlardan
birini "
-"kullanın: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, <a "
-"href=\"/distros/free-distros.html#for-pc\">Trisquel</a> ve <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "DiÄer Bazı DaÄıtımlar"
@@ -710,3 +718,33 @@
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Son Güncelleme:"
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
+#~ "html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-";
+#~ "free-stros-page\">Hyperbola</a>, free distros which are made from it."
+#~ msgstr ""
+#~ "Bu özgür olmayan daÄıtım yerine ondan yapılan özgür daÄıtım <a
href=\"/"
+#~ "distros/free-distros.html#for-pc\">Parabolaâyı</a> veya <a
href=\"https://";
+#~ "www.hyperbola.info/?gnu-free-stros-page\">Hyperbola</a> kullanın."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a>, and <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">PureOS</a>."
+#~ msgstr ""
+#~ "Bu özgür olmayan daÄıtım yerine ondan yapılan özgür
daÄıtımlardan birini "
+#~ "kullanın: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a> ve "
+#~ "<a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
+#~ "bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, "
+#~ "and <a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
+#~ msgstr ""
+#~ "Bu özgür olmayan daÄıtım yerine ondan yapılan özgür
daÄıtımlardan birini "
+#~ "kullanın: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
+#~ "<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a> ve <a href=\"/"
+#~ "distros/free-distros.html#for-pc\">Ututo S</a>."
Index: common-distros.uk-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.uk-diff.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- common-distros.uk-diff.html 31 Jul 2019 11:31:08 -0000 1.11
+++ common-distros.uk-diff.html 14 Aug 2019 19:58:57 -0000 1.12
@@ -69,12 +69,12 @@
<span class="removed"><del><strong>about what</strong></del></span> <span
class="inserted"><ins><em>against distributing nonfree</em></ins></span>
software <span class="removed"><del><strong>can be
included,</strong></del></span> <span class="inserted"><ins><em>through
their normal channels,</em></ins></span> and nonfree blobs are shipped with
their kernel, <span class="removed"><del><strong>Linux. Arch also has no
policy about not distributing</strong></del></span>
<span class="inserted"><ins><em>Linux.</p>
-
+<!--
<p>Instead of this</em></ins></span> nonfree <span
class="removed"><del><strong>software through their normal
channels.</p></strong></del></span> <span
class="inserted"><ins><em>distribution, use <a
href="/distros/free-distros.html#for-pc">Parabola</a> or <a
href="https://www.hyperbola.info/?gnu-free-stros-page">Hyperbola</a>,
-free distros which are made from it.</p></em></ins></span>
-
+free distros which are made from it.</p>
+--></em></ins></span>
<h3 id="Canaima">Canaima</h3>
<p>Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -83,7 +83,7 @@
<p>Its main menu has an option, “Install nonfree
software”, which installs all the nonfree drivers (even the
-ones that are not necessary). The distro also provides blobs for the
+ones that are not necessary). The distro also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> blobs for the
kernel, Linux, and invites installing nonfree applications including
Flash Player.</p>
@@ -99,7 +99,7 @@
<p>Debian's Social Contract states the goal of making Debian entirely
free software, and Debian conscientiously keeps nonfree software out
-of the official Debian system. However, Debian also provides a
+of the official Debian system. However, Debian also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> a
repository of nonfree software. According to the project, this
software is “not part of the Debian system,” but the
repository is hosted on many of the project's main servers, and people
@@ -131,12 +131,12 @@
<p>Debian's wiki <span class="inserted"><ins><em>also</em></ins></span>
includes pages about installing nonfree
firmware.</p>
<!-- https://wiki.debian.org/ATIProprietary -->
-
-<span class="inserted"><ins><em><p>Instead of this nonfree distribution,
use one of the free distros
+<span class="inserted"><ins><em><!--
+<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">gNewSense</a>, and <a
-href="/distros/free-distros.html#for-pc">PureOS</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">PureOS</a>.</p>
+--></em></ins></span>
<h3 id="Fedora">Fedora</h3>
<p>Fedora does have a clear policy about what can be included in the
@@ -159,10 +159,17 @@
permits software released under the original Artistic License to be
included, even though that's a nonfree license.</p>
-<p>Mandriva also provides nonfree software through dedicated
+<p>Mandriva also <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>ships</em></ins></span> nonfree software through
dedicated
repositories.</p>
-<h3 id="Mint">Mint GNU/Linux</h3>
+<h3 <span class="inserted"><ins><em>id="Manjaro">Manjaro
GNU/Linux</h3>
+
+<p>Manjaro includes nonfree software through its normal channels, and
ships
+nonfree blobs with its kernel, Linux. It includes a proprietary office
+suite and proprietary games with DRM. The distro also recommends the
+installation of nonfree drivers.</p>
+
+<h3</em></ins></span> id="Mint">Mint GNU/Linux</h3>
<p>Mint does not have a policy against including nonfree software, it
includes nonfree binary blobs in drivers packaged with the kernel, and
@@ -216,7 +223,7 @@
<h3 id="Ubuntu">Ubuntu GNU/Linux</h3>
-<p>Ubuntu provides specific repositories of nonfree software, and
+<p>Ubuntu <span
class="removed"><del><strong>provides</strong></del></span> <span
class="inserted"><ins><em>maintains</em></ins></span> specific repositories of
nonfree software, and
Canonical expressly promotes and recommends nonfree software under the
Ubuntu name in some of their distribution channels. Ubuntu offers the
option to install only free packages, which means it also offers the
@@ -245,13 +252,13 @@
reference to someone else's use of the term, we should always reject
it. However, that is not a substantive issue about Ubuntu as a
GNU/Linux distribution.</p>
-
-<span class="inserted"><ins><em><p>Instead of this nonfree distribution,
use one of the free distros
+<span class="inserted"><ins><em><!--
+<p>Instead of this nonfree distribution, use one of the free distros
which are made from it: <a
href="/distros/free-distros.html#for-pc">Dyne:bolic</a>, <a
href="/distros/free-distros.html#for-pc">Trisquel</a>, and <a
-href="/distros/free-distros.html#for-pc">Ututo
S</a>.</p></em></ins></span>
-
+href="/distros/free-distros.html#for-pc">Ututo S</a>.</p>
+--></em></ins></span>
<h2>Some Other Distros</h2>
<p>Here we discuss some well-known or significant non-GNU/Linux system
@@ -384,7 +391,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/07/31 11:31:08 $
+$Date: 2019/08/14 19:58:57 $
<!-- timestamp end -->
</p>
</div>
Index: common-distros.uk.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.uk.po,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- common-distros.uk.po 31 Jul 2019 11:31:08 -0000 1.62
+++ common-distros.uk.po 14 Aug 2019 19:58:57 -0000 1.63
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2018-05-23 21:03+0200\n"
"Last-Translator: Andriy Bandura <address@hidden>\n"
"Language-Team: Ukrainian <>\n"
@@ -130,13 +130,6 @@
"normal channels, and nonfree blobs are shipped with their kernel, Linux."
msgstr ""
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -153,10 +146,16 @@
"пÑогÑам."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"У його Ð³Ð¾Ð»Ð¾Ð²Ð½Ð¾Ð¼Ñ Ð¼ÐµÐ½Ñ Ñ Ð¿ÑнкÑ
“ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½ÐµÐ²ÑлÑниÑ
пÑогÑам”, "
@@ -185,10 +184,19 @@
msgstr "Debian GNU/Linux"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -237,13 +245,6 @@
"ÐÑÐºÑ Debian мÑÑÑиÑÑ ÑÑоÑÑнки пÑо
вÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½ÐµÐ²ÑлÑниÑ
пÑогÑам Ð´Ð»Ñ "
"пеÑиÑеÑÑйниÑ
пÑиÑÑÑоÑв."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -295,11 +296,28 @@
"Ð¥ÑдожнÑÐ¾Ñ Ð»ÑÑензÑÑÑ, незважаÑÑи на Ñе, Ñо
Ñе - невÑлÑна лÑÑензÑÑ."
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr ""
"Mandriva Ñакож пÑопонÑÑ Ð½ÐµÐ²ÑлÑÐ½Ñ Ð¿ÑогÑами з
Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ Ð¾ÑобливиÑ
ÑепозиÑоÑÑÑв."
#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -416,8 +434,16 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -493,14 +519,6 @@
"вÑдкидаÑи його. Ðднак Ñе не ÑÑоÑÑÑÑÑÑÑ
ÑÑÑÑ Ð¿Ð¸ÑÐ°Ð½Ð½Ñ Ð¿Ñо Ubuntu Ñк "
"диÑÑÑибÑÑив GNU/Linux."
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "ÐеÑÐºÑ ÑнÑÑ Ð´Ð¸ÑÑÑибÑÑиви"
Index: common-distros.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-cn.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- common-distros.zh-cn.po 3 Aug 2019 13:58:19 -0000 1.29
+++ common-distros.zh-cn.po 14 Aug 2019 19:58:57 -0000 1.30
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2019-08-03 21:16+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: 2019-08-14 19:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -116,16 +117,6 @@
"Arch没æå对éè¿å
¶æ£å¸¸æ¸ éåå¸éèªç±è½¯ä»¶çæ¿çï¼èä¸å
¶å
æ ¸ï¼Linuxï¼ä¹å¸¦æéèª"
"ç±çblobsã"
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-"请ä¸è¦ä½¿ç¨è¿ä¸ªéèªç±çåè¡çï¼è¯·ä½¿ç¨<a
href=\"/distros/free-distros.html#for-"
-"pc\">Parabola</a>æ<a href=\"https://www.hyperbola.info/?gnu-free-stros-page";
-"\">Hyperbola</a>ï¼è¿æ¯ä»Archæ¹é çèªç±åè¡çã"
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -140,10 +131,16 @@
"ä½è®¡å令人èµèµï¼Canaimaå´é误å°å
å«äºéèªç±è½¯ä»¶ã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"å
¶ä¸»èå带æä¸ä¸ªé项３å®è£
éèªç±è½¯ä»¶”ï¼å®ä¼å®è£
ææçéèªç±é©±å¨"
@@ -170,10 +167,19 @@
msgstr "Debian GNU/Linux"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -220,16 +226,6 @@
msgid "Debian's wiki also includes pages about installing nonfree firmware."
msgstr "Debian ç wiki å«æå
³äºå®è£
éèªç±åºä»¶ç页é¢ã"
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-"请ä¸è¦ä½¿ç¨è¿ä¸ªéèªç±çåè¡çï¼è¯·ä½¿ç¨ç±å®æ¹é
çèªç±åè¡çï¼<a href=\"/distros/"
-"free-distros.html#for-pc\">gNewSense</a>å<a href=\"/distros/free-distros."
-"html#for-pc\">PureOS</a>ã"
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -274,10 +270,27 @@
"软件ï¼å°½ç®¡è¯¥è®¸å¯è¯æ¯éèªç±è®¸å¯è¯ã"
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr "Mandrivaè¿æä¾ä¸ç¨çéèªç±è½¯ä»¶åºã"
#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -380,8 +393,16 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -438,18 +459,6 @@
"æ¡æ¶ã使ç¨è¯¥æ¯è¯æ¯æ害çï¼æ²¡æä¾å¤ï¼æ以é¤äºå¼ç¨å«äººå¯¹è¯¥æ¯è¯ç使ç¨ä¹å¤ï¼æ们"
"åºè¯¥æç»ä½¿ç¨å®ãä½æ¯ï¼è¿å¹¶ä¸æ¯Ubuntuä½ä¸ºä¸ä¸ªGNU/Linuxåè¡çç主è¦é®é¢ã"
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-"请ä¸è¦ä½¿ç¨è¿ä¸ªéèªç±çåè¡çï¼è¯·ä½¿ç¨ç±å®æ¹é
çèªç±åè¡çï¼<a href=\"/distros/"
-"free-distros.html#for-pc\">Dyne:bolic</a>ã<a href=\"/distros/free-distros."
-"html#for-pc\">Trisquel</a>å<a href=\"/distros/free-distros.html#for-pc"
-"\">Ututo S</a>ã"
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "å
¶ä»åè¡ç"
@@ -646,6 +655,36 @@
msgstr "æåæ´æ°ï¼"
#~ msgid ""
+#~ "Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
+#~ "html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-";
+#~ "free-stros-page\">Hyperbola</a>, free distros which are made from it."
+#~ msgstr ""
+#~ "请ä¸è¦ä½¿ç¨è¿ä¸ªéèªç±çåè¡çï¼è¯·ä½¿ç¨<a
href=\"/distros/free-distros."
+#~ "html#for-pc\">Parabola</a>æ<a href=\"https://www.hyperbola.info/?gnu-";
+#~ "free-stros-page\">Hyperbola</a>ï¼è¿æ¯ä»Archæ¹é çèªç±åè¡çã"
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a>, and <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">PureOS</a>."
+#~ msgstr ""
+#~ "请ä¸è¦ä½¿ç¨è¿ä¸ªéèªç±çåè¡çï¼è¯·ä½¿ç¨ç±å®æ¹é
çèªç±åè¡çï¼<a href=\"/"
+#~ "distros/free-distros.html#for-pc\">gNewSense</a>å<a
href=\"/distros/free-"
+#~ "distros.html#for-pc\">PureOS</a>ã"
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
+#~ "bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, "
+#~ "and <a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
+#~ msgstr ""
+#~ "请ä¸è¦ä½¿ç¨è¿ä¸ªéèªç±çåè¡çï¼è¯·ä½¿ç¨ç±å®æ¹é
çèªç±åè¡çï¼<a href=\"/"
+#~ "distros/free-distros.html#for-pc\">Dyne:bolic</a>ã<a href=\"/distros/"
+#~ "free-distros.html#for-pc\">Trisquel</a>å<a href=\"/distros/free-distros."
+#~ "html#for-pc\">Ututo S</a>ã"
+
+#~ msgid ""
#~ "Previous releases of Debian included nonfree blobs with Linux, the "
#~ "kernel. With the release of Debian 6.0 (“squeeze”) in "
#~ "February 2011, these blobs have been moved out of the main distribution "
Index: common-distros.zh-tw.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-tw.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- common-distros.zh-tw.po 1 Aug 2019 07:58:31 -0000 1.36
+++ common-distros.zh-tw.po 14 Aug 2019 19:58:57 -0000 1.37
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2019-07-31 11:25+0000\n"
+"POT-Creation-Date: 2019-08-14 19:55+0000\n"
"PO-Revision-Date: 2019-01-12 23:58+0800\n"
"Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
"Language-Team: Traditional Chinese <address@hidden>\n"
@@ -119,16 +119,6 @@
"Arch
並æ²ææ¿çåå°ä»¥ä¸è¬ç®¡éæ£å¸éèªç±è»é«ï¼èä¸ä»åç
Linux æ ¸å¿éæéèªç±"
"ç blobã"
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
-"html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-free-";
-"stros-page\">Hyperbola</a>, free distros which are made from it."
-msgstr ""
-"è«æ¹ç¨ <a href=\"/distros/free-distros.html#for-pc\">Parabola</a> æ<a
href="
-"\"https://www.hyperbola.info/?gnu-free-stros-page\";>Hyperbola</a>
ä¾å代éå¥"
-"éèªç±çæ£å¸çãéå
©å¥æ¯ä»¥ Arch åæçèªç±æ£å¸çã"
-
#. type: Content of: <h3>
msgid "Canaima"
msgstr "Canaima"
@@ -143,10 +133,20 @@
"令人欽佩ï¼Canaima ç缺é·æ¯æ¶ééèªç±è»é«ã"
#. type: Content of: <p>
+# | Its main menu has an option, “Install nonfree software”, which
+# | installs all the nonfree drivers (even the ones that are not necessary).
+# | The distro also [-provides-] {+ships+} blobs for the kernel, Linux, and
+# | invites installing nonfree applications including Flash Player.
+#, fuzzy
+#| msgid ""
+#| "Its main menu has an option, “Install nonfree software”, "
+#| "which installs all the nonfree drivers (even the ones that are not "
+#| "necessary). The distro also provides blobs for the kernel, Linux, and "
+#| "invites installing nonfree applications including Flash Player."
msgid ""
"Its main menu has an option, “Install nonfree software”, which "
"installs all the nonfree drivers (even the ones that are not necessary). The "
-"distro also provides blobs for the kernel, Linux, and invites installing "
+"distro also ships blobs for the kernel, Linux, and invites installing "
"nonfree applications including Flash Player."
msgstr ""
"å®ç主è¦é¸å®æåãå®è£éèªç±è»é«ãé¸é
å¯å®è£éèªç±çé©
åç¨å¼ï¼å³ä½¿éäºé©
åç¨"
@@ -173,10 +173,27 @@
msgstr "Debian GNU/Linux"
#. type: Content of: <p>
+# | Debian's Social Contract states the goal of making Debian entirely free
+# | software, and Debian conscientiously keeps nonfree software out of the
+# | official Debian system. However, Debian also [-provides-] {+maintains+} a
+# | repository of nonfree software. According to the project, this software
+# | is “not part of the Debian system,” but the repository is
+# | hosted on many of the project's main servers, and people can readily find
+# | these nonfree packages by browsing Debian's online package database and
+# | its wiki.
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract states the goal of making Debian entirely free "
+#| "software, and Debian conscientiously keeps nonfree software out of the "
+#| "official Debian system. However, Debian also provides a repository of "
+#| "nonfree software. According to the project, this software is “not "
+#| "part of the Debian system,” but the repository is hosted on many of "
+#| "the project's main servers, and people can readily find these nonfree "
+#| "packages by browsing Debian's online package database and its wiki."
msgid ""
"Debian's Social Contract states the goal of making Debian entirely free "
"software, and Debian conscientiously keeps nonfree software out of the "
-"official Debian system. However, Debian also provides a repository of "
+"official Debian system. However, Debian also maintains a repository of "
"nonfree software. According to the project, this software is “not "
"part of the Debian system,” but the repository is hosted on many of "
"the project's main servers, and people can readily find these nonfree "
@@ -226,16 +243,6 @@
msgid "Debian's wiki also includes pages about installing nonfree firmware."
msgstr "Debian ç wiki é é¢ä¸è¼æå®è£éèªç±éé«çç¸éè³è¨ã"
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">gNewSense</a>, "
-"and <a href=\"/distros/free-distros.html#for-pc\">PureOS</a>."
-msgstr ""
-"è«æ¹ç¨å
¶ä»ä»¥ Debian
åæçèªç±æ£å¸çï¼ä¾å代éå¥éèªç±çæ£å¸çï¼<a href=\"/"
-"distros/free-distros.html#for-pc\">gNewSense</a> æ <a href=\"/distros/free-"
-"distros.html#for-pc\">PureOS</a>ã"
-
#. type: Content of: <h3>
msgid "Fedora"
msgstr "Fedora"
@@ -281,10 +288,30 @@
"Artistic License ææ¬çè»é«ï¼å³ä¾¿é£æ¯ç¨®éèªç±è»é«ææ¬ã"
#. type: Content of: <p>
-msgid "Mandriva also provides nonfree software through dedicated repositories."
+# | Mandriva also [-provides-] {+ships+} nonfree software through dedicated
+# | repositories.
+#, fuzzy
+#| msgid ""
+#| "Mandriva also provides nonfree software through dedicated repositories."
+msgid "Mandriva also ships nonfree software through dedicated repositories."
msgstr "Mandriva ä¹ééå°ç¨çè»é«åº«æä¾éèªç±è»é«ã"
#. type: Content of: <h3>
+# | [-Mandriva-]{+Manjaro+} GNU/Linux
+#, fuzzy
+#| msgid "Mandriva GNU/Linux"
+msgid "Manjaro GNU/Linux"
+msgstr "Mandriva GNU/Linux"
+
+#. type: Content of: <p>
+msgid ""
+"Manjaro includes nonfree software through its normal channels, and ships "
+"nonfree blobs with its kernel, Linux. It includes a proprietary office suite "
+"and proprietary games with DRM. The distro also recommends the installation "
+"of nonfree drivers."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "Mint GNU/Linux"
msgstr "Mint GNU/Linux"
@@ -388,8 +415,22 @@
msgstr "Ubuntu GNU/Linux"
#. type: Content of: <p>
+# | Ubuntu [-provides-] {+maintains+} specific repositories of nonfree
+# | software, and Canonical expressly promotes and recommends nonfree software
+# | under the Ubuntu name in some of their distribution channels. Ubuntu
+# | offers the option to install only free packages, which means it also
+# | offers the option to install nonfree packages too. In addition, the
+# | version of Linux, the kernel, included in Ubuntu contains firmware blobs.
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels. Ubuntu offers the option to "
+#| "install only free packages, which means it also offers the option to "
+#| "install nonfree packages too. In addition, the version of Linux, the "
+#| "kernel, included in Ubuntu contains firmware blobs."
msgid ""
-"Ubuntu provides specific repositories of nonfree software, and Canonical "
+"Ubuntu maintains specific repositories of nonfree software, and Canonical "
"expressly promotes and recommends nonfree software under the Ubuntu name in "
"some of their distribution channels. Ubuntu offers the option to install "
"only free packages, which means it also offers the option to install nonfree "
@@ -448,18 +489,6 @@
"使ç¨è©²è©èªä¹å¤ï¼æåèªèº«å¿
ç¶æçµä½¿ç¨éåè©èªãä¸éï¼å°æ¼ Ubuntu èº«çº GNU/"
"Linux æ£å¸çé件äºèè¨ï¼é實質ä¸ä¸ç®æ¯é大åé¡ã"
-#. type: Content of: <p>
-msgid ""
-"Instead of this nonfree distribution, use one of the free distros which are "
-"made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>, "
-"<a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, and <a href=\"/"
-"distros/free-distros.html#for-pc\">Ututo S</a>."
-msgstr ""
-"è«æ¹ç¨å
¶ä»ä»¥ Ubuntu
åæçèªç±æ£å¸çï¼ä¾å代éå¥éèªç±çæ£å¸çï¼<a href=\"/"
-"distros/free-distros.html#for-pc\">Dyne:bolic</a>ã<a href=\"/distros/free-"
-"distros.html#for-pc\">Trisquel</a>ã<a
href=\"/distros/free-distros.html#for-"
-"pc\">Ututo S</a>ã"
-
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "ä¸äºå
¶ä»æ£å¸ç"
@@ -664,6 +693,36 @@
msgstr "æ´æ°æé︰"
#~ msgid ""
+#~ "Instead of this nonfree distribution, use <a href=\"/distros/free-distros."
+#~ "html#for-pc\">Parabola</a> or <a href=\"https://www.hyperbola.info/?gnu-";
+#~ "free-stros-page\">Hyperbola</a>, free distros which are made from it."
+#~ msgstr ""
+#~ "è«æ¹ç¨ <a href=\"/distros/free-distros.html#for-pc\">Parabola</a> æ<a
"
+#~ "href=\"https://www.hyperbola.info/?gnu-free-stros-page\";>Hyperbola</a> ä¾"
+#~ "å代éå¥éèªç±çæ£å¸çãéå
©å¥æ¯ä»¥ Arch
åæçèªç±æ£å¸çã"
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">gNewSense</a>, and <a href=\"/distros/free-distros.html#for-pc"
+#~ "\">PureOS</a>."
+#~ msgstr ""
+#~ "è«æ¹ç¨å
¶ä»ä»¥ Debian
åæçèªç±æ£å¸çï¼ä¾å代éå¥éèªç±çæ£å¸çï¼<a href="
+#~ "\"/distros/free-distros.html#for-pc\">gNewSense</a> æ <a
href=\"/distros/"
+#~ "free-distros.html#for-pc\">PureOS</a>ã"
+
+#~ msgid ""
+#~ "Instead of this nonfree distribution, use one of the free distros which "
+#~ "are made from it: <a href=\"/distros/free-distros.html#for-pc\">Dyne:"
+#~ "bolic</a>, <a href=\"/distros/free-distros.html#for-pc\">Trisquel</a>, "
+#~ "and <a href=\"/distros/free-distros.html#for-pc\">Ututo S</a>."
+#~ msgstr ""
+#~ "è«æ¹ç¨å
¶ä»ä»¥ Ubuntu
åæçèªç±æ£å¸çï¼ä¾å代éå¥éèªç±çæ£å¸çï¼<a href="
+#~ "\"/distros/free-distros.html#for-pc\">Dyne:bolic</a>ã<a href=\"/distros/"
+#~ "free-distros.html#for-pc\">Trisquel</a>ã<a href=\"/distros/free-distros."
+#~ "html#for-pc\">Ututo S</a>ã"
+
+#~ msgid ""
#~ "Previous releases of Debian included nonfree blobs with Linux, the "
#~ "kernel. With the release of Debian 6.0 (“squeeze”) in "
#~ "February 2011, these blobs have been moved out of the main distribution "
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/distros/po common-distros.ar-diff.html comm...,
GNUN <=