diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-key.8.xml | 10 | ||||
| -rw-r--r-- | doc/examples/sources.list.in | 12 | ||||
| -rw-r--r-- | doc/makefile | 2 | ||||
| -rw-r--r-- | doc/po/de.po | 32 | ||||
| -rw-r--r-- | doc/po/es.po | 32 | ||||
| -rw-r--r-- | doc/po/fr.po | 32 | ||||
| -rw-r--r-- | doc/po/it.po | 32 | ||||
| -rw-r--r-- | doc/po/ja.po | 32 | ||||
| -rw-r--r-- | doc/po/pl.po | 32 | ||||
| -rw-r--r-- | doc/po/pt.po | 32 | ||||
| -rw-r--r-- | doc/po/pt_BR.po | 16 |
11 files changed, 205 insertions, 59 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/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 274fbc278..266caa990 100644 --- a/doc/makefile +++ b/doc/makefile @@ -13,7 +13,7 @@ include $(DEBIANDOC_H) doc: manpages debiandoc 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/de.po b/doc/po/de.po index 8ecbf4cbf..7ef5d39c0 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" +======= "POT-Creation-Date: 2013-06-13 13:46+0300\n" +>>>>>>> upstream/debian/sid "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 +2265,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 +2346,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 38b2645ea..a6fbc5da2 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" +======= "POT-Creation-Date: 2013-06-13 13:46+0300\n" +>>>>>>> upstream/debian/sid "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 +2334,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 +2415,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 c2f4b6d83..41358cfa2 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" +======= "POT-Creation-Date: 2013-06-13 13:46+0300\n" +>>>>>>> upstream/debian/sid "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" @@ -2257,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 "" "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 " @@ -2331,24 +2342,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> diff --git a/doc/po/it.po b/doc/po/it.po index df144e2b7..f6754c1fb 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -11,7 +11,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" +======= "POT-Creation-Date: 2013-06-13 13:46+0300\n" +>>>>>>> upstream/debian/sid "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 +2300,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 +2381,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> diff --git a/doc/po/ja.po b/doc/po/ja.po index 6b767f195..866cf0e43 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" +======= "POT-Creation-Date: 2013-06-13 13:46+0300\n" +>>>>>>> upstream/debian/sid "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 +2219,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 +2298,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 2b33324b6..ee4461f39 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" +======= "POT-Creation-Date: 2013-06-13 13:46+0300\n" +>>>>>>> upstream/debian/sid "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 +2366,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 +2447,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 726b184d0..79d90d65b 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" +======= "POT-Creation-Date: 2013-06-13 13:46+0300\n" +>>>>>>> upstream/debian/sid "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 +2280,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 +2360,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 00619cd22..a415d9528 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -10,7 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" +======= "POT-Creation-Date: 2013-06-13 13:46+0300\n" +>>>>>>> upstream/debian/sid "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 +1622,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 +1673,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> |