www-commits
[Top][All Lists]
Advanced

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

www/distros common-distros.de.html common-distr...


From: GNUN
Subject: www/distros common-distros.de.html common-distr...
Date: Wed, 24 Feb 2021 09:29:53 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/02/24 09:29:53

Modified files:
        distros        : common-distros.de.html 
                         common-distros.zh-tw.html 
        distros/po     : common-distros.de-diff.html 
                         common-distros.zh-tw-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.de.html?cvsroot=www&r1=1.83&r2=1.84
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.zh-tw.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.de-diff.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-tw-diff.html?cvsroot=www&r1=1.8&r2=1.9

Patches:
Index: common-distros.de.html
===================================================================
RCS file: /web/www/www/distros/common-distros.de.html,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- common-distros.de.html      20 Nov 2019 12:30:58 -0000      1.83
+++ common-distros.de.html      24 Feb 2021 14:29:52 -0000      1.84
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/distros/common-distros.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/distros/po/common-distros.de.po">
+ https://www.gnu.org/distros/po/common-distros.de.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/distros/common-distros.html"
+ --><!--#set var="DIFF_FILE" value="/distros/po/common-distros.de-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2020-12-26" --><!--#set 
var="ENGLISH_PAGE" value="/distros/common-distros.en.html" -->
 
 <!--#include virtual="/server/header.de.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -12,6 +17,7 @@
 
 <!--#include virtual="/distros/po/common-distros.translist" -->
 <!--#include virtual="/server/banner.de.html" -->
+<!--#include virtual="/server/outdated.de.html" -->
 <h2>Warum andere Systeme nicht befürwortet werden</h2>
 
 <!--#include virtual="/licenses/fsf-licensing.de.html" -->
@@ -426,7 +432,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Letzte Änderung:
 
-$Date: 2019/11/20 12:30:58 $
+$Date: 2021/02/24 14:29:52 $
 
 <!-- timestamp end -->
 </p>

Index: common-distros.zh-tw.html
===================================================================
RCS file: /web/www/www/distros/common-distros.zh-tw.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- common-distros.zh-tw.html   8 Feb 2020 09:59:57 -0000       1.18
+++ common-distros.zh-tw.html   24 Feb 2021 14:29:52 -0000      1.19
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/distros/common-distros.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/distros/po/common-distros.zh-tw.po">
+ https://www.gnu.org/distros/po/common-distros.zh-tw.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/distros/common-distros.html"
+ --><!--#set var="DIFF_FILE" value="/distros/po/common-distros.zh-tw-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2020-12-26" --><!--#set 
var="ENGLISH_PAGE" value="/distros/common-distros.en.html" -->
 
 <!--#include virtual="/server/header.zh-tw.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -11,6 +16,7 @@
 
 <!--#include virtual="/distros/po/common-distros.translist" -->
 <!--#include virtual="/server/banner.zh-tw.html" -->
+<!--#include virtual="/server/outdated.zh-tw.html" -->
 <h2>解釋我們為何不讚許其他系統</h2>
 
 <!--#include virtual="/licenses/fsf-licensing.zh-tw.html" -->
@@ -290,7 +296,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2020/02/08 09:59:57 $
+$Date: 2021/02/24 14:29:52 $
 
 <!-- timestamp end -->
 </p>

Index: po/common-distros.de-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.de-diff.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/common-distros.de-diff.html      29 Sep 2019 11:29:07 -0000      1.9
+++ po/common-distros.de-diff.html      24 Feb 2021 14:29:53 -0000      1.10
@@ -68,12 +68,12 @@
 &lt;p&gt;Arch has no policy against distributing nonfree software through
 their normal channels, and nonfree blobs are shipped with their kernel,
 Linux.&lt;/p&gt;
-<span class="inserted"><ins><em>&lt;!--</em></ins></span>
+&lt;!--
 &lt;p&gt;Instead of this nonfree distribution, use &lt;a
 href="/distros/free-distros.html#for-pc"&gt;Parabola&lt;/a&gt; or &lt;a
 href="https://www.hyperbola.info/?gnu-free-stros-page"&gt;Hyperbola&lt;/a&gt;,
 free distros which are made from it.&lt;/p&gt;
