summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--doc/apt-cache.8.xml6
-rw-r--r--doc/apt-get.8.xml2
-rw-r--r--doc/apt.82
-rw-r--r--doc/apt_preferences.5.xml2
-rw-r--r--doc/design.sgml2
-rw-r--r--doc/dpkg-tech.sgml2
-rw-r--r--doc/files.sgml2
-rw-r--r--doc/guide.sgml2
-rw-r--r--doc/method.sgml2
-rw-r--r--doc/offline.sgml2
-rw-r--r--doc/po/apt-doc.pot49
-rw-r--r--doc/po/de.po22
-rw-r--r--doc/po/es.po28
-rw-r--r--doc/po/fr.po26
-rw-r--r--doc/po/it.po18
-rw-r--r--doc/po/ja.po32
-rw-r--r--doc/po/pl.po26
-rw-r--r--doc/po/pt.po30
-rw-r--r--doc/po/pt_BR.po18
-rw-r--r--doc/sources.list.5.xml2
21 files changed, 143 insertions, 138 deletions
diff --git a/debian/changelog b/debian/changelog
index a87456bdb..443aedf62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
apt (0.9.6) UNRELEASED; urgency=low
+ [ David Kalnischkies ]
* apt-pkg/contrib/fileutl.cc:
- dup() given compressed fd in OpenDescriptor if AutoClose
is disabled as otherwise gzclose() and co will close it
@@ -8,6 +9,11 @@ apt (0.9.6) UNRELEASED; urgency=low
markup here and there (no real text change)
- use docbook DTD 4.5 instead of 4.2 to have valid docs
+ [ Justin B Rye ]
+ * doc/*.xml:
+ - remove 'GNU/Linux' from 'Debian systems' strings as Debian
+ has more systems than just GNU/Linux nowadays
+
-- David Kalnischkies <kalnischkies@gmail.com> Tue, 22 May 2012 18:13:19 +0200
apt (0.9.5) unstable; urgency=low
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index ab97ebe3f..cf6303268 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -100,20 +100,20 @@ Reverse Provides:
<listitem><para><literal>Pure virtual packages</literal> is the number of packages that exist
only as a virtual package name; that is, packages only "provide" the
virtual package name, and no package actually uses the name. For
- instance, "mail-transport-agent" in the Debian GNU/Linux system is a
+ instance, "mail-transport-agent" in the Debian system is a
pure virtual package; several packages provide "mail-transport-agent",
but there is no package named "mail-transport-agent".</para>
</listitem>
<listitem><para><literal>Single virtual packages</literal> is the number of packages with only
one package providing a particular virtual package. For example, in the
- Debian GNU/Linux system, "X11-text-viewer" is a virtual package, but
+ Debian system, "X11-text-viewer" is a virtual package, but
only one package, xless, provides "X11-text-viewer".</para>
</listitem>
<listitem><para><literal>Mixed virtual packages</literal> is the number of packages that either
provide a particular virtual package or have the virtual package name
- as the package name. For instance, in the Debian GNU/Linux system,
+ as the package name. For instance, in the Debian system,
"debconf" is both an actual package, and provided by the debconf-tiny
package.</para>
</listitem>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 0568036aa..620d22106 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -98,7 +98,7 @@
<para><literal>install</literal> is followed by one or more
packages desired for installation or upgrading.
Each package is a package name, not a fully qualified
- filename (for instance, in a Debian GNU/Linux system,
+ filename (for instance, in a Debian system,
libc6 would be the argument provided, not
<literal>libc6_1.9.6-2.deb</literal>). All packages required
by the package(s) specified for installation will also
diff --git a/doc/apt.8 b/doc/apt.8
index e7ca8c44b..d84a3b4dd 100644
--- a/doc/apt.8
+++ b/doc/apt.8
@@ -14,7 +14,7 @@
.\" License along with APT; if not, write to the Free Software
.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
.\" 02111-1307 USA
-.TH apt 8 "16 June 1998" "Debian GNU/Linux"
+.TH apt 8 "16 June 1998" "Debian"
.SH NAME
apt \- Advanced Package Tool
.SH SYNOPSIS
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index a6f68dfe7..1f953029e 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -460,7 +460,7 @@ Pin: release n=&testing-codename;
<varlistentry>
<term>the <literal>Version:</literal> line</term>
<listitem><simpara>names the release version. For example, the
-packages in the tree might belong to Debian GNU/Linux release
+packages in the tree might belong to Debian release
version 3.0. Note that there is normally no version number for the
<literal>testing</literal> and <literal>unstable</literal> distributions because they
have not been released yet. Specifying this in the APT preferences
diff --git a/doc/design.sgml b/doc/design.sgml
index 0fd708162..1ddf49fd8 100644
--- a/doc/design.sgml
+++ b/doc/design.sgml
@@ -31,7 +31,7 @@
<p>
You should have received a copy of the GNU General Public
- License with your Debian GNU/Linux system, in
+ License with your Debian system, in
<tt>/usr/share/common-licenses/GPL</tt>, or with the
<prgn/debiandoc-sgml/ source package as the file
<tt>COPYING</tt>. If not, write to the Free Software
diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
index 7c6e023dd..d377a35dc 100644
--- a/doc/dpkg-tech.sgml
+++ b/doc/dpkg-tech.sgml
@@ -21,7 +21,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
<p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
/usr/share/common-licenses/GPL for the full license.
</copyright>
diff --git a/doc/files.sgml b/doc/files.sgml
index 2d0ae4a44..974b73fb0 100644
--- a/doc/files.sgml
+++ b/doc/files.sgml
@@ -21,7 +21,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
<p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
/usr/share/common-licenses/GPL for the full license.
</copyright>
diff --git a/doc/guide.sgml b/doc/guide.sgml
index ff727f6ca..8d762b6f3 100644
--- a/doc/guide.sgml
+++ b/doc/guide.sgml
@@ -19,7 +19,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
<p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
/usr/share/common-licenses/GPL for the full license.
</copyright>
diff --git a/doc/method.sgml b/doc/method.sgml
index d71ef02ea..3bee47d3a 100644
--- a/doc/method.sgml
+++ b/doc/method.sgml
@@ -20,7 +20,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
<p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
/usr/share/common-licenses/GPL for the full license.
</copyright>
diff --git a/doc/offline.sgml b/doc/offline.sgml
index e7ede14de..659ca3147 100644
--- a/doc/offline.sgml
+++ b/doc/offline.sgml
@@ -20,7 +20,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
<p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
/usr/share/common-licenses/GPL for the full license.
</copyright>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 38689d28d..2b559bb98 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.9.4\n"
+"Project-Id-Version: apt-doc 0.9.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-23 17:06+0300\n"
+"POT-Creation-Date: 2012-05-24 15:04+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,7 +32,7 @@ msgstr ""
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
+msgid "Debian"
msgstr ""
#. type: SH
@@ -724,9 +724,9 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
-"package; several packages provide \"mail-transport-agent\", but there is no "
-"package named \"mail-transport-agent\"."
+"\"mail-transport-agent\" in the Debian system is a pure virtual package; "
+"several packages provide \"mail-transport-agent\", but there is no package "
+"named \"mail-transport-agent\"."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -734,8 +734,8 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
-"one package, xless, provides \"X11-text-viewer\"."
+"Debian system, \"X11-text-viewer\" is a virtual package, but only one "
+"package, xless, provides \"X11-text-viewer\"."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -743,9 +743,8 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, "
-"\"debconf\" is both an actual package, and provided by the debconf-tiny "
-"package."
+"as the package name. For instance, in the Debian system, \"debconf\" is both "
+"an actual package, and provided by the debconf-tiny package."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -2112,15 +2111,15 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
-"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
-"packages required by the package(s) specified for installation will also be "
-"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
-"file is used to locate the desired packages. If a hyphen is appended to the "
-"package name (with no intervening space), the identified package will be "
-"removed if it is installed. Similarly a plus sign can be used to designate "
-"a package to install. These latter features may be used to override "
-"decisions made by apt-get's conflict resolution system."
+"qualified filename (for instance, in a Debian system, libc6 would be the "
+"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
+"required by the package(s) specified for installation will also be retrieved "
+"and installed. The <filename>/etc/apt/sources.list</filename> file is used "
+"to locate the desired packages. If a hyphen is appended to the package name "
+"(with no intervening space), the identified package will be removed if it is "
+"installed. Similarly a plus sign can be used to designate a package to "
+"install. These latter features may be used to override decisions made by "
+"apt-get's conflict resolution system."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5144,8 +5143,8 @@ msgstr ""
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
-"no version number for the <literal>testing</literal> and "
+"belong to Debian release version 3.0. Note that there is normally no "
+"version number for the <literal>testing</literal> and "
"<literal>unstable</literal> distributions because they have not been "
"released yet. Specifying this in the APT preferences file would require one "
"of the following lines."
@@ -5458,8 +5457,8 @@ msgstr ""
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system. "
-"This control file is <filename>/etc/apt/sources.list</filename>."
+"documents only the packaging system used by the Debian system. This control "
+"file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -5861,7 +5860,7 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file "
+"For more details, on Debian systems, see the file "
"/usr/share/common-licenses/GPL for the full license."
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 0442c4475..a60122053 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -31,8 +31,8 @@ msgstr "16. Juni 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
#. type: SH
#: apt.8:18
@@ -907,7 +907,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -923,7 +923,7 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>Single virtual packages</literal> ist die Anzahl der Pakete mit nur "
@@ -936,7 +936,7 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>Mixed virtual packages</literal> ist die Anzahl der Pakete, die "
@@ -2835,7 +2835,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -2848,7 +2848,7 @@ msgstr ""
"<literal>install</literal> wird gefolgt von einem oder mehreren gewünschten "
"Paketen zur Installation oder zum Upgrade. Jedes Paket ist ein Paketname, "
"kein vollständig zusammengesetzter Dateiname (zum Beispiel wäre in einem "
-"»Debian GNU/Linux«-System libc6 das bereitgestellte Argument, nicht "
+"»Debian«-System libc6 das bereitgestellte Argument, nicht "
"<literal>libc6_1.9.6-2.deb</literal>). Alle von den zur Installation "
"angegebenen Paketen benötigten Pakete werden zusätzlich heruntergeladen und "
"installiert. Die <filename>/etc/apt/sources.list</filename>-Datei wird "
@@ -7263,13 +7263,13 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
msgstr ""
"benennt die Release-Version. Die Pakete im Baum könnten zum Beispiel zur "
-"Debian GNU/Linux-Release-Version 3.0 gehören. Beachten Sie, dass es "
+"Debian-Release-Version 3.0 gehören. Beachten Sie, dass es "
"normalerweise keine Versionsnummer für <literal>testing</literal>- und "
"<literal>unstable</literal>-Distributionen gibt, weil sie noch nicht "
"veröffentlicht wurden. Diese in der APT-Einstellungsdatei anzugeben würde "
@@ -7704,7 +7704,7 @@ msgstr "Paketressourcenliste für APT"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"Die Paketquellenliste wird benutzt, um Archive des Paketverteilungssystems, "
@@ -8267,7 +8267,7 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
"Siehe für weitere Details auf Debian-Systemen die Datei /usr/share/common-"
diff --git a/doc/po/es.po b/doc/po/es.po
index 3c4392cfa..9cc753e34 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -63,8 +63,8 @@ msgstr "16 de Junio de 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
#. type: SH
#: apt.8:18
@@ -964,7 +964,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -981,12 +981,12 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>Paquetes virtuales únicos</literal> es el número de paquetes con un "
"único paquete que proporciona un paquete virtual en concreto. Por ejemplo, "
-"en un sistema Debian GNU/Linux, «X11-text-viewer» es un paquete virtual, "
+"en un sistema Debian, «X11-text-viewer» es un paquete virtual, "
"pero sólo un paquete, xless, proporciona «X11-text-viewer»."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -994,13 +994,13 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>Paquetes virtuales mixtos</literal> es el número de paquetes que o "
"bien proporcionan un determinado paquete virtual o tienen el mismo nombre "
"como paquete virtual y como paquete normal. Por ejemplo, en un sistema "
-"Debian GNU/Linux debconf es a la vez un paquete normal, y lo proporciona el "
+"Debian debconf es a la vez un paquete normal, y lo proporciona el "
"paquete debconf-tiny."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -2888,7 +2888,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -7366,13 +7366,13 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
msgstr ""
"nombra la versión de la publicación. Por ejemplo, los paquetes en el árbol "
-"pueden pertenecer a la versión 3.0 de Debian GNU/Linux. Observe que, "
+"pueden pertenecer a la versión 3.0 de Debian. Observe que, "
"generalmente, <literal>testing</literal> y <literal>unstable</literal> no "
"tienen una versión asignada porque no se han publicado. Para especificar una "
"preferencia de acuerdo con este parámetro tendrá que poner una de las "
@@ -7807,13 +7807,13 @@ msgstr "Lista de los repositorios de paquetes para APT"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"La lista de los repositorios de paquetes se usa para ubicar los archivos de "
"Debian del sistema de distribución de paquetes en uso en el sistema. A día "
"de hoy, esta página del manual documenta sólo el sistema de paquetes que usa "
-"Debian GNU/Linux. Este fichero de control está ubicado en <filename>/etc/apt/"
+"Debian. Este fichero de control está ubicado en <filename>/etc/apt/"
"sources.list</filename>"
#. type: Content of: <refentry><refsect1><para>
@@ -8373,10 +8373,10 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
-"Para más detalles acerca de sistemas Debian GNU/Linux y la licencia "
+"Para más detalles acerca de sistemas Debian y la licencia "
"completa, consulte el fichero «/usr/share/common-licenses/GPL»."
#. type: <heading></heading>
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 63961bc5e..0ce59e03b 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -36,8 +36,8 @@ msgstr "16 Juin 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
#. type: SH
#: apt.8:18
@@ -916,7 +916,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -933,12 +933,12 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>Single virtual packages</literal> est le nombre de paquets virtuels "
"qui ne peuvent être remplis que par un seul paquet. Par exemple, au sein du "
-"système Debian GNU/Linux, « X11-text-viewer » est un paquet virtuel ; seul "
+"système Debian, « X11-text-viewer » est un paquet virtuel ; seul "
"le paquet « xless » remplit « X11-text-viewer »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -946,12 +946,12 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>Mixed virtual packages</literal> est le nombre de paquets qui "
"remplissent un paquet virtuel particulier ou dont le nom est un nom de "
-"paquet virtuel. Par exemple, au sein du système Debian GNU/Linux, "
+"paquet virtuel. Par exemple, au sein du système Debian, "
"« debconf » est un paquet réel et il est aussi fourni par « debconf-tiny »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -2850,7 +2850,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -2862,7 +2862,7 @@ msgid ""
msgstr ""
"La commande <literal>install</literal> est suivie par un ou plusieurs "
"paquets à installer. Chaque paquet est un nom de paquet ; ce n'est pas un "
-"nom complet de fichier (par exemple, dans un système Debian GNU/Linux, on "
+"nom complet de fichier (par exemple, dans un système Debian, on "
"indiquera libc6 et non pas <literal>libc6_1.9.6-2.deb</literal>). Tous les "
"paquets requis par le(s) paquet(s) que l'on veut installer sont aussi "
"récupérés et installés. Le fichier <filename>/etc/apt/sources.list</"
@@ -7334,13 +7334,13 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
msgstr ""
"indique la version de la distribution. Par exemple, les paquets dans les "
-"répertoires peuvent appartenir à la distribution Debian GNU/Linux version "
+"répertoires peuvent appartenir à la distribution Debian version "
"3.0. Il n'y a pas de numéro de version pour les distributions "
"<literal>testing</literal> et <literal>unstable</literal> car elles n'ont "
"pas encore été publiées. Indiquer cette valeur dans le fichier des "
@@ -7769,7 +7769,7 @@ msgstr "Liste des sources de paquets"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"La liste des sources de paquets indique où trouver les archives du système "
@@ -8306,7 +8306,7 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
"Les détails complets de cette licence sont, sur les systèmes Debian GNU/"
diff --git a/doc/po/it.po b/doc/po/it.po
index e1a537db0..83689c9bb 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -34,7 +34,7 @@ msgstr ""
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
+msgid "Debian"
msgstr ""
#. type: SH
@@ -695,7 +695,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -705,7 +705,7 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
@@ -714,7 +714,7 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
@@ -2082,7 +2082,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -5091,7 +5091,7 @@ msgstr ""
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
@@ -5402,7 +5402,7 @@ msgstr ""
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
@@ -5811,10 +5811,10 @@ msgstr ""
#: guide.sgml:24 offline.sgml:25
#, fuzzy
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
-"Per ulteriori dettagli sui sistemi GNU/Linux si veda il testo completo della "
+"Per ulteriori dettagli sui sistemi si veda il testo completo della "
"licenza nel file /usr/share/common-licenses/GPL."
#. type: <heading></heading>
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 80e5aec80..8f722a83e 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -33,8 +33,8 @@ msgstr "16 June 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
# type: SH
#. type: SH
@@ -952,13 +952,13 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
"<literal>純粋仮想パッケージ</literal>は、仮想パッケージ名としてのみ存在する"
"パッケージ (仮想パッケージ名のみを「提供」し、実際にはいかなるパッケージもそ"
-"の名称を持たない) の数を表します。例えば、Debian GNU/Linux システムでは "
+"の名称を持たない) の数を表します。例えば、Debian システムでは "
"\"mail-transport-agent\" は純粋仮想パッケージです。\"mail-transport-agent\" "
"を提供するパッケージはいくつもありますが、\"mail-transport-agent\" という名称"
"のパッケージはありません。"
@@ -969,11 +969,11 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>単一仮想パッケージ</literal>は、特定の仮想パッケージ名を提供するパッ"
-"ケージが、ただ一つの場合の数を表します。例えば、Debian GNU/Linux システムで"
+"ケージが、ただ一つの場合の数を表します。例えば、Debian システムで"
"は、\"X11-text-viewer\" は仮想パッケージですが、\"X11-text-viewer\" を提供す"
"るパッケージは、xless パッケージのみということです。"
@@ -983,12 +983,12 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>複合仮想パッケージ</literal>は、その仮想パッケージ名を提供するパッ"
"ケージが複数あるか、またパッケージ名と同じ仮想パッケージ名を持つパッケージ数"
-"を表します。例えば、Debian GNU/Linux システムでは、debconf は実際のパッケージ"
+"を表します。例えば、Debian システムでは、debconf は実際のパッケージ"
"名でもありますが、debconf-tiny によって提供もされています。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -2917,7 +2917,7 @@ msgid ""
"realize that state (for instance, the removal of old and the installation of "
"new packages)."
msgstr ""
-"<literal>dselect-upgrade</literal> は、伝統的な Debian GNU/Linux パッケージ管"
+"<literal>dselect-upgrade</literal> は、伝統的な Debian パッケージ管"
"理フロントエンドの &dselect; と共に使用されます。<literal>dselect-upgrade</"
"literal> は、&dselect; で作られた利用可能パッケージの<literal>Status</"
"literal> フィールドの変更を追跡し、その状態を反映させるのに必要なアクションを"
@@ -2954,7 +2954,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -2966,7 +2966,7 @@ msgid ""
msgstr ""
"<literal>install</literal> の後には、インストールするパッケージを 1 つ以上指"
"定します。指定するパッケージは、完全なファイル名ではなくパッケージ名です (例"
-"えば Debian GNU/Linux システムでは、<literal>libc6_1.9.6-2.deb</literal> では"
+"えば Debian システムでは、<literal>libc6_1.9.6-2.deb</literal> では"
"なく libc6 を引数として与えます)。インストールするよう指定したすべてのパッ"
"ケージに対し、取得・インストールを行います。<filename>/etc/apt/sources.list</"
"filename> ファイルを、要求するパッケージの場所を特定するのに使用します。パッ"
@@ -7267,7 +7267,7 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
@@ -7729,11 +7729,11 @@ msgstr "APT 用パッケージリソースリスト"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"このパッケージリソースリストは、システムで使用するパッケージの保管場所を特定"
-"するのに使用されます。今回このマニュアルページには、Debian GNU/Linux システム"
+"するのに使用されます。今回このマニュアルページには、Debian システム"
"で使用するパッケージシステムについてのみ記述します。この制御ファイルは、"
"<filename>/etc/apt/sources.list</filename> にあります。"
@@ -8298,10 +8298,10 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
#. type: <heading></heading>
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 22c0a2029..54240d172 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -35,8 +35,8 @@ msgstr "16 czerwca 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
#. type: SH
#: apt.8:18
@@ -949,7 +949,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -966,12 +966,12 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>Pojedyncze pakiety wirtualne (Single virtual packages)</literal> - "
"liczba pakietów, dla których istnieje tylko jeden pakiet, który dostarcza "
-"danego pakietu wirtualnego. Na przykład, w systemie Debian GNU/Linux \"X11-"
+"danego pakietu wirtualnego. Na przykład, w systemie Debian \"X11-"
"text-viewer\" jest pakietem wirtualnym, ale tylko jeden pakiet - xless - "
"dostarcza \"X11-text-viewer\"."
@@ -981,13 +981,13 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>Mieszane pakiety wirtualne (Mixed virtual packages)</literal> - "
"liczba pakietów, które albo dostarczają poszczególnych pakietów wirtualnych, "
"albo nazywają się tak, jak nazwa pakietu wirtualnego. Na przykład w "
-"systemie Debian GNU/Linux \"debconf\" jest zarówno zwykłym pakietem, jak i "
+"systemie Debian \"debconf\" jest zarówno zwykłym pakietem, jak i "
"jest pakietem dostarczanym przez pakiet debconf-tiny."
#
@@ -2752,7 +2752,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -2765,7 +2765,7 @@ msgstr ""
"Po <literal>install</literal> musi występować nazwa jednego lub więcej "
"pakietów przeznaczonych do zainstalowania. Każdy argument jest nazwą "
"pakietu, a nie pełną nazwą pliku, w którym się znajduje (na przykład w "
-"systemie Debian GNU/Linux, tym argumentem byłoby libc6, a nie "
+"systemie Debian, tym argumentem byłoby libc6, a nie "
"<literal>libc6_1.9.6-2.deb</literal>). Wszystkie pakiety, które są "
"potrzebne do zainstalowania żądanego(-ych) pakietu(-ów), będą także "
"ściągnięte i zainstalowane. Plik <filename>/etc/apt/sources.list</filename> "
@@ -6274,7 +6274,7 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
@@ -6602,12 +6602,12 @@ msgstr "Lista zasobów pakietów dla APT"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"Lista zasobów pakietów jest używana do zlokalizowania archiwów pakietów "
"używanego systemu dystrybucji pakietów. Obecnie ta strona podręcznika "
-"opisuje tylko system pakietów używany w systemie Debian GNU/Linux. Plikiem "
+"opisuje tylko system pakietów używany w systemie Debian. Plikiem "
"kontrolnym jest <filename>/etc/apt/sources.list</filename>."
#. type: Content of: <refentry><refsect1><para>
@@ -7171,7 +7171,7 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
"Więcej szczegółów można uzyskać, przeglądając plik zawierający pełen tekst "
diff --git a/doc/po/pt.po b/doc/po/pt.po
index e197c3bcb..a239eac99 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -33,8 +33,8 @@ msgstr "16 Junho 1998"
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
#. type: SH
#: apt.8:18
@@ -917,14 +917,14 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
"<literal>Pure virtual packages</literal> é o número de pacotes que existem "
"apenas como nome de pacote virtual; isto é, os pacotes apenas "
"\"disponibilizam\" o nome do pacote virtual, e nenhum pacote usa realmente o "
-"nome. Por exemplo, \"mail-transport-agent\" no sistema Debian GNU/Linux é um "
+"nome. Por exemplo, \"mail-transport-agent\" no sistema Debian é um "
"pacote puramente virtual; vários pacotes disponibilizam \"mail-transport-"
"agent\", mas não existe um existe um pacote chamado \"mail-transport-agent\"."
@@ -933,12 +933,12 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
"<literal>Single virtual packages</literal> é o número de pacotes com apenas "
"um pacote a disponibilizar um pacote virtual particular. Por exemplo, no "
-"sistema Debian GNU/Linux, \"X11-text-viewer\" é um pacote virtual, mas "
+"sistema Debian, \"X11-text-viewer\" é um pacote virtual, mas "
"apenas um pacote, xless, disponibiliza \"X11-text-viewer\"."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -946,12 +946,12 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
"<literal>Mixed virtual packages</literal> é o número de pacotes que ou "
"disponibilizam um pacote virtual particular ou têm o nome de pacote virtual "
-"como o nome de pacote. Por exemplo, no sistema Debian GNU/Linux, \"debconf\" "
+"como o nome de pacote. Por exemplo, no sistema Debian, \"debconf\" "
"é tanto um pacote real, como também disponibilizado pelo pacote debconf-tiny."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -2845,7 +2845,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -7332,13 +7332,13 @@ msgstr "Pin: release n=&testing-codename;\n"
#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
msgstr ""
"nomeia a versão de lançamento. Por exemplo, os pacotes na árvore podem "
-"pertencer ao lançamento de Debian GNU/Linux versão 3.0. Note que não há "
+"pertencer ao lançamento de Debian versão 3.0. Note que não há "
"normalmente um número de versão para as distribuições <literal>testing</"
"literal> e <literal>unstable</literal>. porque ainda não foram lançadas. "
"Especificar isto no ficheiro de preferências do APT irá requerer uma das "
@@ -7770,12 +7770,12 @@ msgstr "Lista de recursos de pacote para APT"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
"A lista de recursos de pacote é usada para localizar arquivos do sistema de "
"distribuição de pacotes usado no sistema. Neste momento, este manual "
-"documenta apenas o sistema de pacotes usado pelo sistema Debian GNU/Linux. "
+"documenta apenas o sistema de pacotes usado pelo sistema Debian. "
"Este ficheiro de controle é <filename>/etc/apt/sources.list</filename>."
#. type: Content of: <refentry><refsect1><para>
@@ -8336,10 +8336,10 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
-"Para mais detalhes em sistemas Debian GNU/Linux, veja o ficheiro /usr/share/"
+"Para mais detalhes em sistemas Debian, veja o ficheiro /usr/share/"
"common-licenses/GPL para a licença completa."
#. type: <heading></heading>
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index f523d75ee..764e5e1b5 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -34,7 +34,7 @@ msgstr ""
#. type: TH
#: apt.8:17
#, no-wrap
-msgid "Debian GNU/Linux"
+msgid "Debian"
msgstr ""
#. type: SH
@@ -736,7 +736,7 @@ msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
+"\"mail-transport-agent\" in the Debian system is a pure virtual "
"package; several packages provide \"mail-transport-agent\", but there is no "
"package named \"mail-transport-agent\"."
msgstr ""
@@ -746,7 +746,7 @@ msgstr ""
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only "
"one package, xless, provides \"X11-text-viewer\"."
msgstr ""
@@ -755,7 +755,7 @@ msgstr ""
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
+"as the package name. For instance, in the Debian system, \"debconf"
"\" is both an actual package, and provided by the debconf-tiny package."
msgstr ""
@@ -2141,7 +2141,7 @@ msgstr ""
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
+"qualified filename (for instance, in a Debian system, libc6 would "
"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
"packages required by the package(s) specified for installation will also be "
"retrieved and installed. The <filename>/etc/apt/sources.list</filename> "
@@ -5432,13 +5432,13 @@ msgstr ""
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
+"belong to Debian release version 3.0. Note that there is normally "
"no version number for the <literal>testing</literal> and <literal>unstable</"
"literal> distributions because they have not been released yet. Specifying "
"this in the APT preferences file would require one of the following lines."
msgstr ""
"dá nome a versão da distribuição. Por exemplo, os pacote na àrvore podem "
-"pertencer a distribuição Debian GNU/Linux versão 3.0. Note que normalmente "
+"pertencer a distribuição Debian versão 3.0. Note que normalmente "
"não existe número de versão para as distribuições <literal>testing</literal> "
"e <literal>unstable</literal> devido as mesmas não terem sido lançadas "
"ainda. Especificar isso no arquivo de preferências do APT iria requerer uma "
@@ -5884,7 +5884,7 @@ msgstr ""
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system. "
+"documents only the packaging system used by the Debian system. "
"This control file is <filename>/etc/apt/sources.list</filename>."
msgstr ""
@@ -6284,7 +6284,7 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"For more details, on Debian systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 77bdd49b9..93bbb478d 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -36,7 +36,7 @@
<refsect1><title>Description</title>
<para>The package resource list is used to locate archives of the package
distribution system in use on the system. At this time, this manual page
- documents only the packaging system used by the Debian GNU/Linux system.
+ documents only the packaging system used by the Debian system.
This control file is <filename>/etc/apt/sources.list</filename>.</para>
<para>The source list is designed to support any number of active sources and a