Merging upstream version 2.7.14.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 38 insertions, 24 deletions

diff --git a/doc/po/fr.po b/doc/po/fr.po
index 48218a5..f5dd8cb 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: 2024-02-20 18:39+0000\n"
+"POT-Creation-Date: 2024-03-22 10:14+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"
@@ -64,7 +64,7 @@ msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -75,7 +75,7 @@ msgstr ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bogues</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT</ulink>. \n"
+"   <para><ulink url='https://bugs.debian.org/src:apt'>Page des bogues d'APT</ulink>. \n"
 "   Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utiliser\n"
 "   la commande &reportbug;.\n"
@@ -719,6 +719,13 @@ msgstr ""
 "réalisée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml apt-get.8.xml
+msgid ""
+"When a package is supplied as an argument, the package will be installed "
+"prior to the upgrade action."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
@@ -2625,15 +2632,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>dotty</literal> takes a list of packages on the command line and "
+#| "generates output suitable for use by dotty from the <ulink url=\"http://"
+#| "www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The "
+#| "result will be a set of nodes and edges representing the relationships "
+#| "between the packages. By default the given packages will trace out all "
+#| "dependent packages; this can produce a very large graph.  To limit the "
+#| "output to only the packages listed on the command line, set the "
+#| "<literal>APT::Cache::GivenOnly</literal> option."
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
+"generates output suitable for use by dotty from the <ulink url=\"https://"
+"graphviz.org/\">GraphViz</ulink> package. The result will be a set of nodes "
+"and edges representing the relationships between the packages. By default "
+"the given packages will trace out all dependent packages; this can produce a "
+"very large graph.  To limit the output to only the packages listed on the "
+"command line, set the <literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 "La commande <literal>dotty</literal> prend une liste de paquets sur la ligne "
 "de commande et affiche une sortie appropriée à une utilisation par la "
@@ -2671,12 +2687,12 @@ msgstr ""
 #: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 msgstr ""
 "Identique à <literal>dotty</literal>, mais réservé à xvcg fourni avec <ulink "
-"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
-"ulink>."
+"url=\"https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1."
+"html\">VCG tool</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml
@@ -6239,13 +6255,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
-"Décrit le processus de résolution des dépendances pour la construction de "
-"paquets source ( « build-dependencies » ) par &apt-get;."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -14000,6 +14009,11 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
+#~ msgid "Describes the process of resolving build-dependencies in &apt-get;."
+#~ msgstr ""
+#~ "Décrit le processus de résolution des dépendances pour la construction de "
+#~ "paquets source ( « build-dependencies » ) par &apt-get;."
+
 #~ msgid "Regular expressions and &glob; syntax"
 #~ msgstr "Expressions régulières et syntaxe &glob;"
 
@@ -14665,11 +14679,11 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ msgstr "Cette page de manuel n'a même pas commencé à être rédigée."
 
 #~ msgid ""
-#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+#~ "See E<lt>https://bugs.debian.org/aptE<gt>.  If you wish to report a bug "
+#~ "in B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
 #~ "B<reportbug>(1)  command."
 #~ msgstr ""
-#~ "Voir E<lt>http://bugs.debian.org/aptE<gt>. Si vous souhaitez signaler un "
+#~ "Voir E<lt>https://bugs.debian.org/aptE<gt>. Si vous souhaitez signaler un "
 #~ "bogue dans B<apt>, veuillez lire I</usr/share/doc/debian/bug-reporting."
 #~ "txt> ou utiliser la commande B<reportbug>(1)."