Release 2.7.02.7.0

15 files changed, 1218 insertions, 16 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 668e2d762..1711a3a87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,7 @@ endif()
 # Configure some variables like package, version and architecture.
 set(PACKAGE ${PROJECT_NAME})
 set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
-set(PACKAGE_VERSION "2.6.0")
+set(PACKAGE_VERSION "2.7.0")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index 6cafd22f4..31ef70f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+apt (2.7.0) experimental; urgency=medium
+
+  [ Jacob Kauffmann ]
+  * Keep "or group" when installing package to satisfy it
+
+  [ Julian Andres Klode ]
+  * Add apt install,upgrade,... -U,--update options. Please note that
+    this still releases locks in between and is subject to races.
+  * Initial support for snapshot servers, apt --snapshot option. Some
+    implementation details may change down the road to 2.8
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 02 May 2023 16:41:47 +0200
+
 apt (2.6.0) unstable; urgency=medium
 
   * The "unhappy bookworm" release. Too many changes needed to clarify
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index beecfd27c..8c4c342d6 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2023-01-25T00:00:00Z</date>
+   <date>2023-04-11T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index d937a715a..9c883883a 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -274,7 +274,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "2.6.0">
+<!ENTITY apt-product-version "2.7.0">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "bullseye">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index e665d4c4c..5c7f0fdd3 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 2.6.0\n"
+"Project-Id-Version: apt-doc 2.7.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-03-06 12:29+0000\n"
+"POT-Creation-Date: 2023-05-02 14:45+0000\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"
@@ -1402,6 +1402,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"This option controls the snapshot chosen for archives with "
+"<literal>Snapshot: enable</literal> in the source entry. For example, "
+"<option>-S 20220102T030405Z</option> selects a snapshot from January 2nd, "
+"2022 at 03:04:05 UTC.  Configuration Item: <literal>APT::Snapshot</literal>; "
+"see also the &sources-list; manual page."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
 "overrides the general settings in "
@@ -1558,6 +1568,27 @@ msgstr ""
 msgid "Fail the update command if any error occured, even a transient one."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Run the <option>update</option> command before the specified command. This "
+"is supported for commands installing, removing, or upgrading packages such "
+"as <option>install</option>, <option>remove</option>, "
+"<option>safe-upgrade</option>, <option>full-upgrade</option>.  This can be "
+"useful to ensure a command always installs the latest versions, or, in "
+"combination with the <option>--snapshot</option> option to make sure the "
+"snapshot is present when install is being run."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Caveat: Due to technical limitations, locks are acquired individually for "
+"each phase, hence an install may fail to acquire locks after successfully "
+"executing the update. Until this is resolved, this is merely syntactic sugar "
+"for <literal>apt update &amp;&amp; apt install</literal>"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml apt_auth.conf.5.xml
@@ -3226,6 +3257,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"Snapshot to use for all repositories configured with <literal>Snapshot: "
+"yes</literal>. See also &sources-list;, the <option>--snapshot</option> "
+"option that sets this value, and <option>Acquire::Snapshots::URI</option> "
+"below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
@@ -3806,6 +3846,28 @@ msgid ""
 "tried if available in this case."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Like changelogs, snapshots can only be acquired if an URI is known from "
+"where to get them.  Preferable the Release file indicates this in a "
+"'Snapshots' field. If this isn't available the Label/Origin field of the "
+"Release file is used to check if a "
+"<literal>Acquire::Snapshots::URI::Label::<replaceable>LABEL</replaceable></literal> "
+"or "
+"<literal>Acquire::Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
+"option exists and if so this value is taken. The value in the Release file "
+"can be overridden with "
+"<literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</replaceable></literal> "
+"or "
+"<literal>Acquire::Snapshots::URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>.  "
+"The value should be a normal URI to a directory, except that the snapshot ID "
+"replaced with the placeholder <literal>@SNAPSHOTID</literal>.  The special "
+"value '<literal>no</literal>' is available for this option indicating that "
+"this source cannot be used to acquire snapshots from. Another source will be "
+"tried if available in this case."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Binary specific configuration"
@@ -5987,6 +6049,36 @@ msgid ""
 "<filename>Release</filename> files will be disabled."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Snapshot</option> (<option>snapshot</option>)  allows selecting an "
+"earlier version of the archive from the snapshot service. Supported values "
+"are:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<literal>enable</literal> to allow selecting a snapshot with the "
+"<option>--snapshot</option> option, or"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid "a snapshot ID to select a specific snapshot."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Snapshot IDs are usually timestamps in the form of "
+"<literal>YYYYMMDDTHHMMSSZ</literal>, such as "
+"<literal>20220102T030405Z</literal> which is the January 2nd, 2022 at "
+"03:04:05 UTC, servers may however support additional types of IDs, and APT "
+"does not perform any checks so far."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "URI Specification"
diff --git a/doc/po/de.po b/doc/po/de.po
index 5073e2519..0e2beaa3f 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.0.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-02-08 17:09+0100\n"
+"POT-Creation-Date: 2023-05-02 14:45+0000\n"
 "PO-Revision-Date: 2020-04-04 08:45+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1963,6 +1963,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"This option controls the snapshot chosen for archives with "
+"<literal>Snapshot: enable</literal> in the source entry. For example, "
+"<option>-S 20220102T030405Z</option> selects a snapshot from January 2nd, "
+"2022 at 03:04:05 UTC.  Configuration Item: <literal>APT::Snapshot</literal>; "
+"see also the &sources-list; manual page."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
 "overrides the general settings in <filename>/etc/apt/preferences</"
@@ -2193,6 +2203,27 @@ msgstr ""
 msgid "Fail the update command if any error occured, even a transient one."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Run the <option>update</option> command before the specified command. This "
+"is supported for commands installing, removing, or upgrading packages such "
+"as <option>install</option>, <option>remove</option>, <option>safe-upgrade</"
+"option>, <option>full-upgrade</option>.  This can be useful to ensure a "
+"command always installs the latest versions, or, in combination with the "
+"<option>--snapshot</option> option to make sure the snapshot is present when "
+"install is being run."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Caveat: Due to technical limitations, locks are acquired individually for "
+"each phase, hence an install may fail to acquire locks after successfully "
+"executing the update. Until this is resolved, this is merely syntactic sugar "
+"for <literal>apt update &amp;&amp; apt install</literal>"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml apt_auth.conf.5.xml
@@ -4577,6 +4608,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"Snapshot to use for all repositories configured with <literal>Snapshot: yes</"
+"literal>. See also &sources-list;, the <option>--snapshot</option> option "
+"that sets this value, and <option>Acquire::Snapshots::URI</option> below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
@@ -5476,6 +5515,78 @@ msgstr ""
 "kann, um von dort Changelog-Dateien zu beschaffen. In diesem Fall wird, "
 "falls verfügbar, eine andere Quelle ausprobiert."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Acquiring changelogs can only be done if an URI is known from where to "