-<span class="inserted"><ins><em>--&gt;</em></ins></span>
+--&gt;
 &lt;h3 id="Canaima"&gt;Canaima&lt;/h3&gt;
 
 &lt;p&gt;Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -82,7 +82,7 @@
 
 &lt;p&gt;Its main menu has an option, &ldquo;Install nonfree
 software&rdquo;, which installs all the nonfree drivers (even 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
+ones that are not necessary). The distro also ships blobs for the
 kernel, Linux, and invites installing nonfree applications including
 Flash Player.&lt;/p&gt;
 
@@ -98,7 +98,7 @@
 
 &lt;p&gt;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 <span 
class="removed"><del><strong>provides</strong></del></span> <span 
class="inserted"><ins><em>maintains</em></ins></span> a
+of the official Debian system.  However, Debian also maintains a
 repository of nonfree software.  According to the project, this
 software is &ldquo;not part of the Debian system,&rdquo; but the
 repository is hosted on many of the project's main servers, and people
@@ -116,20 +116,20 @@
 is referenced in the documentation on debian.org, and the installer in
 some cases recommends them for the peripherals on the machine.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;In addition, some of the free 
programs that are officially part of
+&lt;p&gt;In addition, some of the free programs that are officially part of
 Debian invite the user to install some nonfree programs.
 Specifically, the Debian versions of Firefox and Chromium suggest
-nonfree plug-ins to install into them.&lt;/p&gt;</em></ins></span>
+nonfree plug-ins to install into them.&lt;/p&gt;
 
-&lt;p&gt;Debian's wiki <span class="inserted"><ins><em>also</em></ins></span> 
includes pages about installing nonfree
+&lt;p&gt;Debian's wiki also includes pages about installing nonfree
 firmware.&lt;/p&gt;
 &lt;!-- https://wiki.debian.org/ATIProprietary --&gt;
-<span class="inserted"><ins><em>&lt;!--</em></ins></span>
+&lt;!--
 &lt;p&gt;Instead of this nonfree distribution, use one of the free distros
 which are made from it: &lt;a
 href="/distros/free-distros.html#for-pc"&gt;gNewSense&lt;/a&gt;, and &lt;a
 href="/distros/free-distros.html#for-pc"&gt;PureOS&lt;/a&gt;.&lt;/p&gt;
-<span class="inserted"><ins><em>--&gt;</em></ins></span>
+--&gt;
 &lt;h3 id="Fedora"&gt;Fedora&lt;/h3&gt;
 
 &lt;p&gt;Fedora does have a clear policy about what can be included in the
@@ -152,17 +152,17 @@
 permits software released under the original Artistic License to be
 included, even though that's a nonfree license.&lt;/p&gt;
 
-&lt;p&gt;Mandriva also <span 
class="removed"><del><strong>provides</strong></del></span> <span 
class="inserted"><ins><em>ships</em></ins></span> nonfree software through 
dedicated
+&lt;p&gt;Mandriva also ships nonfree software through dedicated
 repositories.&lt;/p&gt;
 
-&lt;h3 <span class="inserted"><ins><em>id="Manjaro"&gt;Manjaro 
GNU/Linux&lt;/h3&gt;
+&lt;h3 id="Manjaro"&gt;Manjaro GNU/Linux&lt;/h3&gt;
 
 &lt;p&gt;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.&lt;/p&gt;
 
-&lt;h3</em></ins></span> id="Mint"&gt;Mint GNU/Linux&lt;/h3&gt;
+&lt;h3 id="Mint"&gt;Mint GNU/Linux&lt;/h3&gt;
 
 &lt;p&gt;Mint does not have a policy against including nonfree software, it
 includes nonfree binary blobs in drivers packaged with the kernel, and
@@ -199,7 +199,8 @@
 &lt;p&gt;SteamOS, a version of GNU/Linux to be distributed by Valve. It
 contains proprietary software, including the Steam client and
 proprietary drivers. Steam uses &lt;a
-href="https://www.defectivebydesign.org/what_is_drm"&gt;Digital
+<span 
class="removed"><del><strong>href="https://www.defectivebydesign.org/what_is_drm"&gt;Digital</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management"&gt;Digital</em></ins></span>
 Restrictions Management (DRM)&lt;/a&gt; to impose restrictions on the
 software it distributes, as well as on the proprietary software it
 promotes via the Steam store.&lt;/p&gt;
