Merge commit 'e2073b0276226b625897ef475f225bf8f508719e' as 'triehash'

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

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 81b7036ba499bea0617d53666bbf5febec479f89..72ffc3ec5cc6cb6c28419d24f7e1bc83868b2a51 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: apt-doc 1.3~rc4\n"
+"Project-Id-Version: apt-doc 1.3.1\n"

 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-09-02 20:30+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"
 "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 "
 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."
 "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 "
 "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 ""
 
 "<literal>Dpkg::Progress-Fancy</literal>."
 msgstr ""
 


@@ -2242,7 +2242,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:1
 msgid ""
 #. 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 "
 "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 +6129,10 @@ msgid ""
 "fields are <literal>Origin</literal>, <literal>Label</literal>, "
 "<literal>Suite</literal>, <literal>Version</literal>, "
 "<literal>Codename</literal>, <literal>Date</literal>, "
 "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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>