+#| "get them.  Preferable the Release file indicates this in a 'Changelogs' "
+#| "field. If this isn't available the Label/Origin field of the Release file "
+#| "is used to check if a <literal>Acquire::Changelogs::URI::Label::"
+#| "<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
+#| "option exists and if so this value is taken. The value in the Release "
+#| "file can be overridden with <literal>Acquire::Changelogs::URI::Override::"
+#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
+#| "literal>.  The value should be a normal URI to a text file, except that "
+#| "package specific data is replaced with the placeholder "
+#| "<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package "
+#| "is from a component (e.g. <literal>main</literal>)  this is the first "
+#| "part otherwise it is omitted, 2. the first letter of source package name, "
+#| "except if the source package name starts with '<literal>lib</literal>' in "
+#| "which case it will be the first four letters. 3. The complete source "
+#| "package name. 4. the complete name again and 5. the source version.  The "
+#| "first (if present), second, third and fourth part are separated by a "
+#| "slash ('<literal>/</literal>')  and between the fourth and fifth part is "
+#| "an underscore ('<literal>_</literal>').  The special value '<literal>no</"
+#| "literal>' is available for this option indicating that this source can't "
+#| "be used to acquire changelog files from. Another source will be tried if "
+#| "available in this case."
+msgid ""
+"Like changelogs, snapshots can only be acquired if an URI is known from "
+"where to get them.  Preferable the Release file indicates this in a "
+"'Snapshots' field. If this isn't available the Label/Origin field of the "
+"Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
+"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
+"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
+"if so this value is taken. The value in the Release file can be overridden "
+"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a directory, except that the snapshot ID replaced with the "
+"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source cannot be "
+"used to acquire snapshots from. Another source will be tried if available in "
+"this case."
+msgstr ""
+"Changelogs können nur beschafft werden, falls ein URI bekannt ist, von dem "
+"sie geholt werden können. Vorzugsweise gibt die Release-Datei ihn in einem "
+"»Changelogs«-Feld an. Falls dies nicht verfügbar ist, werden die Felder "
+"»Label« und »Origin« der Release-Datei benutzt, um zu prüfen, ob eine "
+"<literal>Acquire::Changelogs::URI::Label::<replaceable>BESCHRIFTUNG</"
+"replaceable></literal>- oder <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>URSPRUNG</replaceable></literal>-Option existiert und, falls "
+"dies der Fall ist, wird dieser Wert genommen. Der Wert in der Release-Datei "
+"kann mit <literal>Acquire::Changelogs::URI::Override::Label::"
+"<replaceable>BESCHRIFTUNG</replaceable></literal> oder <literal>Acquire::"
+"Changelogs::URI::Override::Origin::<replaceable>URSPRUNG</replaceable></"
+"literal> außer Kraft gesetzt werden. Der Wert sollte ein normaler URI auf "
+"eine Textdatei sein, außer dass paketspezifische Daten durch den Platzhalter "
+"<literal>@CHANGEPATH@</literal> ersetzt werden. Der Wert dafür ist: 1. Falls "
+"das Paket von einem Bestandteil stammt (z.B. <literal>main</literal>), ist "
+"dies der erste Teil, ansonsten wird er weggelassen. 2. der erste Buchstabe "
+"des Quellpaketnamens, es sei denn, der Paketname beginnt mit »<literal>lib</"
+"literal>«. In diesem Fall werden es die vier ersten Buchstaben sein. 3. der "
+"komplette Quellpaketname. 4. wieder der vollständige Name und 5. die "
+"Quellversion. Der erste (falls vorhanden), zweite, dritte und vierte Teil "
+"werden durch einen Schrägstrich (»<literal>/</literal>«) voneinander "
+"getrennt und zwischen dem vierten und fünften ist ein Unterstrich "
+"(»<literal>_</literal>«). Der Spezialwert »<literal>no</literal>«, der für "
+"diese Option verfügbar ist, gibt an, dass diese Quelle nicht benutzt werden "
+"kann, um von dort Changelog-Dateien zu beschaffen. In diesem Fall wird, "
+"falls verfügbar, eine andere Quelle ausprobiert."
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Binary specific configuration"
@@ -8630,6 +8741,35 @@ msgstr ""
 "InRelease-Datei probiert und der Rückgriff auf <filename>Release</filename>-"
 "Dateien wird deaktiviert."
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Snapshot</option> (<option>snapshot</option>)  allows selecting an "
+"earlier version of the archive from the snapshot service. Supported values "
+"are:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<literal>enable</literal> to allow selecting a snapshot with the <option>--"
+"snapshot</option> option, or"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid "a snapshot ID to select a specific snapshot."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Snapshot IDs are usually timestamps in the form of "
+"<literal>YYYYMMDDTHHMMSSZ</literal>, such as <literal>20220102T030405Z</"
+"literal> which is the January 2nd, 2022 at 03:04:05 UTC, servers may however "
+"support additional types of IDs, and APT does not perform any checks so far."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "URI Specification"
diff --git a/doc/po/es.po b/doc/po/es.po
index e490aa0b7..7c9d5e1bf 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-02-08 17:09+0100\n"
+"POT-Creation-Date: 2023-05-02 14:45+0000\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -2017,6 +2017,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"This option controls the snapshot chosen for archives with "
+"<literal>Snapshot: enable</literal> in the source entry. For example, "
+"<option>-S 20220102T030405Z</option> selects a snapshot from January 2nd, "
+"2022 at 03:04:05 UTC.  Configuration Item: <literal>APT::Snapshot</literal>; "
+"see also the &sources-list; manual page."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
 "overrides the general settings in <filename>/etc/apt/preferences</"
@@ -2208,6 +2218,27 @@ msgstr ""
 msgid "Fail the update command if any error occured, even a transient one."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Run the <option>update</option> command before the specified command. This "
+"is supported for commands installing, removing, or upgrading packages such "
+"as <option>install</option>, <option>remove</option>, <option>safe-upgrade</"
+"option>, <option>full-upgrade</option>.  This can be useful to ensure a "
+"command always installs the latest versions, or, in combination with the "
+"<option>--snapshot</option> option to make sure the snapshot is present when "
+"install is being run."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Caveat: Due to technical limitations, locks are acquired individually for "
+"each phase, hence an install may fail to acquire locks after successfully "
+"executing the update. Until this is resolved, this is merely syntactic sugar "
+"for <literal>apt update &amp;&amp; apt install</literal>"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml apt_auth.conf.5.xml
@@ -4533,6 +4564,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"Snapshot to use for all repositories configured with <literal>Snapshot: yes</"
+"literal>. See also &sources-list;, the <option>--snapshot</option> option "
+"that sets this value, and <option>Acquire::Snapshots::URI</option> below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
@@ -5425,6 +5464,26 @@ msgid ""
 "available in this case."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Like changelogs, snapshots can only be acquired if an URI is known from "
