Merge remote-tracking branch 'upstream/debian/experimental' into feature/srv-records

1 files changed, 13 insertions, 9 deletions

diff --git a/po/apt-all.pot b/po/apt-all.pot
index b68d801ea..4a70213f4 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -200,7 +200,7 @@ msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
 #: cmdline/apt-cdrom.cc:92
-msgid "Please insert a Disc in the drive and press enter"
+msgid "Please insert a Disc in the drive and press [Enter]"
 msgstr ""
 
 #: cmdline/apt-cdrom.cc:140
@@ -1135,7 +1135,7 @@ msgstr ""
 
 #: apt-private/private-output.cc:688
 #, c-format
-msgid "%s (due to %s) "
+msgid "%s (due to %s)"
 msgstr ""
 
 #: apt-private/private-output.cc:696
@@ -1529,19 +1529,23 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
+#, c-format
+msgid "Hit:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
+#, c-format
+msgid "Get:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
+#, c-format
+msgid "Ign:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
+#, c-format
+msgid "Err:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:150
@@ -1559,7 +1563,7 @@ msgstr ""
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
-"in the drive '%s' and press enter\n"
+"in the drive '%s' and press [Enter]\n"
 msgstr ""
 
 #. Only warn if there are no sources.list.d.
@@ -1619,7 +1623,7 @@ msgstr ""
 
 #: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
 #: dselect/install:106 dselect/update:45
-msgid "Press enter to continue."
+msgid "Press [Enter] to continue."
 msgstr ""
 
 #: dselect/install:92
@@ -2053,7 +2057,7 @@ msgstr ""
 
 #: apt-pkg/acquire-worker.cc:485
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
 msgstr ""
 
 #: apt-pkg/cachefile.cc:94