@@ -216,7 +217,7 @@
 
 &lt;h3 id="Ubuntu"&gt;Ubuntu GNU/Linux&lt;/h3&gt;
 
-&lt;p&gt;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
+&lt;p&gt;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
@@ -245,13 +246,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.&lt;/p&gt;
-<span class="inserted"><ins><em>&lt;!--</em></ins></span>
+&lt;!--
 &lt;p&gt;Instead of this nonfree distribution, use one of the free distros
 which are made from it: &lt;a
 href="/distros/free-distros.html#for-pc"&gt;Dyne:bolic&lt;/a&gt;, &lt;a
 href="/distros/free-distros.html#for-pc"&gt;Trisquel&lt;/a&gt;, and &lt;a
 href="/distros/free-distros.html#for-pc"&gt;Ututo S&lt;/a&gt;.&lt;/p&gt;
-<span class="inserted"><ins><em>--&gt;</em></ins></span>
+--&gt;
 &lt;h2&gt;Some Other Distros&lt;/h2&gt;
 
 &lt;p&gt;Here we discuss some well-known or significant non-GNU/Linux system
@@ -358,7 +359,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, 2016, 2017, 2018, <span 
class="removed"><del><strong>2019</strong></del></span> <span 
class="inserted"><ins><em>2019, 2020</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -368,7 +369,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2019/09/29 11:29:07 $
+$Date: 2021/02/24 14:29:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/common-distros.zh-tw-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-tw-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/common-distros.zh-tw-diff.html   29 Sep 2019 11:29:07 -0000      1.8
+++ po/common-distros.zh-tw-diff.html   24 Feb 2021 14:29:53 -0000      1.9
@@ -68,12 +68,12 @@
 &lt;p&gt;Arch has no policy against distributing nonfree software through
 their normal channels, and nonfree blobs are shipped with their kernel,
 Linux.&lt;/p&gt;
-<span class="inserted"><ins><em>&lt;!--</em></ins></span>
+&lt;!--
 &lt;p&gt;Instead of this nonfree distribution, use &lt;a
 href="/distros/free-distros.html#for-pc"&gt;Parabola&lt;/a&gt; or &lt;a
 href="https://www.hyperbola.info/?gnu-free-stros-page"&gt;Hyperbola&lt;/a&gt;,
 free distros which are made from it.&lt;/p&gt;
-<span class="inserted"><ins><em>--&gt;</em></ins></span>
+--&gt;
 &lt;h3 id="Canaima"&gt;Canaima&lt;/h3&gt;
 
 &lt;p&gt;Canaima GNU/Linux is a distribution made by Venezuela's government
@@ -82,7 +82,7 @@
 
 &lt;p&gt;Its main menu has an option, &ldquo;Install nonfree
 software&rdquo;, which installs all the nonfree drivers (even 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
+ones that are not necessary). The distro also ships blobs for the
 kernel, Linux, and invites installing nonfree applications including
 Flash Player.&lt;/p&gt;
 
@@ -98,7 +98,7 @@
 
 &lt;p&gt;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 <span 
class="removed"><del><strong>provides</strong></del></span> <span 
class="inserted"><ins><em>maintains</em></ins></span> a
+of the official Debian system.  However, Debian also maintains a
 repository of nonfree software.  According to the project, this
 software is &ldquo;not part of the Debian system,&rdquo; but the
 repository is hosted on many of the project's main servers, and people
@@ -116,20 +116,20 @@
 is referenced in the documentation on debian.org, and the installer in
 some cases recommends them for the peripherals on the machine.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;In addition, some of the free 
programs that are officially part of
+&lt;p&gt;In addition, some of the free programs that are officially part of
 Debian invite the user to install some nonfree programs.
 Specifically, the Debian versions of Firefox and Chromium suggest
-nonfree plug-ins to install into them.&lt;/p&gt;</em></ins></span>
+nonfree plug-ins to install into them.&lt;/p&gt;
 