+"where to get them.  Preferable the Release file indicates this in a "
+"'Snapshots' field. If this isn't available the Label/Origin field of the "
+"Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
+"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
+"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
+"if so this value is taken. The value in the Release file can be overridden "
+"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a directory, except that the snapshot ID replaced with the "
+"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source cannot be "
+"used to acquire snapshots from. Another source will be tried if available in "
+"this case."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 #, fuzzy
@@ -8388,6 +8447,35 @@ msgid ""
 "<filename>Release</filename> files will be disabled."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Snapshot</option> (<option>snapshot</option>)  allows selecting an "
+"earlier version of the archive from the snapshot service. Supported values "
+"are:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<literal>enable</literal> to allow selecting a snapshot with the <option>--"
+"snapshot</option> option, or"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid "a snapshot ID to select a specific snapshot."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Snapshot IDs are usually timestamps in the form of "
+"<literal>YYYYMMDDTHHMMSSZ</literal>, such as <literal>20220102T030405Z</"
+"literal> which is the January 2nd, 2022 at 03:04:05 UTC, servers may however "
+"support additional types of IDs, and APT does not perform any checks so far."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "URI Specification"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index ee33fb14b..5def32303 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.8.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-02-08 17:09+0100\n"
+"POT-Creation-Date: 2023-05-02 14:45+0000\n"
 "PO-Revision-Date: 2019-05-01 17:00+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1934,6 +1934,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"This option controls the snapshot chosen for archives with "
+"<literal>Snapshot: enable</literal> in the source entry. For example, "
+"<option>-S 20220102T030405Z</option> selects a snapshot from January 2nd, "
+"2022 at 03:04:05 UTC.  Configuration Item: <literal>APT::Snapshot</literal>; "
+"see also the &sources-list; manual page."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
 "overrides the general settings in <filename>/etc/apt/preferences</"
@@ -2166,6 +2176,27 @@ msgstr ""
 msgid "Fail the update command if any error occured, even a transient one."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Run the <option>update</option> command before the specified command. This "
+"is supported for commands installing, removing, or upgrading packages such "
+"as <option>install</option>, <option>remove</option>, <option>safe-upgrade</"
+"option>, <option>full-upgrade</option>.  This can be useful to ensure a "
+"command always installs the latest versions, or, in combination with the "
+"<option>--snapshot</option> option to make sure the snapshot is present when "
+"install is being run."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Caveat: Due to technical limitations, locks are acquired individually for "
+"each phase, hence an install may fail to acquire locks after successfully "
+"executing the update. Until this is resolved, this is merely syntactic sugar "
+"for <literal>apt update &amp;&amp; apt install</literal>"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml apt_auth.conf.5.xml
@@ -4547,6 +4578,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"Snapshot to use for all repositories configured with <literal>Snapshot: yes</"
+"literal>. See also &sources-list;, the <option>--snapshot</option> option "
+"that sets this value, and <option>Acquire::Snapshots::URI</option> below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
@@ -5460,6 +5499,77 @@ msgstr ""
 "pour indiquer que cette source ne peut être utilisée pour récupérer les "
 "fichiers changelog. Dans ce cas, une autre source sera essayée."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Acquiring changelogs can only be done if an URI is known from where to "
+#| "get them.  Preferable the Release file indicates this in a 'Changelogs' "
+#| "field. If this isn't available the Label/Origin field of the Release file "
+#| "is used to check if a <literal>Acquire::Changelogs::URI::Label::"
+#| "<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
+#| "option exists and if so this value is taken. The value in the Release "
+#| "file can be overridden with <literal>Acquire::Changelogs::URI::Override::"
+#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
+#| "literal>.  The value should be a normal URI to a text file, except that "
+#| "package specific data is replaced with the placeholder "
+#| "<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package "
+#| "is from a component (e.g. <literal>main</literal>)  this is the first "
+#| "part otherwise it is omitted, 2. the first letter of source package name, "
+#| "except if the source package name starts with '<literal>lib</literal>' in "
+#| "which case it will be the first four letters. 3. The complete source "
+#| "package name. 4. the complete name again and 5. the source version.  The "
+#| "first (if present), second, third and fourth part are separated by a "
+#| "slash ('<literal>/</literal>')  and between the fourth and fifth part is "
+#| "an underscore ('<literal>_</literal>').  The special value '<literal>no</"
+#| "literal>' is available for this option indicating that this source can't "
+#| "be used to acquire changelog files from. Another source will be tried if "
+#| "available in this case."
+msgid ""
+"Like changelogs, snapshots can only be acquired if an URI is known from "
+"where to get them.  Preferable the Release file indicates this in a "
+"'Snapshots' field. If this isn't available the Label/Origin field of the "
+"Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
+"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
+"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
+"if so this value is taken. The value in the Release file can be overridden "
+"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a directory, except that the snapshot ID replaced with the "
+"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source cannot be "
+"used to acquire snapshots from. Another source will be tried if available in "
+"this case."
+msgstr ""
+"La récupération des journaux des modifications n'est possible que si l'URI "
+"où les télécharger est connu. De préférence, le fichier Release l'indique "
+"dans un champ « Changelogs ». S'il n'est pas disponible, les champs Label ou "
+"Origine du fichier Release sont utilisés pour vérifier si les options "
+"<literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</replaceable></"
+"literal> ou <literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGINE</"
+"replaceable></literal> existent, et si c'est le cas, cette valeur est prise. "
+"La valeur dans le fichier Release peut être contournée par <literal>Acquire::"
+"Changelogs::URI::Override::Label::<replaceable>LABEL</replaceable></literal> "
+"ou <literal>Acquire::Changelogs::URI::Override::Origin::"
+"<replaceable>ORIGINE</replaceable></literal>. La valeur devrait être un URI "
+"normal vers un fichier texte, à l'exception que les données spécifiques du "
+"paquet sont remplacées par le paramètre <literal>@CHANGEPATH@</literal>. Sa "
+"valeur est la suivante : 1. si le paquet provient d'un composant (par "
+"exemple <literal>main</literal>) il constitue la première partie, sinon elle "
+"est omise ; 2. est la première lettre du nom du paquet source, sauf si le "
+"nom du paquet source commence par <literal>lib</literal> auquel cas les "
+"quatre premières lettres seront utilisées ; 3. le nom complet du paquet "
+"source ; 4. le nom complet une fois de plus ; 5. la version de la source. "
+"Les quatres premières parties (ou trois si le composant est absent) sont "
+"séparées par des barres obliques (« <literal>/</literal> »), et les deux "
+"dernières sont séparées par un caractère de soulignement (« <literal>_</"
+"literal> »). La valeur spéciale « <literal>no</literal> » est disponible "
+"pour indiquer que cette source ne peut être utilisée pour récupérer les "
+"fichiers changelog. Dans ce cas, une autre source sera essayée."
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Binary specific configuration"
@@ -8577,6 +8687,35 @@ msgstr ""
 "définie, le chemin spécifié sera essayé à la place du fichier InRelease, et "
 "le repli vers les fichiers <filename>Release</filename> sera désactivé."
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Snapshot</option> (<option>snapshot</option>)  allows selecting an "
+"earlier version of the archive from the snapshot service. Supported values "
+"are:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<literal>enable</literal> to allow selecting a snapshot with the <option>--"
+"snapshot</option> option, or"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid "a snapshot ID to select a specific snapshot."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Snapshot IDs are usually timestamps in the form of "
+"<literal>YYYYMMDDTHHMMSSZ</literal>, such as <literal>20220102T030405Z</"
+"literal> which is the January 2nd, 2022 at 03:04:05 UTC, servers may however "
+"support additional types of IDs, and APT does not perform any checks so far."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "URI Specification"
diff --git a/doc/po/it.po b/doc/po/it.po
index b9193afb5..091d6b3a8 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-02-08 17:09+0100\n"
+"POT-Creation-Date: 2023-05-02 14:45+0000\n"
 "PO-Revision-Date: 2017-03-27 19:05+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -1981,6 +1981,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"This option controls the snapshot chosen for archives with "
