summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-key.8.xml10
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/examples/sources.list.in12
-rw-r--r--doc/makefile2
-rw-r--r--doc/po/apt-doc.pot16
-rw-r--r--doc/po/de.po30
-rw-r--r--doc/po/es.po30
-rw-r--r--doc/po/fr.po315
-rw-r--r--doc/po/it.po117
-rw-r--r--doc/po/ja.po30
-rw-r--r--doc/po/pl.po30
-rw-r--r--doc/po/pt.po30
-rw-r--r--doc/po/pt_BR.po14
13 files changed, 341 insertions, 297 deletions
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 6a36d08ca..9d51f4f7b 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -130,7 +130,7 @@
Update the local keyring with the archive keyring and remove from
the local keyring the archive keys which are no longer valid.
The archive keyring is shipped in the <literal>archive-keyring</literal> package of your
- distribution, e.g. the <literal>debian-archive-keyring</literal> package in Debian.
+ distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in Ubuntu.
</para>
@@ -180,12 +180,12 @@
<listitem><para>Local trust database of archive keys.</para></listitem>
</varlistentry>
- <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
- <listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
+ <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename></term>
+ <listitem><para>Keyring of Ubuntu archive trusted keys.</para></listitem>
</varlistentry>
- <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
- <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
+ <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename></term>
+ <listitem><para>Keyring of Ubuntu archive removed trusted keys.</para></listitem>
</varlistentry>
</variablelist>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 2d6e96091..631a7dcab 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,7 +213,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.7.9~exp3">
+<!ENTITY apt-product-version "0.9.7.9~exp3ubuntu1">
<!-- Codenames for debian releases -->
<!ENTITY oldstable-codename "squeeze">
diff --git a/doc/examples/sources.list.in b/doc/examples/sources.list.in
index 745e32cbe..00db2f8cd 100644
--- a/doc/examples/sources.list.in
+++ b/doc/examples/sources.list.in
@@ -1,8 +1,10 @@
# See sources.list(5) manpage for more information
# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
-deb http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
-deb http://security.debian.org &stable-codename;/updates main contrib non-free
+deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted
-# Uncomment if you want the apt-get source function to work
-#deb-src http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
-#deb-src http://security.debian.org &stable-codename;/updates main contrib non-free
+deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted
+deb-src http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted
+
+deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted
diff --git a/doc/makefile b/doc/makefile
index be8357d80..2516cd128 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -42,7 +42,7 @@ SOURCE = apt.8
include $(MANPAGE_H)
examples/sources.list: examples/sources.list.in apt-verbatim.ent
- sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
+ sed -e 's#&ubuntu-codename;#$(shell grep --max-count=1 '^<!ENTITY ubuntu-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
# Examples
SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 9ecd1ac03..b20761bf9 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.7.9~exp2\n"
+"Project-Id-Version: apt-doc 0.9.7.9~exp3ubuntu1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+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"
@@ -1620,8 +1620,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1670,22 +1670,22 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
-msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index e4c7420b4..e2052297f 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-06-25 22:49+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -2261,12 +2261,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
"entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen "
@@ -2335,24 +2342,33 @@ msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs"
diff --git a/doc/po/es.po b/doc/po/es.po
index ade98d9cb..bfdfd6372 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-07-14 12:21+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -2330,12 +2330,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"Actualiza el registro de claves local con el registro de claves del archivo "
"y elimina del registro local las claves de archivo que ya no son válidas. El "
@@ -2404,24 +2411,33 @@ msgstr "Base de datos local de las claves de confianza de archivos Debian"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Registro de las claves de confianza del archivo de Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Registro de las claves de confianza eliminadas del archivo de Debian."
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 8663c0758..5c7f521c9 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2013-04-09 07:56+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -51,8 +51,7 @@ msgid ""
msgstr ""
"<!ENTITY apt-qapage \"\n"
"\t<para>\n"
-"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>"
-"\n"
+"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>\n"
"\t</para>\n"
"\">\n"
@@ -74,8 +73,7 @@ msgstr ""
"<!-- Boiler plate Bug reporting section -->\n"
"<!ENTITY manbugs \"\n"
" <refsect1><title>Bogues</title>\n"
-" <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT<"
-"/ulink>. \n"
+" <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT</ulink>. \n"
" Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n"
" <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utiliser\n"
" la commande &reportbug;.\n"
@@ -90,8 +88,7 @@ msgid ""
"<!-- Boiler plate Author section -->\n"
"<!ENTITY manauthor \"\n"
" <refsect1><title>Author</title>\n"
-" <para>APT was written by the APT team <email>apt@packages.debian.org<"
-"/email>.\n"
+" <para>APT was written by the APT team <email>apt@packages.debian.org</email>.\n"
" </para>\n"
" </refsect1>\n"
"\">\n"
@@ -99,8 +96,7 @@ msgstr ""
"<!-- Boiler plate Author section -->\n"
"<!ENTITY manauthor \"\n"
" <refsect1><title>Author</title>\n"
-" <para>APT a été écrit par l'équipe de développement APT <email>"
-"apt@packages.debian.org</email>.\n"
+" <para>APT a été écrit par l'équipe de développement APT <email>apt@packages.debian.org</email>.\n"
" </para>\n"
" </refsect1>\n"
"\">\n"
@@ -156,12 +152,10 @@ msgid ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
-" <listitem><para>Configuration File; Specify a configuration file to use. "
-"\n"
+" <listitem><para>Configuration File; Specify a configuration file to use. \n"
" The program will read the default configuration file and then this \n"
" configuration file. If configuration settings need to be set before the\n"
-" default configuration files are parsed specify a file with the <envar>"
-"APT_CONFIG</envar>\n"
+" default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
" environment variable. See &apt-conf; for syntax information.\n"
" </para>\n"
" </listitem>\n"
@@ -170,15 +164,10 @@ msgstr ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
-" <listitem><para>Fichier de configuration ; indique le fichier de "
-"configuration à utiliser. \n"
-" Le programme lira le fichier de configuration par défaut puis le fichier "
-"indiqué ici. \n"
-" Si les réglages de configuration doivent être établis avant l'analyse "
-"des fichiers\n"
-" de configuration par défaut, un fichier peut être indiqué avec la "
-"variable d'environnement <envar>APT_CONFIG</envar>. Veuillez consulter "
-"&apt-conf; pour des informations sur la syntaxe d'utilisation. \n"
+" <listitem><para>Fichier de configuration ; indique le fichier de configuration à utiliser. \n"
+" Le programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n"
+" Si les réglages de configuration doivent être établis avant l'analyse des fichiers\n"
+" de configuration par défaut, un fichier peut être indiqué avec la variable d'environnement <envar>APT_CONFIG</envar>. Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation. \n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
@@ -203,10 +192,8 @@ msgstr ""
" <term><option>-o</option></term>\n"
" <term><option>--option</option></term>\n"
" <listitem><para>Définir une option de configuration ; permet de régler\n"
-" une option de configuration donnée. La syntaxe est <option>-o "
-"Foo::Bar=bar</option>.\n"
-" <option>-o</option> et <option>--option</option> peuvent être utilisées "
-"plusieurs fois\n"
+" une option de configuration donnée. La syntaxe est <option>-o Foo::Bar=bar</option>.\n"
+" <option>-o</option> et <option>--option</option> peuvent être utilisées plusieurs fois\n"
" pour définir des options différentes.\n"
" </para>\n"
" </listitem>\n"
@@ -220,8 +207,7 @@ msgid ""
"<!-- Should be used within the option section of the text to\n"
" put in the blurb about -h, -v, -c and -o -->\n"
"<!ENTITY apt-cmdblurb \"\n"
-" <para>All command line options may be set using the configuration file, "
-"the\n"
+" <para>All command line options may be set using the configuration file, the\n"
" descriptions indicate the configuration option to set. For boolean\n"
" options you can override the config file by using something like \n"
" <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n"
@@ -232,12 +218,9 @@ msgstr ""
"<!-- Should be used within the option section of the text to\n"
" put in the blurb about -h, -v, -c and -o -->\n"
"<!ENTITY apt-cmdblurb \"\n"
-" <para>Toutes les options de la ligne de commande peuvent être définies "
-"dans le fichier de configuration, \n"
-" les descriptions indiquant l'option de configuration concernée. Pour les "
-"options\n"
-" booléennes, vous pouvez inverser les réglages du fichiers de configuration "
-"avec \n"
+" <para>Toutes les options de la ligne de commande peuvent être définies dans le fichier de configuration, \n"
+" les descriptions indiquant l'option de configuration concernée. Pour les options\n"
+" booléennes, vous pouvez inverser les réglages du fichiers de configuration avec \n"
" <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n"
" et d'autres variantes analogues.\n"
" </para>\n"
@@ -250,15 +233,13 @@ msgid ""
"<!ENTITY file-aptconf \"\n"
" <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
" <listitem><para>APT configuration file.\n"
-" Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>"
-"\n"
+" Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-aptconf \"\n"
" <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
" <listitem><para>Fichier de configuration d'APT.\n"
-" Élément de configuration : <literal>Dir::Etc::Main</literal>.</para><"
-"/listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -267,15 +248,13 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
" <listitem><para>APT configuration file fragments.\n"
-" Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>"
-"\n"
+" Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
" <listitem><para>Fragments du fichier de configuration d'APT.\n"
-" Élément de configuration : <literal>Dir::Etc::Parts</literal>.</para><"
-"/listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -286,34 +265,28 @@ msgid ""
"<!ENTITY file-cachearchives \"\n"
" <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
" <listitem><para>Storage area for retrieved package files.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal>.</para><"
-"/listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-cachearchives \"\n"
" <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
" <listitem><para>Zone de stockage des fichiers récupérés.\n"
-" Élément de configuration : <literal>Dir::Cache::Archives</literal>.<"
-"/para></listitem>\n"
+" Élément de configuration : <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
#: apt.ent:109
#, no-wrap
msgid ""
-" <varlistentry><term><filename>&cachedir;/archives/partial/</filename><"
-"/term>\n"
+" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>"
-"partial</filename> will be implicitly appended)</para></listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
-" <varlistentry><term><filename>&cachedir;/archives/partial/</filename><"
-"/term>\n"
+" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Zone de stockage pour les paquets en transit.\n"
-" Élément de configuration : <literal>Dir::Cache::Archives</literal> (<"
-"filename>partial</filename> sera implicitement ajouté). </para></listitem>\n"
+" Élément de configuration : <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> sera implicitement ajouté). </para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -328,18 +301,14 @@ msgid ""
" i.e. a preference to get certain packages\n"
" from a separate source\n"
" or from a different version of a distribution.\n"
-" Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para><"
-"/listitem>\n"
+" Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-preferences \"\n"
" <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n"
" <listitem><para>Fichier des préférences.\n"
-" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) "
-"c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une "
-"distribution différente.\n"
-" Élément de configuration : <literal>Dir::Etc::Preferences</literal>.<"
-"/para></listitem>\n"
+" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n"
+" Élément de configuration : <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -348,15 +317,13 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
" <listitem><para>File fragments for the version preferences.\n"
-" Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para>"
-"</listitem>\n"
+" Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
" <listitem><para>Fragments de fichiers pour la préférence des versions.\n"
-" Élément de configuration : <literal>Dir::Etc::PreferencesParts</literal>"
-".</para></listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -367,35 +334,28 @@ msgid ""
"<!ENTITY file-sourceslist \"\n"
" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
" <listitem><para>Locations to fetch packages from.\n"
-" Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para><"
-"/listitem>\n"
+" Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-sourceslist \"\n"
" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
" <listitem><para>Emplacement pour la récupération des paquets.\n"
-" Élément de configuration : <literal>Dir::Etc::SourceList</literal>.<"
-"/para></listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
#: apt.ent:137
#, no-wrap
msgid ""
-" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>"
-"\n"
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
" <listitem><para>File fragments for locations to fetch packages from.\n"
-" Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para><"
-"/listitem>\n"
+" Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
-" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>"
-"\n"
-" <listitem><para>Fragments de fichiers définissant les emplacements de "
-"récupération de paquets.\n"
-" Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.<"
-"/para></listitem>\n"
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+" <listitem><para>Fragments de fichiers définissant les emplacements de récupération de paquets.\n"
+" Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -405,38 +365,30 @@ msgstr ""
msgid ""
"<!ENTITY file-statelists \"\n"
" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
-" <listitem><para>Storage area for state information for each package "
-"resource specified in\n"
+" <listitem><para>Storage area for state information for each package resource specified in\n"
" &sources-list;\n"
-" Configuration Item: <literal>Dir::State::Lists</literal>.</para><"
-"/listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-statelists \"\n"
" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
-" <listitem><para>Zone de stockage pour les informations qui concernent "
-"chaque ressource de paquet spécifiée dans &sources-list;\n"
-" Élément de configuration : <literal>Dir::State::Lists</literal>.</para><"
-"/listitem>\n"
+" <listitem><para>Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n"
+" Élément de configuration : <literal>Dir::State::Lists</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
#: apt.ent:150
#, no-wrap
msgid ""
-" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>"
-"\n"
+" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
-" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>"
-"partial</filename> will be implicitly appended)</para></listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
-" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>"
-"\n"
+" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Zone de stockage pour les informations en transit.\n"
-" Élément de configuration : <literal>Dir::State::Lists</literal> (<"
-"filename>partial</filename> sera implicitement ajouté).</para></listitem>\n"
+" Élément de configuration : <literal>Dir::State::Lists</literal> (<filename>partial</filename> sera implicitement ajouté).</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -446,18 +398,14 @@ msgstr ""
msgid ""
"<!ENTITY file-trustedgpg \"\n"
" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
-" <listitem><para>Keyring of local trusted keys, new keys will be added "
-"here.\n"
-" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para><"
-"/listitem>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-trustedgpg \"\n"
" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
-" <listitem><para>Porte-clés des clés de confiance locales. Les nouvelles "
-"clés y seront ajoutées.\n"
-" Élément de configuration: <literal>Dir::Etc::Trusted</literal>.</para><"
-"/listitem>\n"
+" <listitem><para>Porte-clés des clés de confiance locales. Les nouvelles clés y seront ajoutées.\n"
+" Élément de configuration: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -465,21 +413,16 @@ msgstr ""
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
-" <listitem><para>File fragments for the trusted keys, additional keyrings "
-"can\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
" be stored here (by other packages or the administrator).\n"
-" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para><"
-"/listitem>\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
-" <listitem><para>Fragments de fichiers pour les clés de signatures sûres. "
-"Des fichiers\n"
-" supplémentaires peuvent être placés à cet endroit (par des paquets ou "
-"par l'administrateur).\n"
-" Élément de configuration : <literal>Dir::Etc::TrustedParts</literal>.<"
-"/para></listitem>\n"
+" <listitem><para>Fragments de fichiers pour les clés de signatures sûres. Des fichiers\n"
+" supplémentaires peuvent être placés à cet endroit (par des paquets ou par l'administrateur).\n"
+" Élément de configuration : <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -488,8 +431,7 @@ msgstr ""
#, no-wrap
msgid ""
"<!ENTITY file-extended_states \"\n"
-" <varlistentry><term><filename>/var/lib/apt/extended_states</filename><"
-"/term>\n"
+" <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
" <listitem><para>Status list of auto-installed packages.\n"
" Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
" </para></listitem>\n"
@@ -497,11 +439,9 @@ msgid ""
"\">\n"
msgstr ""
"<!ENTITY file-extended_states \"\n"
-" <varlistentry><term><filename>/var/lib/apt/extended_states</filename><"
-"/term>\n"
+" <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
" <listitem><para>Liste d'état des paquets installés automatiquement.\n"
-" Élément de configuration : <literal>Dir::State::extended_states</literal>"
-".</para></listitem>\n"
+" Élément de configuration : <literal>Dir::State::extended_states</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -509,10 +449,8 @@ msgstr ""
#: apt.ent:175
#, no-wrap
msgid ""
-"<!-- TRANSLATOR: This is the section header for the following paragraphs - "
-"comparable\n"
-" to the other headers like NAME and DESCRIPTION and should therefore be "
-"uppercase. -->\n"
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
+" to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
"<!ENTITY translation-title \"TRANSLATION\">\n"
msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
@@ -520,39 +458,28 @@ msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
#: apt.ent:184
#, no-wrap
msgid ""
-"<!-- TRANSLATOR: This is a placeholder. You should write here who has "
-"contributed\n"
-" to the translation in the past, who is responsible now and maybe further "
-"information\n"
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
" specially related to your translation. -->\n"
"<!ENTITY translation-holder \"\n"
-" The english translation was done by John Doe <email>john@doe.org</email> "
-"in 2009,\n"
-" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together "
-"with the\n"
-" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>"
-".\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
"\">\n"
msgstr ""
"<!ENTITY translation-holder \"\n"
-" Jérôme Marant, Philippe Batailler, Christian Perrier <email>"
-"bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n"
-" Équipe de traduction francophone de Debian <email>"
-"debian-l10n-french@lists.debian.org</email>\n"
+" Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n"
+" Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>\n"
"\">\n"
#. type: Plain text
#: apt.ent:195
#, no-wrap
msgid ""
-"<!-- TRANSLATOR: As a translation is allowed to have 20% of "
-"untranslated/fuzzy strings\n"
-" in a shipped manpage newer/modified paragraphs will maybe appear in "
-"english in\n"
-" the generated manpage. This sentence is therefore here to tell the "
-"reader that this\n"
-" is not a mistake by the translator - obviously the target is that at "
-"least for stable\n"
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
+" the generated manpage. This sentence is therefore here to tell the reader that this\n"
+" is not a mistake by the translator - obviously the target is that at least for stable\n"
" releases this sentence is not needed. :) -->\n"
"<!ENTITY translation-english \"\n"
" Note that this translated document may contain untranslated parts.\n"
@@ -561,8 +488,7 @@ msgid ""
"\">\n"
msgstr ""
"<!ENTITY translation-english \"\n"
-" Veuillez noter que cette traduction peut contenir des parties non "
-"traduites.\n"
+" Veuillez noter que cette traduction peut contenir des parties non traduites.\n"
" Cela est volontaire, pour éviter de perdre du contenu quand la\n"
" traduction est légèrement en retard sur le contenu d'origine.\n"
"\">\n"
@@ -2331,12 +2257,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"Mettre à jour le trousseau de clés local avec le trousseau de clés de "
"l'archive et y supprimer les clés qui ne sont plus valables. Le trousseau de "
@@ -2405,24 +2338,33 @@ msgstr "Base de données locale de fiabilité des clés de l'archive."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Trousseau des clés fiables de l'archive Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
#. type: Content of: <refentry><refsect1><para>
@@ -4124,12 +4066,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
#: apt.conf.5.xml:497
#, no-wrap
-msgid ""
-"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<"
-"replaceable>Methodname</replaceable>\";"
-msgstr ""
-"Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<"
-"replaceable>NomMethode</replaceable>\";"
+msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
+msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:492
@@ -4278,10 +4216,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
#: apt.conf.5.xml:549
#, no-wrap
-msgid ""
-"Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr ""
-"Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
+msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:537
@@ -4915,7 +4851,7 @@ msgstr ""
#. TODO: provide a
#. motivating example, except I haven't a clue why you'd want
-#. to do this.
+#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.conf.5.xml:836
msgid ""
@@ -5198,7 +5134,7 @@ msgstr ""
"Le fichier &configureindex; contient un modèle de fichier montrant des "
"exemples pour toutes les options existantes."
-#. ? reading apt.conf
+#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1175
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5311,12 +5247,8 @@ msgstr "Priorités affectées par défaut"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:94
#, no-wrap
-msgid ""
-"<command>apt-get install -t testing <replaceable>some-package</replaceable><"
-"/command>\n"
-msgstr ""
-"<command>apt-get install -t testing <replaceable>paquet</replaceable><"
-"/command>\n"
+msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
+msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:97
@@ -6463,10 +6395,8 @@ msgstr "Suivre l'évolution d'une version par son nom de code"
#: apt_preferences.5.xml:654
#, no-wrap
msgid ""
-"Explanation: Uninstall or do not install any Debian-originated package "
-"versions\n"
-"Explanation: other than those in the distribution codenamed with "
-"&testing-codename; or sid\n"
+"Explanation: Uninstall or do not install any Debian-originated package versions\n"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
"Package: *\n"
"Pin: release n=&testing-codename;\n"
"Pin-Priority: 900\n"
@@ -6814,13 +6744,11 @@ msgstr "Exemples :"
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib "
-"non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
" "
msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib "
-"non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
" "
#. type: Content of: <refentry><refsect1><title>
@@ -8140,12 +8068,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
#: apt-ftparchive.1.xml:602
#, no-wrap
-msgid ""
-"<command>apt-ftparchive</command> packages <replaceable>directory<"
-"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
-msgstr ""
-"<command>apt-ftparchive</command> packages <replaceable>répertoire<"
-"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml:598
@@ -8524,8 +8448,7 @@ msgid ""
"Building Dependency Tree... Done"
msgstr ""
"# apt-get update\n"
-"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ "
-"Packages\n"
+"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
"Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
"Lecture des listes de paquets... Fait\n"
"Construction de l'arbre des dépendances... Fait"
@@ -9245,11 +9168,9 @@ msgid ""
"12 packages not fully installed or removed.\n"
"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
msgstr ""
-"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis "
-"à jour.\n"
+"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n"
"12 paquets partiellement installés ou enlevés.\n"
-"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette "
-"opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
+"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
#. type: <p></p>
#: guide.sgml:470
@@ -9319,12 +9240,10 @@ msgid ""
"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
msgstr ""
"# apt-get update\n"
-"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ "
-"Packages\n"
+"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
"Réception de :2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
"Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
-"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ "
-"Packages\n"
+"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
"Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
"11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s"
@@ -9690,8 +9609,7 @@ msgstr ""
" # apt-get update\n"
" [ APT récupère les fichiers des paquets ]\n"
" # apt-get dist-upgrade\n"
-" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine "
-"distante ]"
+" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]"
#. type: </example></p>
#: offline.sgml:149
@@ -9812,8 +9730,7 @@ msgid ""
" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
msgstr ""
" # apt-get dist-upgrade \n"
-" [ Répondre négativement à la question, pour être sûr(e) que les actions vous "
-"conviennent ]\n"
+" [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n"
" # apt-get -qq --print-uris dist-upgrade > uris\n"
" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
diff --git a/doc/po/it.po b/doc/po/it.po
index 230f85b07..59a54917e 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-12-23 18:04+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -2296,12 +2296,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"Aggiorna il portachiavi locale con il portachiavi dell'archivio e rimuove "
"dal portachiavi locale le chiavi di archivio che non sono più valide. Il "
@@ -2370,24 +2377,33 @@ msgstr "Database locale di fiducia delle chiavi archiviate."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Portachiavi delle chiavi fidate degli archivi Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Portachiavi delle chiavi fidate rimosse degli archivi Debian."
#. type: Content of: <refentry><refsect1><para>
@@ -10126,7 +10142,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
#~ " <contrib></contrib>\n"
#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
+#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+#~ "copyright>\n"
#~ " <date>28 October 2008</date>\n"
#~ " <productname>Linux</productname>\n"
#~ msgstr ""
@@ -10138,7 +10155,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
#~ " <contrib></contrib>\n"
#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
+#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+#~ "copyright>\n"
#~ " <date>28 ottobre 2008</date>\n"
#~ " <productname>Linux</productname>\n"
@@ -10224,7 +10242,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "<!-- Boiler plate Bug reporting section -->\n"
#~ "<!ENTITY manbugs \"\n"
#~ " <refsect1><title>Bugs</title>\n"
-#~ " <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>. \n"
+#~ " <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</"
+#~ "ulink>. \n"
#~ " If you wish to report a bug in APT, please see\n"
#~ " <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
#~ " &reportbug; command.\n"
@@ -10235,7 +10254,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "<!-- Sezione standard segnalazione bachi -->\n"
#~ "<!ENTITY manbugs \"\n"
#~ " <refsect1><title>Bachi</title>\n"
-#~ " <para><ulink url='http://bugs.debian.org/src:apt'>Pagina dei bachi di APT</ulink>. \n"
+#~ " <para><ulink url='http://bugs.debian.org/src:apt'>Pagina dei bachi di "
+#~ "APT</ulink>. \n"
#~ " Per segnalare un baco in APT, vedere\n"
#~ " <filename>/usr/share/doc/debian/bug-reporting.txt</filename> o il\n"
#~ " comando &reportbug;.\n"
@@ -10247,7 +10267,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " <varlistentry>\n"
#~ " <term><option>-c</option></term>\n"
#~ " <term><option>--config-file</option></term>\n"
-#~ " <listitem><para>Configuration File; Specify a configuration file to use. \n"
+#~ " <listitem><para>Configuration File; Specify a configuration file to "
+#~ "use. \n"
#~ " The program will read the default configuration file and then this \n"
#~ " configuration file. See &apt-conf; for syntax information. \n"
#~ " </para>\n"
@@ -10257,36 +10278,49 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " <varlistentry>\n"
#~ " <term><option>-c</option></term>\n"
#~ " <term><option>--config-file</option></term>\n"
-#~ " <listitem><para>File di configurazione; Specifica un file di configurazione da usare. \n"
-#~ " Il programma leggerà il file di configurazione predefinito e poi questo \n"
-#~ " file di configurazione. Vedere &apt-conf; per informazioni sulla sintassi. \n"
+#~ " <listitem><para>File di configurazione; Specifica un file di "
+#~ "configurazione da usare. \n"
+#~ " Il programma leggerà il file di configurazione predefinito e poi "
+#~ "questo \n"
+#~ " file di configurazione. Vedere &apt-conf; per informazioni sulla "
+#~ "sintassi. \n"
#~ " </para>\n"
#~ " </listitem>\n"
#~ " </varlistentry>\n"
#~ msgid ""
-#~ " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+#~ " <varlistentry><term><filename>&cachedir;/archives/partial/</"
+#~ "filename></term>\n"
#~ " <listitem><para>Storage area for package files in transit.\n"
-#~ " Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+#~ " Configuration Item: <literal>Dir::Cache::Archives</literal> "
+#~ "(implicit partial). </para></listitem>\n"
#~ " </varlistentry>\n"
#~ "\">\n"
#~ msgstr ""
-#~ " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
-#~ " <listitem><para>Area di memorizzazione per i file dei pacchetti in transito.\n"
-#~ " Voce di configurazione: <literal>Dir::Cache::Archives</literal> (partial implicito). </para></listitem>\n"
+#~ " <varlistentry><term><filename>&cachedir;/archives/partial/</"
+#~ "filename></term>\n"
+#~ " <listitem><para>Area di memorizzazione per i file dei pacchetti in "
+#~ "transito.\n"
+#~ " Voce di configurazione: <literal>Dir::Cache::Archives</literal> "
+#~ "(partial implicito). </para></listitem>\n"
#~ " </varlistentry>\n"
#~ "\">\n"
#~ msgid ""
-#~ " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+#~ " <varlistentry><term><filename>&statedir;/lists/partial/</filename></"
+#~ "term>\n"
#~ " <listitem><para>Storage area for state information in transit.\n"
-#~ " Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+#~ " Configuration Item: <literal>Dir::State::Lists</literal> (implicit "
+#~ "partial).</para></listitem>\n"
#~ " </varlistentry>\n"
#~ "\">\n"
#~ msgstr ""
-#~ " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
-#~ " <listitem><para>Area di archiviazione per le informazioni di stato in transito.\n"
-#~ " Voce di configurazione: <literal>Dir::State::Lists</literal> (partial implicito).</para></listitem>\n"
+#~ " <varlistentry><term><filename>&statedir;/lists/partial/</filename></"
+#~ "term>\n"
+#~ " <listitem><para>Area di archiviazione per le informazioni di stato "
+#~ "in transito.\n"
+#~ " Voce di configurazione: <literal>Dir::State::Lists</literal> "
+#~ "(partial implicito).</para></listitem>\n"
#~ " </varlistentry>\n"
#~ "\">\n"
@@ -10294,17 +10328,24 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgstr "<!ENTITY translation-title \"TRANSLATION\">"
#~ msgid ""
-#~ "<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
-#~ " to the translation in the past, who is responsible now and maybe further information\n"
+#~ "<!-- TRANSLATOR: This is a placeholder. You should write here who has "
+#~ "constributed\n"
+#~ " to the translation in the past, who is responsible now and maybe "
+#~ "further information\n"
#~ " specially related to your translation. -->\n"
#~ "<!ENTITY translation-holder \"\n"
-#~ " The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
-#~ " 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
-#~ " Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+#~ " The english translation was done by John Doe <email>john@doe.org</"
+#~ "email> in 2009,\n"
+#~ " 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 "
+#~ "together with the\n"
+#~ " Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</"
+#~ "email>.\n"
#~ "\">\n"
#~ msgstr ""
-#~ "<!-- TRADUTTORE: questo è un segnaposto. Qui bisogna scrivere chi ha contribuito\n"
-#~ " alla traduzione in passato, l'attuale responsabile e nel caso ulteriori informazioni\n"
+#~ "<!-- TRADUTTORE: questo è un segnaposto. Qui bisogna scrivere chi ha "
+#~ "contribuito\n"
+#~ " alla traduzione in passato, l'attuale responsabile e nel caso "
+#~ "ulteriori informazioni\n"
#~ " riguardanti in modo particolare questa traduzione. -->\n"
#~ "<!ENTITY translation-holder \"\n"
#~ " La traduzione italiana è stata fatta da Eugenia Franzoni\n"
@@ -10314,7 +10355,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "\">\n"
#~ msgid ""
-#~ "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+#~ "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/"
+#~ "fuzzy strings\n"
#~ " in a shipped manpage will maybe appear english parts. -->\n"
#~ "<!ENTITY translation-english \"\n"
#~ " Note that this translated document may contain untranslated parts.\n"
@@ -10322,11 +10364,14 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " translation is lagging behind the original content.\n"
#~ "\">\n"
#~ msgstr ""
-#~ "<!-- TRADUTTORE: poiché una traduzione può avere il 20% di stringhe non tradotte/fuzzy\n"
-#~ " in una manpage fornita è possibile che compaiano parti in inglese. -->\n"
+#~ "<!-- TRADUTTORE: poiché una traduzione può avere il 20% di stringhe non "
+#~ "tradotte/fuzzy\n"
+#~ " in una manpage fornita è possibile che compaiano parti in inglese. --"
+#~ ">\n"
#~ "<!ENTITY translation-english \"\n"
#~ " Questo documento tradotto può contenere parti non tradotte.\n"
-#~ " Ciò è fatto di proposito, per evitare di perdere contenuti quando la\n"
+#~ " Ciò è fatto di proposito, per evitare di perdere contenuti quando "
+#~ "la\n"
#~ " traduzione è più vecchia del contenuto originale.\n"
#~ "\">\n"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 1c8f4cdef..cb2ae7f48 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-08-08 07:58+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -2215,12 +2215,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ"
"イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の"
@@ -2287,24 +2294,33 @@ msgstr "アーカイブキーのローカル信頼データベースです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Debian アーカイブ信頼キーのキーリングです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "削除された Debian アーカイブ信頼キーのキーリングです。"
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 9be82667e..4388534f8 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-07-28 21:59+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -2362,12 +2362,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum i "
"usuwa z lokalnej składnicy niepoprawne klucze archiwum. Składnica kluczy "
@@ -2436,24 +2443,33 @@ msgstr "Lokalna składnica zaufanych kluczy archiwum."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Składnica zaufanych kluczy archiwum Debiana."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana."
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 6beff2223..314b5771b 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-09-03 01:53+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -2276,12 +2276,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"Actualiza o chaveiro local com o chaveiro do arquivo e remove do chaveiro "
"local as chaves de arquivo que já não são válidas. O chaveiro do arquivo é "
@@ -2349,24 +2356,33 @@ msgstr "Base de dados local de confiança de chaves de arquivos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 2f73e3d49..d2f597a6a 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1618,8 +1618,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1669,23 +1669,23 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>