diff -Nru apt-1.5~rc4/apt-pkg/deb/debmetaindex.cc apt-1.5/apt-pkg/deb/debmetaindex.cc
--- apt-1.5~rc4/apt-pkg/deb/debmetaindex.cc	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/apt-pkg/deb/debmetaindex.cc	2017-09-24 15:54:41.000000000 +0000
@@ -275,12 +275,14 @@
 		     if (dup != IndexTargets.end())
 		     {
 			std::string const dupEntry = dup->Option(IndexTarget::SOURCESENTRY);
-			//TRANSLATOR: an identifier like Packages; Releasefile key indicating
-			// a file like main/binary-amd64/Packages; filename and linenumber of
-			// two sources.list entries
 			if (T->find("legacy") == std::string::npos)
+			{
+			   //TRANSLATOR: an identifier like Packages; Releasefile key indicating
+			   // a file like main/binary-amd64/Packages; filename and linenumber of
+			   // two sources.list entries
 			   _error->Warning(_("Target %s (%s) is configured multiple times in %s and %s"),
 					   T->c_str(), MetaKey.c_str(), dupEntry.c_str(), E->sourcesEntry.c_str());
+			}
 			if (tplMetaKey.find(BreakPoint) == std::string::npos)
 			   break;
 			continue;
diff -Nru apt-1.5~rc4/CMakeLists.txt apt-1.5/CMakeLists.txt
--- apt-1.5~rc4/CMakeLists.txt	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/CMakeLists.txt	2017-09-24 15:54:41.000000000 +0000
@@ -187,7 +187,7 @@
 # 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 "1.5~rc4")
+set(PACKAGE_VERSION "1.5")
 
 if (NOT DEFINED DPKG_DATADIR)
   execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff -Nru apt-1.5~rc4/debian/changelog apt-1.5/debian/changelog
--- apt-1.5~rc4/debian/changelog	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/debian/changelog	2017-09-24 15:54:41.000000000 +0000
@@ -1,3 +1,9 @@
+apt (1.5) unstable; urgency=medium
+
+  * Fix translator comment location for legacy target warning
+
+ -- Julian Andres Klode <jak@debian.org>  Sun, 24 Sep 2017 17:54:41 +0200
+
 apt (1.5~rc4) unstable; urgency=medium
 
   * apt-daily: Do not Wants=network-online, and add some more After=
diff -Nru apt-1.5~rc4/doc/apt-verbatim.ent apt-1.5/doc/apt-verbatim.ent
--- apt-1.5~rc4/doc/apt-verbatim.ent	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/doc/apt-verbatim.ent	2017-09-24 15:54:41.000000000 +0000
@@ -245,7 +245,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.5~rc4">
+<!ENTITY apt-product-version "1.5">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "jessie">
diff -Nru apt-1.5~rc4/doc/po/apt-doc.pot apt-1.5/doc/po/apt-doc.pot
--- apt-1.5~rc4/doc/po/apt-doc.pot	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/doc/po/apt-doc.pot	2017-09-24 15:54:41.000000000 +0000
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 1.5~rc4\n"
+"Project-Id-Version: apt-doc 1.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-13 16:03+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\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"
diff -Nru apt-1.5~rc4/po/apt-all.pot apt-1.5/po/apt-all.pot
--- apt-1.5~rc4/po/apt-all.pot	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/apt-all.pot	2017-09-24 15:54:41.000000000 +0000
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.5~rc4\n"
+"Project-Id-Version: apt 1.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-13 16:03+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\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"
@@ -986,6 +986,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/ar.po apt-1.5/po/ar.po
--- apt-1.5~rc4/po/ar.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/ar.po	2017-09-24 15:54:41.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -997,6 +997,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/ast.po apt-1.5/po/ast.po
--- apt-1.5~rc4/po/ast.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/ast.po	2017-09-24 15:54:41.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2010-10-02 23:35+0100\n"
 "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
 "Language-Team: Asturian (ast)\n"
@@ -1019,6 +1019,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/bg.po apt-1.5/po/bg.po
--- apt-1.5~rc4/po/bg.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/bg.po	2017-09-24 15:54:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2012-06-25 17:23+0300\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -1035,6 +1035,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/bs.po apt-1.5/po/bs.po
--- apt-1.5~rc4/po/bs.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/bs.po	2017-09-24 15:54:41.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -994,6 +994,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/ca.po apt-1.5/po/ca.po
--- apt-1.5~rc4/po/ca.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/ca.po	2017-09-24 15:54:41.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.4~beta1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2016-12-05 21:09+0100\n"
 "Last-Translator: Oriol Debian <oriol.debian@gmail.com>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -1072,6 +1072,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "L'objectiu %s vol obtenir el mateix fitxer (%s) que %s de l'origen %s"
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/cs.po apt-1.5/po/cs.po
--- apt-1.5~rc4/po/cs.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/cs.po	2017-09-24 15:54:41.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.4.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2017-05-06 11:08+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -1041,6 +1041,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "Cíl %s chce stáhnout stejný soubor (%s) jako %s ze zdroje %s"
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/cy.po apt-1.5/po/cy.po
--- apt-1.5~rc4/po/cy.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/cy.po	2017-09-24 15:54:41.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -1021,6 +1021,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/da.po apt-1.5/po/da.po
--- apt-1.5~rc4/po/da.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/da.po	2017-09-24 15:54:41.000000000 +0000
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.4~rc2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2017-03-02 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -1049,6 +1049,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "Målet %s ønsker at erhverve den samme fil (%s) som %s fra kilden %s"
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/de.po apt-1.5/po/de.po
--- apt-1.5~rc4/po/de.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/de.po	2017-09-24 15:54:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2014-09-19 13:04+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -1048,6 +1048,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/dz.po apt-1.5/po/dz.po
--- apt-1.5~rc4/po/dz.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/dz.po	2017-09-24 15:54:41.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
 "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -1006,6 +1006,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/el.po apt-1.5/po/el.po
--- apt-1.5~rc4/po/el.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/el.po	2017-09-24 15:54:41.000000000 +0000
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -1024,6 +1024,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/es.po apt-1.5/po/es.po
--- apt-1.5~rc4/po/es.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/es.po	2017-09-24 15:54:41.000000000 +0000
@@ -34,7 +34,7 @@
 msgstr ""
 "Project-Id-Version: apt 0.8.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2016-01-26 01:51+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"
@@ -1136,6 +1136,9 @@
 msgstr ""
 "El objetivo %s quiere obtener el mismo fichero (%s) que %s del origen %s"
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/eu.po apt-1.5/po/eu.po
--- apt-1.5~rc4/po/eu.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/eu.po	2017-09-24 15:54:41.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2009-05-17 00:41+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -1009,6 +1009,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/fi.po apt-1.5/po/fi.po
--- apt-1.5~rc4/po/fi.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/fi.po	2017-09-24 15:54:41.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2008-12-11 14:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -1003,6 +1003,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/fr.po apt-1.5/po/fr.po
--- apt-1.5~rc4/po/fr.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/fr.po	2017-09-24 15:54:41.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2013-12-15 16:45+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1054,6 +1054,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/gl.po apt-1.5/po/gl.po
--- apt-1.5~rc4/po/gl.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/gl.po	2017-09-24 15:54:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2011-05-12 15:28+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
@@ -1037,6 +1037,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/hu.po apt-1.5/po/hu.po
--- apt-1.5~rc4/po/hu.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/hu.po	2017-09-24 15:54:41.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2016-04-10 19:46+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@ubuntu.com>\n"
 "Language-Team: Hungarian <gnome-hu-list@gnome.org>\n"
@@ -1066,6 +1066,9 @@
 "%s cél ugyanazt a fájlt (%s) próbálja meg beszerezni, mint %s ebből a "
 "forrásból: %s"
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/it.po apt-1.5/po/it.po
--- apt-1.5~rc4/po/it.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/it.po	2017-09-24 15:54:41.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2015-04-07 16:51+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1049,6 +1049,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/ja.po apt-1.5/po/ja.po
--- apt-1.5~rc4/po/ja.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/ja.po	2017-09-24 15:54:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\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"
@@ -1064,6 +1064,9 @@
 "ターゲット %1$s はソース %4$s から %3$s と同じファイル (%2$s) の取得を求めて"
 "います"
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/km.po apt-1.5/po/km.po
--- apt-1.5~rc4/po/km.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/km.po	2017-09-24 15:54:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -1004,6 +1004,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/ko.po apt-1.5/po/ko.po
--- apt-1.5~rc4/po/ko.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/ko.po	2017-09-24 15:54:41.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2010-08-30 02:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -1005,6 +1005,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/ku.po apt-1.5/po/ku.po
--- apt-1.5~rc4/po/ku.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/ku.po	2017-09-24 15:54:41.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2008-05-08 12:48+0200\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -997,6 +997,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/lt.po apt-1.5/po/lt.po
--- apt-1.5~rc4/po/lt.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/lt.po	2017-09-24 15:54:41.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2008-08-02 01:47-0400\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -999,6 +999,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/mr.po apt-1.5/po/mr.po
--- apt-1.5~rc4/po/mr.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/mr.po	2017-09-24 15:54:41.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2008-11-20 23:27+0530\n"
 "Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -1002,6 +1002,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/nb.po apt-1.5/po/nb.po
--- apt-1.5~rc4/po/nb.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/nb.po	2017-09-24 15:54:41.000000000 +0000
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2016-06-11 22:38+0200\n"
 "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -1022,6 +1022,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/ne.po apt-1.5/po/ne.po
--- apt-1.5~rc4/po/ne.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/ne.po	2017-09-24 15:54:41.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2006-06-12 14:35+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -1000,6 +1000,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/nl.po apt-1.5/po/nl.po
--- apt-1.5~rc4/po/nl.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/nl.po	2017-09-24 15:54:41.000000000 +0000
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.4~beta4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2017-08-12 16:38+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1082,6 +1082,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "Doel %s wil hetzelfde bestand (%s) als %s uit pakketbron %s opvragen"
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/nn.po apt-1.5/po/nn.po
--- apt-1.5~rc4/po/nn.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/nn.po	2017-09-24 15:54:41.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -1008,6 +1008,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/pl.po apt-1.5/po/pl.po
--- apt-1.5~rc4/po/pl.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/pl.po	2017-09-24 15:54:41.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2012-07-28 21:53+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -1037,6 +1037,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/pt_BR.po apt-1.5/po/pt_BR.po
--- apt-1.5~rc4/po/pt_BR.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/pt_BR.po	2017-09-24 15:54:41.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2008-11-17 02:33-0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -1011,6 +1011,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/pt.po apt-1.5/po/pt.po
--- apt-1.5~rc4/po/pt.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/pt.po	2017-09-24 15:54:41.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2012-06-29 15:45+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1041,6 +1041,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/ro.po apt-1.5/po/ro.po
--- apt-1.5~rc4/po/ro.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/ro.po	2017-09-24 15:54:41.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2008-11-15 02:21+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -1015,6 +1015,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/ru.po apt-1.5/po/ru.po
--- apt-1.5~rc4/po/ru.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/ru.po	2017-09-24 15:54:41.000000000 +0000
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.2.12\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2017-07-01 16:05+0300\n"
 "Last-Translator: Aleksej Shilin <rootlexx@mail.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1071,6 +1071,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "Для цели %s нужно получить такой же файл (%s) как %s из источника %s"
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/sk.po apt-1.5/po/sk.po
--- apt-1.5~rc4/po/sk.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/sk.po	2017-09-24 15:54:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2012-06-28 20:49+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -1021,6 +1021,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/sl.po apt-1.5/po/sl.po
--- apt-1.5~rc4/po/sl.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/sl.po	2017-09-24 15:54:41.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2012-06-27 21:29+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -1019,6 +1019,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/sv.po apt-1.5/po/sv.po
--- apt-1.5~rc4/po/sv.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/sv.po	2017-09-24 15:54:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2015-08-19 21:33+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -1035,6 +1035,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/th.po apt-1.5/po/th.po
--- apt-1.5~rc4/po/th.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/th.po	2017-09-24 15:54:41.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2014-12-12 13:00+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -1004,6 +1004,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/tl.po apt-1.5/po/tl.po
--- apt-1.5~rc4/po/tl.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/tl.po	2017-09-24 15:54:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2007-03-29 21:36+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -1020,6 +1020,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/tr.po apt-1.5/po/tr.po
--- apt-1.5~rc4/po/tr.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/tr.po	2017-09-24 15:54:41.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2016-09-24 03:24+0300\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
 "Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -1060,6 +1060,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "%s hedefi aynı dosyayı (%s) %s olarak %s kaynağından almak istiyor"
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/uk.po apt-1.5/po/uk.po
--- apt-1.5~rc4/po/uk.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/uk.po	2017-09-24 15:54:41.000000000 +0000
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2012-09-25 20:19+0300\n"
 "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"
@@ -1038,6 +1038,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/vi.po apt-1.5/po/vi.po
--- apt-1.5~rc4/po/vi.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/vi.po	2017-09-24 15:54:41.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2014-09-12 13:48+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -1028,6 +1028,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/zh_CN.po apt-1.5/po/zh_CN.po
--- apt-1.5~rc4/po/zh_CN.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/zh_CN.po	2017-09-24 15:54:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.5.x\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2017-07-04 03:00+0000\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -1014,6 +1014,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "目标 %1$s 想要捕获与 %3$s (来自软件源 %4$s) 相同的文件 (%2$s)"
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
diff -Nru apt-1.5~rc4/po/zh_TW.po apt-1.5/po/zh_TW.po
--- apt-1.5~rc4/po/zh_TW.po	2017-09-13 14:02:30.000000000 +0000
+++ apt-1.5/po/zh_TW.po	2017-09-24 15:54:41.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: apt 1.2.X\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-09 21:47+0200\n"
+"POT-Creation-Date: 2017-09-24 17:54+0200\n"
 "PO-Revision-Date: 2009-01-28 10:41+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -1002,6 +1002,9 @@
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"