+"<literal>Snapshot: enable</literal> in the source entry. For example, "
+"<option>-S 20220102T030405Z</option> selects a snapshot from January 2nd, "
+"2022 at 03:04:05 UTC.  Configuration Item: <literal>APT::Snapshot</literal>; "
+"see also the &sources-list; manual page."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
 "overrides the general settings in <filename>/etc/apt/preferences</"
@@ -2197,6 +2207,27 @@ msgstr ""
 msgid "Fail the update command if any error occured, even a transient one."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Run the <option>update</option> command before the specified command. This "
+"is supported for commands installing, removing, or upgrading packages such "
+"as <option>install</option>, <option>remove</option>, <option>safe-upgrade</"
+"option>, <option>full-upgrade</option>.  This can be useful to ensure a "
+"command always installs the latest versions, or, in combination with the "
+"<option>--snapshot</option> option to make sure the snapshot is present when "
+"install is being run."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Caveat: Due to technical limitations, locks are acquired individually for "
+"each phase, hence an install may fail to acquire locks after successfully "
+"executing the update. Until this is resolved, this is merely syntactic sugar "
+"for <literal>apt update &amp;&amp; apt install</literal>"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml apt_auth.conf.5.xml
@@ -4566,6 +4597,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"Snapshot to use for all repositories configured with <literal>Snapshot: yes</"
+"literal>. See also &sources-list;, the <option>--snapshot</option> option "
+"that sets this value, and <option>Acquire::Snapshots::URI</option> below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
@@ -5455,6 +5494,77 @@ msgstr ""
 "può essere usata per acquisire file changelog. In questo caso viene provata "
 "un'altra fonte, se disponibile."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Acquiring changelogs can only be done if an URI is known from where to "
+#| "get them.  Preferable the Release file indicates this in a 'Changelogs' "
+#| "field. If this isn't available the Label/Origin field of the Release file "
+#| "is used to check if a <literal>Acquire::Changelogs::URI::Label::"
+#| "<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
+#| "option exists and if so this value is taken. The value in the Release "
+#| "file can be overridden with <literal>Acquire::Changelogs::URI::Override::"
+#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
+#| "literal>.  The value should be a normal URI to a text file, except that "
+#| "package specific data is replaced with the placeholder "
+#| "<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package "
+#| "is from a component (e.g. <literal>main</literal>)  this is the first "
+#| "part otherwise it is omitted, 2. the first letter of source package name, "
+#| "except if the source package name starts with '<literal>lib</literal>' in "
+#| "which case it will be the first four letters. 3. The complete source "
+#| "package name. 4. the complete name again and 5. the source version.  The "
+#| "first (if present), second, third and fourth part are separated by a "
+#| "slash ('<literal>/</literal>')  and between the fourth and fifth part is "
+#| "an underscore ('<literal>_</literal>').  The special value '<literal>no</"
+#| "literal>' is available for this option indicating that this source can't "
+#| "be used to acquire changelog files from. Another source will be tried if "
+#| "available in this case."
+msgid ""
+"Like changelogs, snapshots can only be acquired if an URI is known from "
+"where to get them.  Preferable the Release file indicates this in a "
+"'Snapshots' field. If this isn't available the Label/Origin field of the "
+"Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
+"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
+"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
+"if so this value is taken. The value in the Release file can be overridden "
+"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a directory, except that the snapshot ID replaced with the "
+"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source cannot be "
+"used to acquire snapshots from. Another source will be tried if available in "
+"this case."
+msgstr ""
+"L'acquisizione di changelog è possibile solamente se è noto un URI da cui "
+"ottenerli. Il file Release indica questa informazione preferibilmente in un "
+"campo «Changelogs». Se questo non è disponibile, viene usato il campo Label/"
+"Origin del file Release per controllare se esiste un'opzione "
+"<literal>Acquire::Changelogs::URI::Label::<replaceable>ETICHETTA</"
+"replaceable></literal> o <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGINE</replaceable></literal> e, se è così, viene preso "
+"questo valore. Il valore nel file Release può essere scavalcato con "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>ETICHETTA</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGINE</replaceable></literal>. Il valore deve essere "
+"un URI normale verso un file di testo, tranne per il fatto che dati "
+"specifici di pacchetto sono sostituito con il segnaposto "
+"<literal>@CHANGEPATH@</literal>. Il valore per esso è: 1. se il pacchetto è "
+"da una componente (es. <literal>main</literal>) è la prima parte, altrimenti "
+"viene omesso; 2. la prima lettera del nome del pacchetto sorgente, tranne "
+"per i pacchetti sorgente con nome che inizia con «<literal>lib</literal>», "
+"nel qual caso saranno le prime quattro lettere; 3. il nome completo del "
+"pacchetto sorgente; 4. il nome completo di nuovo e 5. la versione sorgente. "
+"La prima (se presente), la seconda, la terza e la quarta parte sono separate "
+"da una sbarra («<literal>/</literal>») e tra la quarta e la quinta parte c'è "
+"un trattino basso («<literal>_</literal>»). Per questa opzione è disponibile "
+"il valore speciale «<literal>no</literal>» che indica che questa fonte non "
+"può essere usata per acquisire file changelog. In questo caso viene provata "
+"un'altra fonte, se disponibile."
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Binary specific configuration"
@@ -8558,6 +8668,35 @@ msgid ""
 "<filename>Release</filename> files will be disabled."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Snapshot</option> (<option>snapshot</option>)  allows selecting an "
