From 1eb1836f4b5397497bd34f0cf516e6e4e73117bf Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 15 Jun 2015 16:41:43 +0200
Subject: show item ID in Hit, Ign and Err lines as well

Again, consistency is the main sellingpoint here, but this way it is now
also easier to explain that some files move through different stages and
lines are printed for them hence multiple times: That is a bit hard to
believe if the number is changing all the time, but now that it keeps
consistent.
---
 po/fr.po | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'po/fr.po')

diff --git a/po/fr.po b/po/fr.po
index cb9d82856..ecb752f5e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1774,20 +1774,24 @@ msgid "Full Text Search"
 msgstr "Recherche en texte intégral"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atteint "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Atteint:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Réception de : "
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Réception de:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ign:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Err:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format
-- 
cgit v1.2.3


From a0c19a217ca2ed38ae0ecb4b8d2d4f8c4e53289f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 12 Jul 2015 13:41:12 +0200
Subject: implement a more generic ShowList method

apt-get is displaying various lists of package names, which until now it
was building as a string before passing it to ShowList, which inserted
linebreaks at fitting points and showed a title if needed, but it never
really understood what it was working with. With the help of C++11 the
new generic knows not only what it works with, but generates the list on
the fly rather than asking for it and potentially discarding parts of
the input (= the non-default verbose display). It also doubles as a test
for how usable the CacheSets are with C++11.

(Not all callers are adapted yet.)

Git-Dch: Ignore
---
 po/fr.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'po/fr.po')

diff --git a/po/fr.po b/po/fr.po
index ecb752f5e..0a437907f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1328,8 +1328,8 @@ msgstr "Les paquets retenus suivants seront changés :"
 
 #: apt-private/private-output.cc:688
 #, c-format
-msgid "%s (due to %s) "
-msgstr "%s (en raison de %s) "
+msgid "%s (due to %s)"
+msgstr "%s (en raison de %s)"
 
 #: apt-private/private-output.cc:696
 msgid ""
-- 
cgit v1.2.3


From 26677b9c25b318c291d778eec758a06471fcba26 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 11 Aug 2015 17:41:27 +0200
Subject: po-fixups: fill Project-Id-Version and Encoding correctly

Closes: 612996
---
 po/fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'po/fr.po')

diff --git a/po/fr.po b/po/fr.po
index 0a437907f..0e3ae69b1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 # Julien Patriarca <leatherface@debian.org>, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: fr\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2013-12-15 16:45+0100\n"
-- 
cgit v1.2.3


From dd14b7a562c54bb9ce551da1f8a80c78da5a4b6e Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Fri, 14 Aug 2015 10:02:08 +0200
Subject: po/fr.po: Remove the unbreakable space before ! in the confirm string

This was probably really annoying for French people wanting to remove
essential packages, sorry about that.

Closes: #727680
---
 po/fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'po/fr.po')

diff --git a/po/fr.po b/po/fr.po
index 0a437907f..2d28ab42b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1507,7 +1507,7 @@ msgstr ""
 #. careful with hard to type or special characters (like non-breaking spaces)
 #: apt-private/private-install.cc:195
 msgid "Yes, do as I say!"
-msgstr "Oui, faites ce que je vous dis !"
+msgstr "Oui, faites ce que je vous dis !"
 
 #: apt-private/private-install.cc:197
 #, c-format
-- 
cgit v1.2.3