document which keyring formats are supported by apt-key

[apt.git] / doc / po / apt-doc.pot

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index fa084c504a5b8e0aac9d02e332f8db03c13c59ad..fdccbada53b3a6787b67d452db5eaa88143146de 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 1.3~rc2\n"
+"Project-Id-Version: apt-doc 1.3.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-17 23:47+0200\n"
+"POT-Creation-Date: 2016-11-11 23:29+0100\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"
@@ -559,7 +559,7 @@ msgstr ""
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
-"&sources-list;. New packages will be installed if required to statisfy "
+"&sources-list;. New packages will be installed if required to satisfy "
 "dependencies, but existing packages will never be removed. If an upgrade for "
 "a package requires the remove of an installed package the upgrade for this "
 "package isn't performed."
@@ -1410,7 +1410,7 @@ msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
-"Item: <literal>Dpkg::Progress</literal> and "
+"Items: <literal>Dpkg::Progress</literal> and "
 "<literal>Dpkg::Progress-Fancy</literal>."
 msgstr ""
 
@@ -2015,7 +2015,7 @@ msgstr ""
 msgid ""
 "Note that a distribution does not need to and in fact should not use this "
 "command any longer and instead ship keyring files in the "
-"<filename>/etc/apt/trusted.gpg</filename> directory directly as this avoids "
+"<filename>/etc/apt/trusted.gpg.d/</filename> directory directly as this avoids "
 "a dependency on <package>gnupg</package> and it is easier to manage keys by "
 "simply adding and removing files for maintainers and users alike."
 msgstr ""
@@ -2242,7 +2242,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
-"A repository which previously was authentication but would loose this state "
+"A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
 "irrespective of the option to allow or forbid usage of insecure "
 "repositories.  The error can be overcome by additionally setting "
@@ -5788,8 +5788,8 @@ msgstr ""
 #: sources.list.5.xml:1
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian "
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian "
 "&debian-stable-codename; main"
 msgstr ""
 
@@ -5798,12 +5798,12 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
@@ -5919,12 +5919,12 @@ msgstr ""
 #: sources.list.5.xml:1
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -5932,7 +5932,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
@@ -6129,9 +6129,10 @@ msgid ""
 "fields are <literal>Origin</literal>, <literal>Label</literal>, "
 "<literal>Suite</literal>, <literal>Version</literal>, "
 "<literal>Codename</literal>, <literal>Date</literal>, "
-"<literal>Valid-Until</literal>, <literal>Signed-By</literal>, "
-"<literal>Architectures</literal>, <literal>Components</literal> and "
-"<literal>Description</literal>."
+"<literal>NotAutomatic</literal>, <literal>ButAutomaticUpgrades</literal>, "
+"<literal>Acquire-By-Hash</literal>, <literal>Valid-Until</literal>, "
+"<literal>Signed-By</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal> and <literal>Description</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>