+"earlier version of the archive from the snapshot service. Supported values "
+"are:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<literal>enable</literal> to allow selecting a snapshot with the <option>--"
+"snapshot</option> option, or"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid "a snapshot ID to select a specific snapshot."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Snapshot IDs are usually timestamps in the form of "
+"<literal>YYYYMMDDTHHMMSSZ</literal>, such as <literal>20220102T030405Z</"
+"literal> which is the January 2nd, 2022 at 03:04:05 UTC, servers may however "
+"support additional types of IDs, and APT does not perform any checks so far."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "URI Specification"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 41e497953..870754d13 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-02-08 17:09+0100\n"
+"POT-Creation-Date: 2023-05-02 14:45+0000\n"
 "PO-Revision-Date: 2017-01-06 04:50+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1919,6 +1919,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"This option controls the snapshot chosen for archives with "
+"<literal>Snapshot: enable</literal> in the source entry. For example, "
+"<option>-S 20220102T030405Z</option> selects a snapshot from January 2nd, "
+"2022 at 03:04:05 UTC.  Configuration Item: <literal>APT::Snapshot</literal>; "
+"see also the &sources-list; manual page."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
 "overrides the general settings in <filename>/etc/apt/preferences</"
@@ -2127,6 +2137,27 @@ msgstr ""
 msgid "Fail the update command if any error occured, even a transient one."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Run the <option>update</option> command before the specified command. This "
+"is supported for commands installing, removing, or upgrading packages such "
+"as <option>install</option>, <option>remove</option>, <option>safe-upgrade</"
+"option>, <option>full-upgrade</option>.  This can be useful to ensure a "
+"command always installs the latest versions, or, in combination with the "
+"<option>--snapshot</option> option to make sure the snapshot is present when "
+"install is being run."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Caveat: Due to technical limitations, locks are acquired individually for "
+"each phase, hence an install may fail to acquire locks after successfully "
+"executing the update. Until this is resolved, this is merely syntactic sugar "
+"for <literal>apt update &amp;&amp; apt install</literal>"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml apt_auth.conf.5.xml
@@ -4410,6 +4441,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"Snapshot to use for all repositories configured with <literal>Snapshot: yes</"
+"literal>. See also &sources-list;, the <option>--snapshot</option> option "
+"that sets this value, and <option>Acquire::Snapshots::URI</option> below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
@@ -5242,6 +5281,74 @@ msgstr ""
 "ことを示す特別な値 '<literal>no</literal>' がこのオプションで利用可能です。こ"
 "の場合、可能であれば別のソースが試行されます。"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Acquiring changelogs can only be done if an URI is known from where to "
+#| "get them.  Preferable the Release file indicates this in a 'Changelogs' "
+#| "field. If this isn't available the Label/Origin field of the Release file "
+#| "is used to check if a <literal>Acquire::Changelogs::URI::Label::"
+#| "<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
+#| "option exists and if so this value is taken. The value in the Release "
+#| "file can be overridden with <literal>Acquire::Changelogs::URI::Override::"
+#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
+#| "literal>.  The value should be a normal URI to a text file, except that "
+#| "package specific data is replaced with the placeholder "
+#| "<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package "
+#| "is from a component (e.g. <literal>main</literal>)  this is the first "
+#| "part otherwise it is omitted, 2. the first letter of source package name, "
+#| "except if the source package name starts with '<literal>lib</literal>' in "
+#| "which case it will be the first four letters. 3. The complete source "
+#| "package name. 4. the complete name again and 5. the source version.  The "
+#| "first (if present), second, third and fourth part are separated by a "
+#| "slash ('<literal>/</literal>')  and between the fourth and fifth part is "
+#| "an underscore ('<literal>_</literal>').  The special value '<literal>no</"
+#| "literal>' is available for this option indicating that this source can't "
+#| "be used to acquire changelog files from. Another source will be tried if "
+#| "available in this case."
+msgid ""
+"Like changelogs, snapshots can only be acquired if an URI is known from "
+"where to get them.  Preferable the Release file indicates this in a "
+"'Snapshots' field. If this isn't available the Label/Origin field of the "
+"Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
+"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
+"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
+"if so this value is taken. The value in the Release file can be overridden "
+"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a directory, except that the snapshot ID replaced with the "
+"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source cannot be "
+"used to acquire snapshots from. Another source will be tried if available in "
+"this case."
+msgstr ""
+"URI は、それらを取得する場所から知られている場合は、変更履歴の取得のみ行うこ"
+"とができます。好ましいリリースファイルは、「変更履歴」フィールドでこのことを"
+"示します。これが利用できない場合、<literal>Acquire::Changelogs::URI::Label::"
+"<replaceable>LABEL</replaceable></literal> または <literal>Acquire::"
+"Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> オプショ"
+"ンが存在し、そしてこの値が取られてる場合は、リリースファイルの Label/Origin "
+"フィールドが確認するために使用されます。リリースファイル内の値は、"
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> または <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal> で上書きできます。その"
+"パッケージ固有のデータが <literal>@CHANGEPATH@</literal> プレースホルダに置き"
+"換えられている場合以外は、値はテキストファイルへの正常な URI にする必要があり"
+"ます。値は次の通りです: 1. パッケージがコンポーネント (例えば、"
+"<literal>main</literal>) からのものである場合、それ以外の場合は省略されている"
+"最初の部分です、2. ソースパッケージ名の最初の文字。ただし、ソースパッケージ名"
+"が '<literal>lib</literal>' で始まる場合を除きます (その場合は 最初の 4 文字"
+"になります)。3. 完全なソースパッケージ名。4. 再び完全な名前および 5. ソースの"
+"バージョン。(存在する場合は) 最初、第二、第三、第四の部分はスラッシュ "
+"('<literal>/</literal>') で区切られ、第四と第五の部分の間はアンダースコア "
+"('<literal>_</literal>') です。このソースから変更履歴を取得することができない"
+"ことを示す特別な値 '<literal>no</literal>' がこのオプションで利用可能です。こ"
+"の場合、可能であれば別のソースが試行されます。"
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Binary specific configuration"
@@ -8217,6 +8324,35 @@ msgid ""
 "<filename>Release</filename> files will be disabled."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Snapshot</option> (<option>snapshot</option>)  allows selecting an "