-&lt;p&gt;Debian's wiki <span class="inserted"><ins><em>also</em></ins></span> 
includes pages about installing nonfree
+&lt;p&gt;Debian's wiki also includes pages about installing nonfree
 firmware.&lt;/p&gt;
 &lt;!-- https://wiki.debian.org/ATIProprietary --&gt;
-<span class="inserted"><ins><em>&lt;!--</em></ins></span>
+&lt;!--
 &lt;p&gt;Instead of this nonfree distribution, use one of the free distros
 which are made from it: &lt;a
 href="/distros/free-distros.html#for-pc"&gt;gNewSense&lt;/a&gt;, and &lt;a
 href="/distros/free-distros.html#for-pc"&gt;PureOS&lt;/a&gt;.&lt;/p&gt;
-<span class="inserted"><ins><em>--&gt;</em></ins></span>
+--&gt;
 &lt;h3 id="Fedora"&gt;Fedora&lt;/h3&gt;
 
 &lt;p&gt;Fedora does have a clear policy about what can be included in the
@@ -152,17 +152,17 @@
 permits software released under the original Artistic License to be
 included, even though that's a nonfree license.&lt;/p&gt;
 
-&lt;p&gt;Mandriva also <span 
class="removed"><del><strong>provides</strong></del></span> <span 
class="inserted"><ins><em>ships</em></ins></span> nonfree software through 
dedicated
+&lt;p&gt;Mandriva also ships nonfree software through dedicated
 repositories.&lt;/p&gt;
 
-&lt;h3 <span class="inserted"><ins><em>id="Manjaro"&gt;Manjaro 
GNU/Linux&lt;/h3&gt;
+&lt;h3 id="Manjaro"&gt;Manjaro GNU/Linux&lt;/h3&gt;
 
 &lt;p&gt;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.&lt;/p&gt;
 
-&lt;h3</em></ins></span> id="Mint"&gt;Mint GNU/Linux&lt;/h3&gt;
+&lt;h3 id="Mint"&gt;Mint GNU/Linux&lt;/h3&gt;
 
 &lt;p&gt;Mint does not have a policy against including nonfree software, it
 includes nonfree binary blobs in drivers packaged with the kernel, and
@@ -199,7 +199,8 @@
 &lt;p&gt;SteamOS, a version of GNU/Linux to be distributed by Valve. It
 contains proprietary software, including the Steam client and
 proprietary drivers. Steam uses &lt;a
-href="https://www.defectivebydesign.org/what_is_drm"&gt;Digital
+<span 
class="removed"><del><strong>href="https://www.defectivebydesign.org/what_is_drm"&gt;Digital</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management"&gt;Digital</em></ins></span>
 Restrictions Management (DRM)&lt;/a&gt; to impose restrictions on the
 software it distributes, as well as on the proprietary software it
 promotes via the Steam store.&lt;/p&gt;
@@ -216,7 +217,7 @@
 
 &lt;h3 id="Ubuntu"&gt;Ubuntu GNU/Linux&lt;/h3&gt;
 
-&lt;p&gt;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
+&lt;p&gt;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
@@ -245,13 +246,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.&lt;/p&gt;
-<span class="inserted"><ins><em>&lt;!--</em></ins></span>
+&lt;!--
 &lt;p&gt;Instead of this nonfree distribution, use one of the free distros
 which are made from it: &lt;a
 href="/distros/free-distros.html#for-pc"&gt;Dyne:bolic&lt;/a&gt;, &lt;a
 href="/distros/free-distros.html#for-pc"&gt;Trisquel&lt;/a&gt;, and &lt;a
 href="/distros/free-distros.html#for-pc"&gt;Ututo S&lt;/a&gt;.&lt;/p&gt;
-<span class="inserted"><ins><em>--&gt;</em></ins></span>
+--&gt;
 &lt;h2&gt;Some Other Distros&lt;/h2&gt;
 
 &lt;p&gt;Here we discuss some well-known or significant non-GNU/Linux system
@@ -358,7 +359,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2014, 2015, 2016, 2017, 2018, <span 
class="removed"><del><strong>2019</strong></del></span> <span 
class="inserted"><ins><em>2019, 2020</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -368,7 +369,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2019/09/29 11:29:07 $
+$Date: 2021/02/24 14:29:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;



reply via email to

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