X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/30749ef1edb33a91401bd7e4da7a4474e7bc2f6a..0b23d3c0a7a116a19c14ae63b6281464ba1382a4:/doc/po/apt-doc.pot diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 02a1c3895..cdb4bec40 100644 --- 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.4~beta1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-08-17 23:47+0200\n" +"POT-Creation-Date: 2016-11-25 23:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -559,7 +559,7 @@ msgstr "" msgid "" " 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: Dpkg::Progress and " +"Items: Dpkg::Progress and " "Dpkg::Progress-Fancy." msgstr "" @@ -1936,6 +1936,30 @@ msgid "" "generates warnings on stderr in these cases." msgstr "" +#. type: Content of: +#: apt-key.8.xml:1 +msgid "Supported keyring files" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:1 +msgid "" +"apt-key supports only the binary OpenPGP format (also known as \"GPG key " +"public ring\") in files with the \"<literal>gpg</literal>\" extension, not " +"the keybox database format introduced in newer &gpg; versions as default for " +"keyring files. Binary keyring files intended to be used with any apt version " +"should therefore always be created with <command>gpg --export</command>." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:1 +msgid "" +"Alternatively, if all systems which should be using the created keyring have " +"at least apt version >= 1.4 installed, you can use the ASCII armored format " +"with the \"<literal>asc</literal>\" extension instead which can be created " +"with <command>gpg --armor --export</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml:1 msgid "Commands" @@ -1960,10 +1984,10 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:1 msgid "" -"Instead of using this command a keyring can be placed directly in the " -"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive " -"name (same rules for filename apply as for &apt-conf; files) and " -"\"<literal>gpg</literal>\" as file extension." +"<emphasis>Note</emphasis>: Instead of using this command a keyring should be " +"placed directly in the <filename>/etc/apt/trusted.gpg.d/</filename> " +"directory with a descriptive name and either \"<literal>gpg</literal>\" or " +"\"<literal>asc</literal>\" as file extension." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -2015,9 +2039,9 @@ 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 " -"a dependency on <package>gnupg</package> and it is easier to manage keys by " -"simply adding and removing files for maintainers and users alike." +"<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 "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -2242,7 +2266,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 " @@ -6129,9 +6153,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>