+"earlier version of the archive from the snapshot service. Supported values "
+"are:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<literal>enable</literal> to allow selecting a snapshot with the <option>--"
+"snapshot</option> option, or"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid "a snapshot ID to select a specific snapshot."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Snapshot IDs are usually timestamps in the form of "
+"<literal>YYYYMMDDTHHMMSSZ</literal>, such as <literal>20220102T030405Z</"
+"literal> which is the January 2nd, 2022 at 03:04:05 UTC, servers may however "
+"support additional types of IDs, and APT does not perform any checks so far."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "URI Specification"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 4d011fa18..ecc483903 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 2.5.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-02-08 17:09+0100\n"
+"POT-Creation-Date: 2023-05-02 14:45+0000\n"
 "PO-Revision-Date: 2022-11-28 22:15+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -2023,6 +2023,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"This option controls the snapshot chosen for archives with "
+"<literal>Snapshot: enable</literal> in the source entry. For example, "
+"<option>-S 20220102T030405Z</option> selects a snapshot from January 2nd, "
+"2022 at 03:04:05 UTC.  Configuration Item: <literal>APT::Snapshot</literal>; "
+"see also the &sources-list; manual page."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
 "overrides the general settings in <filename>/etc/apt/preferences</"
@@ -2260,6 +2270,27 @@ msgstr ""
 "De update-opdracht doen mislukken als er een fout is opgetreden, zelfs een "
 "tijdelijke fout."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Run the <option>update</option> command before the specified command. This "
+"is supported for commands installing, removing, or upgrading packages such "
+"as <option>install</option>, <option>remove</option>, <option>safe-upgrade</"
+"option>, <option>full-upgrade</option>.  This can be useful to ensure a "
+"command always installs the latest versions, or, in combination with the "
+"<option>--snapshot</option> option to make sure the snapshot is present when "
+"install is being run."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Caveat: Due to technical limitations, locks are acquired individually for "
+"each phase, hence an install may fail to acquire locks after successfully "
+"executing the update. Until this is resolved, this is merely syntactic sugar "
+"for <literal>apt update &amp;&amp; apt install</literal>"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml apt_auth.conf.5.xml
@@ -4682,6 +4713,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"Snapshot to use for all repositories configured with <literal>Snapshot: yes</"
+"literal>. See also &sources-list;, the <option>--snapshot</option> option "
+"that sets this value, and <option>Acquire::Snapshots::URI</option> below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
@@ -5598,6 +5637,79 @@ msgstr ""
 "dat deze bron niet gebruikt kan worden om er changelog-bestanden op te "
 "halen. In dat geval zal een andere bron geprobeerd worden als die er is."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Acquiring changelogs can only be done if an URI is known from where to "
+#| "get them.  Preferable the Release file indicates this in a 'Changelogs' "
+#| "field. If this isn't available the Label/Origin field of the Release file "
+#| "is used to check if a <literal>Acquire::Changelogs::URI::Label::"
+#| "<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
+#| "option exists and if so this value is taken. The value in the Release "
+#| "file can be overridden with <literal>Acquire::Changelogs::URI::Override::"
+#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
+#| "literal>.  The value should be a normal URI to a text file, except that "
+#| "package specific data is replaced with the placeholder "
+#| "<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package "
+#| "is from a component (e.g. <literal>main</literal>)  this is the first "
+#| "part otherwise it is omitted, 2. the first letter of source package name, "
+#| "except if the source package name starts with '<literal>lib</literal>' in "
+#| "which case it will be the first four letters. 3. The complete source "
+#| "package name. 4. the complete name again and 5. the source version.  The "
+#| "first (if present), second, third and fourth part are separated by a "
+#| "slash ('<literal>/</literal>')  and between the fourth and fifth part is "
+#| "an underscore ('<literal>_</literal>').  The special value '<literal>no</"
+#| "literal>' is available for this option indicating that this source can't "
+#| "be used to acquire changelog files from. Another source will be tried if "
+#| "available in this case."
+msgid ""
+"Like changelogs, snapshots can only be acquired if an URI is known from "
+"where to get them.  Preferable the Release file indicates this in a "
+"'Snapshots' field. If this isn't available the Label/Origin field of the "
+"Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
+"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
+"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
+"if so this value is taken. The value in the Release file can be overridden "
+"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a directory, except that the snapshot ID replaced with the "
+"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source cannot be "
+"used to acquire snapshots from. Another source will be tried if available in "
+"this case."
+msgstr ""
+"Het ophalen van changelogs (bestanden met de registratie van aangebrachte "
+"wijzigingen) kan enkel gebeuren als er een URI gekend is waar ze opgehaald "
+"kunnen worden. Bij voorkeur vermeldt het bestand Release dit in het veld "
+"'Changelogs'. Indien er geen dergelijk veld is, wordt het veld Label/Origin "
+"van het Release-bestand gebruikt om na te gaan of er een optie "
+"<literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</replaceable></"
+"literal> of <literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGINE</"
+"replaceable></literal> bestaat en als dat het geval is, wordt die waarde "
+"gebruikt. De waarde in het Release-bestand kan vervangen worden door "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> of <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGINE</replaceable></literal>. De waarde ervan zou "
+"een normale URI naar een tekstbestand moeten zijn, behalve dat de "
+"pakketspecifieke gegevens vervangen worden door de plaatshouder "
+"<literal>@CHANGEPATH@</literal>. De waarde daarvan is: 1. als het pakket uit "
+"een onderdeel afkomstig is (bijv. <literal>main</literal>), vormt dit het "
+"eerste deel, anders wordt het weggelaten, 2. de eerste letter van de "
+"pakketnaam van het bronpakket, behalve als de naam van het bronpakket begint "
+"met '<literal>lib</literal>'. In dat laatste geval zullen het de eerste vier "
+"letters zijn. 3. De volledige naam van het bronpakket. 4. nogmaals de "
+"volledige naam en 5. de versie van de broncode. Het eerste (in voorkomend "
+"geval), tweede, derde en vierde deel worden gescheiden door een slash "
+"('<literal>/</literal>') en tussen het het vierde en het vijfde deel staat "
+"een laag liggend streepje ('<literal>_</literal>'). De speciale waarde "
+"'<literal>no</literal>' kan gebruikt worden voor deze optie om aan te geven "
+"dat deze bron niet gebruikt kan worden om er changelog-bestanden op te "
+"halen. In dat geval zal een andere bron geprobeerd worden als die er is."
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Binary specific configuration"
@@ -8799,6 +8911,35 @@ msgstr ""
 "InRelease-bestand en wordt het terugvallen op <filename>Release</filename>-"
 "bestanden uitgeschakeld."
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Snapshot</option> (<option>snapshot</option>)  allows selecting an "
+"earlier version of the archive from the snapshot service. Supported values "
+"are:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<literal>enable</literal> to allow selecting a snapshot with the <option>--"
+"snapshot</option> option, or"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid "a snapshot ID to select a specific snapshot."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Snapshot IDs are usually timestamps in the form of "
+"<literal>YYYYMMDDTHHMMSSZ</literal>, such as <literal>20220102T030405Z</"
+"literal> which is the January 2nd, 2022 at 03:04:05 UTC, servers may however "
+"support additional types of IDs, and APT does not perform any checks so far."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "URI Specification"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 0d5e58ff4..3f92ef309 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-02-08 17:09+0100\n"
+"POT-Creation-Date: 2023-05-02 14:45+0000\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -2012,6 +2012,16 @@ msgstr ""
 "wyłączenia mogłyby być częste zmiany w sources.list. Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Get::List-Cleanup</literal>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"This option controls the snapshot chosen for archives with "
+"<literal>Snapshot: enable</literal> in the source entry. For example, "
+"<option>-S 20220102T030405Z</option> selects a snapshot from January 2nd, "
+"2022 at 03:04:05 UTC.  Configuration Item: <literal>APT::Snapshot</literal>; "
+"see also the &sources-list; manual page."
+msgstr ""
+
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -2217,6 +2227,27 @@ msgstr ""
 msgid "Fail the update command if any error occured, even a transient one."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Run the <option>update</option> command before the specified command. This "
+"is supported for commands installing, removing, or upgrading packages such "
+"as <option>install</option>, <option>remove</option>, <option>safe-upgrade</"
+"option>, <option>full-upgrade</option>.  This can be useful to ensure a "
+"command always installs the latest versions, or, in combination with the "
+"<option>--snapshot</option> option to make sure the snapshot is present when "
+"install is being run."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Caveat: Due to technical limitations, locks are acquired individually for "
+"each phase, hence an install may fail to acquire locks after successfully "
+"executing the update. Until this is resolved, this is merely syntactic sugar "
+"for <literal>apt update &amp;&amp; apt install</literal>"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml apt_auth.conf.5.xml
@@ -4511,6 +4542,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"Snapshot to use for all repositories configured with <literal>Snapshot: yes</"
+"literal>. See also &sources-list;, the <option>--snapshot</option> option "
+"that sets this value, and <option>Acquire::Snapshots::URI</option> below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
@@ -5079,6 +5118,26 @@ msgid ""
 "available in this case."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Like changelogs, snapshots can only be acquired if an URI is known from "
+"where to get them.  Preferable the Release file indicates this in a "
+"'Snapshots' field. If this isn't available the Label/Origin field of the "
+"Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
+"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
+"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
+"if so this value is taken. The value in the Release file can be overridden "
+"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a directory, except that the snapshot ID replaced with the "
+"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source cannot be "
+"used to acquire snapshots from. Another source will be tried if available in "
+"this case."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 #, fuzzy
@@ -7820,6 +7879,35 @@ msgid ""
 "<filename>Release</filename> files will be disabled."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Snapshot</option> (<option>snapshot</option>)  allows selecting an "
+"earlier version of the archive from the snapshot service. Supported values "
+"are:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<literal>enable</literal> to allow selecting a snapshot with the <option>--"
+"snapshot</option> option, or"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid "a snapshot ID to select a specific snapshot."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Snapshot IDs are usually timestamps in the form of "
+"<literal>YYYYMMDDTHHMMSSZ</literal>, such as <literal>20220102T030405Z</"
+"literal> which is the January 2nd, 2022 at 03:04:05 UTC, servers may however "
+"support additional types of IDs, and APT does not perform any checks so far."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 #, fuzzy
diff --git a/doc/po/pt.po b/doc/po/pt.po
index bac974e80..30b187a80 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.4.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-02-08 17:09+0100\n"
+"POT-Creation-Date: 2023-05-02 14:45+0000\n"
 "PO-Revision-Date: 2022-05-19 23:40+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -1969,6 +1969,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"This option controls the snapshot chosen for archives with "
+"<literal>Snapshot: enable</literal> in the source entry. For example, "
+"<option>-S 20220102T030405Z</option> selects a snapshot from January 2nd, "
+"2022 at 03:04:05 UTC.  Configuration Item: <literal>APT::Snapshot</literal>; "
+"see also the &sources-list; manual page."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
 "overrides the general settings in <filename>/etc/apt/preferences</"
@@ -2203,6 +2213,27 @@ msgstr ""
 "Falha o comando de actualização se ocorrer qualquer erro, mesmo sendo um "
 "transitório."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Run the <option>update</option> command before the specified command. This "
+"is supported for commands installing, removing, or upgrading packages such "
+"as <option>install</option>, <option>remove</option>, <option>safe-upgrade</"
+"option>, <option>full-upgrade</option>.  This can be useful to ensure a "
+"command always installs the latest versions, or, in combination with the "
+"<option>--snapshot</option> option to make sure the snapshot is present when "
+"install is being run."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Caveat: Due to technical limitations, locks are acquired individually for "
+"each phase, hence an install may fail to acquire locks after successfully "
+"executing the update. Until this is resolved, this is merely syntactic sugar "
+"for <literal>apt update &amp;&amp; apt install</literal>"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml apt_auth.conf.5.xml
@@ -4564,6 +4595,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"Snapshot to use for all repositories configured with <literal>Snapshot: yes</"
+"literal>. See also &sources-list;, the <option>--snapshot</option> option "
+"that sets this value, and <option>Acquire::Snapshots::URI</option> below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
@@ -5443,6 +5482,76 @@ msgstr ""
 "ser usada para adquirir ficheiros changelog a partir dela. Neste caso será "
 "tentada outra fonte se estiver disponível."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Acquiring changelogs can only be done if an URI is known from where to "
+#| "get them.  Preferable the Release file indicates this in a 'Changelogs' "
+#| "field. If this isn't available the Label/Origin field of the Release file "
+#| "is used to check if a <literal>Acquire::Changelogs::URI::Label::"
+#| "<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
+#| "option exists and if so this value is taken. The value in the Release "
+#| "file can be overridden with <literal>Acquire::Changelogs::URI::Override::"
+#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
+#| "Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
+#| "literal>.  The value should be a normal URI to a text file, except that "
+#| "package specific data is replaced with the placeholder "
+#| "<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package "
+#| "is from a component (e.g. <literal>main</literal>)  this is the first "
+#| "part otherwise it is omitted, 2. the first letter of source package name, "
+#| "except if the source package name starts with '<literal>lib</literal>' in "
+#| "which case it will be the first four letters. 3. The complete source "
+#| "package name. 4. the complete name again and 5. the source version.  The "
+#| "first (if present), second, third and fourth part are separated by a "
+#| "slash ('<literal>/</literal>')  and between the fourth and fifth part is "
+#| "an underscore ('<literal>_</literal>').  The special value '<literal>no</"
+#| "literal>' is available for this option indicating that this source can't "
+#| "be used to acquire changelog files from. Another source will be tried if "
+#| "available in this case."
+msgid ""
+"Like changelogs, snapshots can only be acquired if an URI is known from "
+"where to get them.  Preferable the Release file indicates this in a "
+"'Snapshots' field. If this isn't available the Label/Origin field of the "
+"Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
+"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
+"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
+"if so this value is taken. The value in the Release file can be overridden "
+"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a directory, except that the snapshot ID replaced with the "
+"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source cannot be "
+"used to acquire snapshots from. Another source will be tried if available in "
+"this case."
+msgstr ""
+"Adquirir changelogs só pode ser feito se for conhecido um URL de onde os "
+"obter. De preferência o ficheiro Release indica isto num campo 'Changelogs'. "
+"Se isto não estiver disponível, é usado o campo Label/Origin do ficheiro "
+"Release para verificar se uma opção <literal>Acquire::Changelogs::URI::"
+"Label::<replaceable>LABEL</replaceable></literal> ou <literal>Acquire::"
+"Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> existem "
+"e se sim é utilizado este valor. Este valor no ficheiro Release pode ser "
+"sobreposto com <literal>Acquire::Changelogs::URI::Override::Label::"
+"<replaceable>LABEL</replaceable></literal> ou <literal>Acquire::Changelogs::"
+"URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>. O valor "
+"deve ser um URI normal para um ficheiro de texto, excepto se os dados desse "
+"pacote específico for substituído pelo marcador de posição "
+"<literal>@CHANGEPATH@</literal>. O valor para isto é: 1. se o pacote "
+"pertence a um componente (ex. <literal>main</literal>) esta é a primeira "
+"parte, caso contrário é omitida. 2. a primeira letra do nome do pacote "
+"fonte, excepto se o nome do pacote fonte começar com '<literal>lib</"
+"literal>' e neste caso será as primeiras quatro letras. 3. O nome completo "
+"do pacote fonte. 4. O nome completo outra vez e 5. a versão da fonte. A "
+"primeira (se presente), segunda, terceira e quarta partes são separadas por "
+"uma barra ('<literal>/</literal>') e entre a quarta e quinta partes fica um "
+"underscore ('<literal>_</literal>'). O valor especial '<literal>no</"
+"literal>' está disponível para esta opção e indica que esta fonte não pode "
+"ser usada para adquirir ficheiros changelog a partir dela. Neste caso será "
+"tentada outra fonte se estiver disponível."
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Binary specific configuration"
@@ -8555,6 +8664,35 @@ msgstr ""
 "tentado o caminho especificado em vez do ficheiro InRelease, e o recurso a "
 "ficheiros <filename>Release</filename> será desactivado."
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Snapshot</option> (<option>snapshot</option>)  allows selecting an "
+"earlier version of the archive from the snapshot service. Supported values "
+"are:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<literal>enable</literal> to allow selecting a snapshot with the <option>--"
+"snapshot</option> option, or"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid "a snapshot ID to select a specific snapshot."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Snapshot IDs are usually timestamps in the form of "
+"<literal>YYYYMMDDTHHMMSSZ</literal>, such as <literal>20220102T030405Z</"
+"literal> which is the January 2nd, 2022 at 03:04:05 UTC, servers may however "
+"support additional types of IDs, and APT does not perform any checks so far."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "URI Specification"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index e20334821..46d7c0e2b 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-02-08 17:09+0100\n"
+"POT-Creation-Date: 2023-05-02 14:45+0000\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"
@@ -1379,6 +1379,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
 msgid ""
+"This option controls the snapshot chosen for archives with "
+"<literal>Snapshot: enable</literal> in the source entry. For example, "
+"<option>-S 20220102T030405Z</option> selects a snapshot from January 2nd, "
+"2022 at 03:04:05 UTC.  Configuration Item: <literal>APT::Snapshot</literal>; "
+"see also the &sources-list; manual page."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
 "overrides the general settings in <filename>/etc/apt/preferences</"
@@ -1530,6 +1540,27 @@ msgstr ""
 msgid "Fail the update command if any error occured, even a transient one."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Run the <option>update</option> command before the specified command. This "
+"is supported for commands installing, removing, or upgrading packages such "
+"as <option>install</option>, <option>remove</option>, <option>safe-upgrade</"
+"option>, <option>full-upgrade</option>.  This can be useful to ensure a "
+"command always installs the latest versions, or, in combination with the "
+"<option>--snapshot</option> option to make sure the snapshot is present when "
+"install is being run."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Caveat: Due to technical limitations, locks are acquired individually for "
+"each phase, hence an install may fail to acquire locks after successfully "
+"executing the update. Until this is resolved, this is merely syntactic sugar "
+"for <literal>apt update &amp;&amp; apt install</literal>"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
 #: apt_preferences.5.xml apt_auth.conf.5.xml
@@ -3193,6 +3224,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"Snapshot to use for all repositories configured with <literal>Snapshot: yes</"
+"literal>. See also &sources-list;, the <option>--snapshot</option> option "
+"that sets this value, and <option>Acquire::Snapshots::URI</option> below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
@@ -3760,6 +3799,26 @@ msgid ""
 "available in this case."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Like changelogs, snapshots can only be acquired if an URI is known from "
+"where to get them.  Preferable the Release file indicates this in a "
+"'Snapshots' field. If this isn't available the Label/Origin field of the "
+"Release file is used to check if a <literal>Acquire::Snapshots::URI::Label::"
+"<replaceable>LABEL</replaceable></literal> or <literal>Acquire::Snapshots::"
+"URI::Origin::<replaceable>ORIGIN</replaceable></literal> option exists and "
+"if so this value is taken. The value in the Release file can be overridden "
+"with <literal>Acquire::Snapshots::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Snapshots::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a directory, except that the snapshot ID replaced with the "
+"placeholder <literal>@SNAPSHOTID</literal>.  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source cannot be "
+"used to acquire snapshots from. Another source will be tried if available in "
+"this case."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml
 msgid "Binary specific configuration"
@@ -6321,6 +6380,35 @@ msgid ""
 "<filename>Release</filename> files will be disabled."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Snapshot</option> (<option>snapshot</option>)  allows selecting an "
+"earlier version of the archive from the snapshot service. Supported values "
+"are:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<literal>enable</literal> to allow selecting a snapshot with the <option>--"
+"snapshot</option> option, or"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid "a snapshot ID to select a specific snapshot."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Snapshot IDs are usually timestamps in the form of "
+"<literal>YYYYMMDDTHHMMSSZ</literal>, such as <literal>20220102T030405Z</"
+"literal> which is the January 2nd, 2022 at 03:04:05 UTC, servers may however "
+"support additional types of IDs, and APT does not perform any checks so far."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml
 msgid "URI Specification"
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 1c7285d62..e6ac4f792 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.6.0\n"
+"Project-Id-Version: apt 2.7.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-03-06 12:29+0000\n"
+"POT-Creation-Date: 2023-05-02 14:45+0000\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"