summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/apt-all.pot30
-rw-r--r--po/ar.po28
-rw-r--r--po/ast.po28
-rw-r--r--po/bg.po28
-rw-r--r--po/bs.po28
-rw-r--r--po/ca.po28
-rw-r--r--po/cs.po28
-rw-r--r--po/cy.po28
-rw-r--r--po/da.po28
-rw-r--r--po/de.po28
-rw-r--r--po/dz.po28
-rw-r--r--po/el.po28
-rw-r--r--po/es.po29
-rw-r--r--po/eu.po28
-rw-r--r--po/fi.po28
-rw-r--r--po/fr.po28
-rw-r--r--po/gl.po28
-rw-r--r--po/hu.po30
-rw-r--r--po/it.po28
-rw-r--r--po/ja.po23
-rw-r--r--po/km.po28
-rw-r--r--po/ko.po28
-rw-r--r--po/ku.po28
-rw-r--r--po/lt.po28
-rw-r--r--po/mr.po28
-rw-r--r--po/nb.po28
-rw-r--r--po/ne.po28
-rw-r--r--po/nl.po29
-rw-r--r--po/nn.po28
-rw-r--r--po/pl.po28
-rw-r--r--po/pt.po28
-rw-r--r--po/pt_BR.po28
-rw-r--r--po/ro.po28
-rw-r--r--po/ru.po67
-rw-r--r--po/sk.po28
-rw-r--r--po/sl.po28
-rw-r--r--po/sv.po28
-rw-r--r--po/th.po28
-rw-r--r--po/tl.po28
-rw-r--r--po/tr.po28
-rw-r--r--po/uk.po28
-rw-r--r--po/vi.po28
-rw-r--r--po/zh_CN.po28
-rw-r--r--po/zh_TW.po28
44 files changed, 943 insertions, 329 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 122b3e8df..d93ba0461 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 1.3~exp1\n"
+"Project-Id-Version: apt 1.3~exp2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1809,6 +1809,20 @@ msgstr ""
msgid "Merging available information"
msgstr ""
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
#: cmdline/apt-extracttemplates.cc
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -2786,11 +2800,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr ""
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3015,6 +3024,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3080,7 +3094,7 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index ba441c0de..004bb5af6 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1861,6 +1861,20 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها
msgid "Merging available information"
msgstr "دمج المعلومات المتوفرة"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
#: cmdline/apt-extracttemplates.cc
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -2844,11 +2858,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr ""
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3076,6 +3085,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3141,7 +3155,7 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "فشل إغلاق الملف %s"
diff --git a/po/ast.po b/po/ast.po
index d57f9956b..77eaf36cc 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1897,6 +1897,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Fusionando información disponible"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Esperaba %s pero nun taba ellí"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2969,11 +2983,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Esperaba %s pero nun taba ellí"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3203,6 +3212,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3272,7 +3286,7 @@ msgstr "Executando activador de post-instalación de %s"
msgid "Directory '%s' missing"
msgstr "Falta'l direutoriu '%s'."
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Nun pudo abrise'l ficheru '%s'"
diff --git a/po/bg.po b/po/bg.po
index 44777b55a..290b14438 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1918,6 +1918,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Смесване на наличната информация"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Изчака се завършването на %s, но той не беше пуснат"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3004,11 +3018,6 @@ msgid ""
msgstr ""
"Пропускане на файла „%s“ в директорията „%s“, понеже разширението му е грешно"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Изчака се завършването на %s, но той не беше пуснат"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3240,6 +3249,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3311,7 +3325,7 @@ msgstr "Изпълнение на тригер след инсталиране %
msgid "Directory '%s' missing"
msgstr "Директорията „%s“ липсва"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Неуспех при отваряне на файла „%s“"
diff --git a/po/bs.po b/po/bs.po
index 71a61867a..e31caa46f 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1843,6 +1843,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Sastavljam dostupne informacije"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
#: cmdline/apt-extracttemplates.cc
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -2826,11 +2840,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr ""
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3058,6 +3067,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3123,7 +3137,7 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Ne mogu otvoriti %s"
diff --git a/po/ca.po b/po/ca.po
index d49f1216a..9328f5891 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.6\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+0200\n"
"PO-Revision-Date: 2012-10-19 13:30+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -1923,6 +1923,20 @@ msgstr ""
msgid "Merging available information"
msgstr "S'està fusionant la informació disponible"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Esperava %s però no hi era"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3008,11 +3022,6 @@ msgstr ""
"S'està descartant «%s» al directori «%s» perquè té una extensió del nom de "
"fitxer invàlida"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Esperava %s però no hi era"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3243,6 +3252,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3312,7 +3326,7 @@ msgstr "S'està executant l'activador de postinstaŀlació %s"
msgid "Directory '%s' missing"
msgstr "Manca el directori «%s»"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "No s'ha pogut obrir el fitxer «%s»"
diff --git a/po/cs.po b/po/cs.po
index d5d1a59e2..6ed4b6f40 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+0200\n"
"PO-Revision-Date: 2015-08-29 15:24+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -1910,6 +1910,20 @@ msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalova
msgid "Merging available information"
msgstr "Slučují se dostupné informace"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Čekali jsme na %s, ale nebyl tam"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2978,11 +2992,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož má neplatnou příponu"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Čekali jsme na %s, ale nebyl tam"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3211,6 +3220,11 @@ msgstr "Pro volbu %s byly nastaveny kolidující hodnoty zdroje %s %s"
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr "Pro volbu %s byla nastavena kolidující hodnota zdroje %s %s (%s)"
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr "Pro volbu %s byly nastaveny kolidující hodnoty zdroje %s %s"
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3276,7 +3290,7 @@ msgstr "Spouští se poinstalační spouštěč %s"
msgid "Directory '%s' missing"
msgstr "Adresář „%s“ chybí"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Nelze otevřít soubor „%s“"
diff --git a/po/cy.po b/po/cy.po
index b32f179e9..c03e5b5a5 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1928,6 +1928,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Yn cyfuno manylion Ar Gael"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Arhoswyd am %s ond nid oedd e yna"
+
# FIXME: "debian"
#: cmdline/apt-extracttemplates.cc
#, fuzzy
@@ -3003,11 +3017,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, fuzzy, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Arhoswyd am %s ond nid oedd e yna"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3239,6 +3248,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3304,7 +3318,7 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Methwyd agor ffeil %s"
diff --git a/po/da.po b/po/da.po
index a22678378..ffeae4b8a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+0200\n"
"PO-Revision-Date: 2014-07-06 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -1925,6 +1925,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Sammenfletter tilgængelighedsoplysninger"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Ventede på %s, men den var der ikke"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2989,11 +3003,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr "Ignorerer fil »%s« i mappe »%s« da den har en ugyldig filendelse"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Ventede på %s, men den var der ikke"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3224,6 +3233,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3290,7 +3304,7 @@ msgstr "Kører førinstallationsudløser %s"
msgid "Directory '%s' missing"
msgstr "Mappe »%s« mangler"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Kunne ikke åbne filen »%s«"
diff --git a/po/de.po b/po/de.po
index a67369c20..9fad367e3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.8\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1977,6 +1977,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Verfügbare Informationen werden zusammengeführt."
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3074,11 +3088,6 @@ msgstr ""
"Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie eine ungültige "
"Dateinamen-Erweiterung hat."
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3313,6 +3322,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3383,7 +3397,7 @@ msgstr "Aufruf des Nach-Installations-Triggers %s"
msgid "Directory '%s' missing"
msgstr "Verzeichnis »%s« fehlt"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Datei »%s« konnte nicht geöffnet werden."
diff --git a/po/dz.po b/po/dz.po
index d7c2f57d8..9bce0d1f0 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1901,6 +1901,20 @@ msgstr ""
msgid "Merging available information"
msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2960,11 +2974,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3192,6 +3201,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3257,7 +3271,7 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
diff --git a/po/el.po b/po/el.po
index 65d91797f..b4a7d7c46 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1920,6 +1920,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2989,11 +3003,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3221,6 +3230,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, fuzzy, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3286,7 +3300,7 @@ msgstr "Εκτέλεση του post-installation trigger %s"
msgid "Directory '%s' missing"
msgstr "Ο φάκελος %s αγνοείται."
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
diff --git a/po/es.po b/po/es.po
index 42ebb0068..a49ec1f71 100644
--- a/po/es.po
+++ b/po/es.po
@@ -34,7 +34,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.10\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+0200\n"
"PO-Revision-Date: 2016-01-26 01:51+0100\n"
"Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
"org>\n"
@@ -2031,6 +2031,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Fusionando información disponible"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Se esperaba %s pero no estaba presente"
+
#: cmdline/apt-extracttemplates.cc
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -3139,11 +3153,6 @@ msgstr ""
"Omitiendo el fichero «%s» del directorio «%s», ya que tiene una extensión de "
"nombre de fichero no válida"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Se esperaba %s pero no estaba presente"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3379,6 +3388,12 @@ msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
"Valor establecido inválido para la opción %s según el origen %s %s (%s)"
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+"Valores establecidos en conflicto para la opción %s según el origen %s %s"
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3450,7 +3465,7 @@ msgstr "Ejecutando disparador post-instalación %s"
msgid "Directory '%s' missing"
msgstr "Falta el directorio «%s»."
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "No se pudo abrir el fichero «%s»"
diff --git a/po/eu.po b/po/eu.po
index 0c2f6eb41..aab980d31 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1902,6 +1902,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Eskuragarrien datuak biltzen"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s espero zen baina ez zegoen han"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2959,11 +2973,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s espero zen baina ez zegoen han"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3192,6 +3201,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3257,7 +3271,7 @@ msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
msgid "Directory '%s' missing"
msgstr "'%s' direktorioa falta da"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "%s fitxategia ezin izan da ireki"
diff --git a/po/fi.po b/po/fi.po
index 3a145c382..17736f925 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1895,6 +1895,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Yhdistetään saatavuustiedot"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Odotettiin %s, mutta sitä ei ollut"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2952,11 +2966,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Odotettiin %s, mutta sitä ei ollut"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3183,6 +3192,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3248,7 +3262,7 @@ msgstr "Suoritetaan jälkiasennusliipaisin %s"
msgid "Directory '%s' missing"
msgstr "Kansio \"%s\" puuttuu."
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Tiedostoa %s ei voitu avata"
diff --git a/po/fr.po b/po/fr.po
index 906d1b6b2..b8e369634 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1955,6 +1955,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Fusion des informations disponibles"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "A attendu %s mais il n'était pas présent"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3061,11 +3075,6 @@ msgstr ""
"« %s » dans le répertoire « %s » a été ignoré car il utilise une extension "
"non valable"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "A attendu %s mais il n'était pas présent"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3297,6 +3306,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3368,7 +3382,7 @@ msgstr "Exécution des actions différées (« trigger ») de %s"
msgid "Directory '%s' missing"
msgstr "Répertoire %s inexistant"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Impossible d'ouvrir le fichier « %s »"
diff --git a/po/gl.po b/po/gl.po
index 9ab49e70d..db38e90bc 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1916,6 +1916,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Mesturando a información sobre paquetes dispoñíbeis"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Agardouse por %s pero non estaba alí"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3002,11 +3016,6 @@ msgstr ""
"Ignorando o ficheiro «%s» no directorio «%s» xa que ten unha extensión de "
"nome incorrecta"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Agardouse por %s pero non estaba alí"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3237,6 +3246,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3307,7 +3321,7 @@ msgstr "Executando o disparador de post-instalación %s"
msgid "Directory '%s' missing"
msgstr "Falta o directorio «%s»"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Non foi posíbel abrir o ficheiro «%s»"
diff --git a/po/hu.po b/po/hu.po
index f181065f1..44763c728 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1957,6 +1957,20 @@ msgstr "előtti hibák fontosak. Javítsa azokat, és futtassa az [I]nstallt új
msgid "Merging available information"
msgstr "Elérhető információk egyesítése"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Nem található a(z) %s, a várakozás után sem"
+
#: cmdline/apt-extracttemplates.cc
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -3045,11 +3059,6 @@ msgstr ""
"„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert érvénytelen "
"fájlkiterjesztése van"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Nem található a(z) %s, a várakozás után sem"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3288,6 +3297,13 @@ msgstr ""
"Érvénytelen érték van megadva a(z) %s beállításhoz ezen forrásra "
"vonatkozóan: %s %s (%s)"
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+"Ütköző értékek vannak megadva a(z) %s beállításhoz ezen forrásra "
+"vonatkozóan: %s %s"
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3358,7 +3374,7 @@ msgstr "A(z) %s telepítés utáni trigger futtatása"
msgid "Directory '%s' missing"
msgstr "A(z) „%s” könyvtár hiányzik"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "A(z) „%s” fájl megnyitása sikertelen"
diff --git a/po/it.po b/po/it.po
index 0dff230bc..d0abf7ec5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1948,6 +1948,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Unione delle informazioni disponibili"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "In attesa di %s ma non era presente"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3044,11 +3058,6 @@ msgstr ""
"Viene ignorato il file \"%s\" nella directory \"%s\" poiché ha un'estensione "
"non valida"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "In attesa di %s ma non era presente"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3280,6 +3289,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3351,7 +3365,7 @@ msgstr "Esecuzione comando di post installazione %s"
msgid "Directory '%s' missing"
msgstr "Directory \"%s\" mancante"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Impossibile aprire il file \"%s\""
diff --git a/po/ja.po b/po/ja.po
index 2e5d6ab0b..fa454fe59 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.9.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-06-04 20:28+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+0200\n"
"PO-Revision-Date: 2016-05-18 15:31+0900\n"
"Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1950,6 +1950,20 @@ msgstr "が重要です。これを修正して「導入」を再度実行して
msgid "Merging available information"
msgstr "入手可能情報をマージしています"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s を待ちましたが、そこにはありませんでした"
+
#: cmdline/apt-extracttemplates.cc
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -3040,11 +3054,6 @@ msgstr ""
"ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視"
"します"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s を待ちましたが、そこにはありませんでした"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3352,7 +3361,7 @@ msgstr "インストール後トリガ %s を実行しています"
msgid "Directory '%s' missing"
msgstr "ディレクトリ '%s' が見つかりません"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "ファイル '%s' をオープンできませんでした"
diff --git a/po/km.po b/po/km.po
index 7bb4ac2cf..21569509d 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1882,6 +1882,20 @@ msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន
msgid "Merging available information"
msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2934,11 +2948,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3166,6 +3175,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3231,7 +3245,7 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
diff --git a/po/ko.po b/po/ko.po
index 49346281e..9839308d2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1879,6 +1879,20 @@ msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를
msgid "Merging available information"
msgstr "이용 가능 패키지 정보를 합칩니다"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2939,11 +2953,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3171,6 +3180,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3239,7 +3253,7 @@ msgstr "설치 후 트리거 %s 실행하는 중입니다"
msgid "Directory '%s' missing"
msgstr "디렉터리 '%s' 없습니다."
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "'%s' 파일을 열 수 없습니다"
diff --git a/po/ku.po b/po/ku.po
index 5eaf06b81..d2b187bf7 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1845,6 +1845,20 @@ msgstr ""
msgid "Merging available information"
msgstr ""
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
#: cmdline/apt-extracttemplates.cc
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -2841,11 +2855,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr ""
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3073,6 +3082,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, fuzzy, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3138,7 +3152,7 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr "Peldanka '%s' kêm e"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Nikarî pelê %s veke"
diff --git a/po/lt.po b/po/lt.po
index 3a2b995b9..d45d0d90b 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1877,6 +1877,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Sujungiama turima informaija"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr ""
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2932,11 +2946,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr ""
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3164,6 +3173,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3229,7 +3243,7 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr "Trūksta aplanko „%s“"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Nepavyko atverti failo %s"
diff --git a/po/mr.po b/po/mr.po
index e75b12fc7..9cc9f9eb8 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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 "
@@ -1879,6 +1879,20 @@ msgstr ""
msgid "Merging available information"
msgstr "उपलब्ध माहितीचे एकत्रीकरण करत आहे"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2934,11 +2948,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3165,6 +3174,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3230,7 +3244,7 @@ msgstr "संस्थापना-पश्चात ट्रिगर %s च
msgid "Directory '%s' missing"
msgstr "'%s' संचयिका गहाळ आहे"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "%s फाईल उघडता येत नाही"
diff --git a/po/nb.po b/po/nb.po
index a4488965f..a82d15cab 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+0200\n"
"PO-Revision-Date: 2010-09-01 21:10+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -1904,6 +1904,20 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
msgid "Merging available information"
msgstr "Fletter tilgjengelig informasjon"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Ventet på %s, men den ble ikke funnet"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2971,11 +2985,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Ventet på %s, men den ble ikke funnet"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3206,6 +3215,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3272,7 +3286,7 @@ msgstr "Kjører etter-installasjonsutløser %s"
msgid "Directory '%s' missing"
msgstr "Mappa «%s» mangler"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Klarte ikke åpne fila «%s»"
diff --git a/po/ne.po b/po/ne.po
index aae8809be..850234235 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1882,6 +1882,20 @@ msgstr ""
msgid "Merging available information"
msgstr "उपलब्ध सूचना गाँभिदैछ"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2933,11 +2947,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3165,6 +3174,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3230,7 +3244,7 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "फाइल %s खोल्न सकिएन"
diff --git a/po/nl.po b/po/nl.po
index f68ad9d0c..a21d91cb4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.2.11\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+0200\n"
"PO-Revision-Date: 2016-04-27 18:12+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1990,6 +1990,20 @@ msgstr ""
msgid "Merging available information"
msgstr "De beschikbare informatie wordt samengevoegd"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Er is gewacht op %s, maar die kwam niet"
+
#: cmdline/apt-extracttemplates.cc
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -3095,11 +3109,6 @@ msgstr ""
"Negeren van bestand '%s' in map '%s' omdat het een ongeldige "
"bestandsextensie heeft"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Er is gewacht op %s, maar die kwam niet"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3334,6 +3343,12 @@ msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
"Ongeldige waarde ingesteld voor optie %s in verband met pakketbron %s %s (%s)"
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+"Tegengestelde waarden ingesteld voor optie %s in verband met pakketbron %s %s"
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3402,7 +3417,7 @@ msgstr "Post-installatie-trigger %s wordt uitgevoerd"
msgid "Directory '%s' missing"
msgstr "Map '%s' ontbreekt"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Kon het bestand '%s' niet openen"
diff --git a/po/nn.po b/po/nn.po
index 026fa354a..061b334d8 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1895,6 +1895,20 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p nytt."
msgid "Merging available information"
msgstr "Flettar informasjon om tilgjengelege pakkar"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Venta p %s, men den fanst ikkje"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2948,11 +2962,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Venta p %s, men den fanst ikkje"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3180,6 +3189,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3245,7 +3259,7 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr "Listekatalogen %spartial manglar."
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Klarte ikkje opna fila %s"
diff --git a/po/pl.po b/po/pl.po
index 412fd7179..2e3663390 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
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: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1952,6 +1952,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Łączenie informacji o dostępnych pakietach"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Oczekiwano na proces %s, ale nie było go"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3036,11 +3050,6 @@ msgstr ""
"Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe "
"rozszerzenie pliku"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Oczekiwano na proces %s, ale nie było go"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3271,6 +3280,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3342,7 +3356,7 @@ msgstr "Uruchamianie wyzwalacza post-installation %s"
msgid "Directory '%s' missing"
msgstr "Brakuje katalogu \"%s\""
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Nie udało się otworzyć pliku \"%s\""
diff --git a/po/pt.po b/po/pt.po
index 0092cd491..ea2877cd6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1919,6 +1919,20 @@ msgstr ""
msgid "Merging available information"
msgstr "A juntar a informação disponível"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Esperou por %s mas não estava lá"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3010,11 +3024,6 @@ msgstr ""
"A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão "
"inválida no nome do ficheiro"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Esperou por %s mas não estava lá"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3245,6 +3254,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3316,7 +3330,7 @@ msgstr "A correr o 'trigger' de pós-instalação %s"
msgid "Directory '%s' missing"
msgstr "Falta o directório '%s'"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Não foi possível abrir ficheiro o '%s'"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 078951db7..6d8de95e8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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."
@@ -1907,6 +1907,20 @@ msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente"
msgid "Merging available information"
msgstr "Mesclando informação disponível"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Esperado %s mas este não estava lá"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2973,11 +2987,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Esperado %s mas este não estava lá"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3204,6 +3213,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3269,7 +3283,7 @@ msgstr "Executando gatilho pós-instalação %s"
msgid "Directory '%s' missing"
msgstr "Diretório '%s' está faltando"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Não foi possível abrir arquivo %s"
diff --git a/po/ro.po b/po/ro.po
index 68cd314e9..48bf74328 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1914,6 +1914,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Se combină informațiile disponibile"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Așteptat %s, dar n-a fost acolo"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2987,11 +3001,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Așteptat %s, dar n-a fost acolo"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3218,6 +3227,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3283,7 +3297,7 @@ msgstr "Se rulează declanșatorul post-instalare %s"
msgid "Directory '%s' missing"
msgstr "Directorul „%s” lipsește."
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Nu s-a putut deschide fișierul %s"
diff --git a/po/ru.po b/po/ru.po
index 92bc76b61..b375a84db 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.2.12\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+0200\n"
"PO-Revision-Date: 2016-05-19 20:50+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -235,16 +235,16 @@ msgid ""
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
msgstr ""
-"--force-yes устарел, вместо него используйте параметры, начинающиеся с "
-"--allow."
+"--force-yes устарел, вместо него используйте параметры, начинающиеся с --"
+"allow."
#: apt-private/private-download.cc
msgid ""
"There were unauthenticated packages and -y was used without --allow-"
"unauthenticated"
msgstr ""
-"Обнаружены неудостоверенные пакеты и был указан параметр -y без "
-"--allow-unauthenticated."
+"Обнаружены неудостоверенные пакеты и был указан параметр -y без --allow-"
+"unauthenticated."
#: apt-private/private-download.cc apt-pkg/update.cc
#, c-format
@@ -309,23 +309,22 @@ msgid ""
"Essential packages were removed and -y was used without --allow-remove-"
"essential."
msgstr ""
-"Удалены пакеты первой необходимости и был указан параметр -y "
-"без --allow-remove-essential."
+"Удалены пакеты первой необходимости и был указан параметр -y без --allow-"
+"remove-essential."
#: apt-private/private-install.cc
msgid "Packages were downgraded and -y was used without --allow-downgrades."
msgstr ""
-"Пакеты заменены на старые версии и был указан параметр -y без "
-"--allow-downgrades."
+"Пакеты заменены на старые версии и был указан параметр -y без --allow-"
+"downgrades."
#: apt-private/private-install.cc
msgid ""
"Held packages were changed and -y was used without --allow-change-held-"
"packages."
msgstr ""
-"Были изменены зафиксированные пакеты и был указан параметр -y без "
-"--allow-change-held-"
-"packages."
+"Были изменены зафиксированные пакеты и был указан параметр -y без --allow-"
+"change-held-packages."
#: apt-private/private-install.cc
msgid "Internal error, Ordering didn't finish"
@@ -1447,7 +1446,8 @@ msgid ""
msgstr ""
"Использование: apt [параметры] команда\n"
"\n"
-"apt — менеджер пакетов с интерфейсом командной строки, предоставляет команды\n"
+"apt — менеджер пакетов с интерфейсом командной строки, предоставляет "
+"команды\n"
"для поиска и управления, а также запросов информации о пакетах.\n"
"Он выполняет те же задачи, что и специализированные инструменты APT,\n"
"например apt-get и apt-cache, но содержит параметры, которые больше\n"
@@ -1932,8 +1932,8 @@ msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-"Автоматическое отключение %s из-за некорректного ответа сервера/прокси (man 5 "
-"apt.conf)."
+"Автоматическое отключение %s из-за некорректного ответа сервера/прокси (man "
+"5 apt.conf)."
#: methods/server.cc
msgid "Internal error"
@@ -1981,6 +1981,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Слияние доступной информации"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Ожидалось завершение процесса %s, но он не был запущен"
+
#: cmdline/apt-extracttemplates.cc
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -2510,8 +2524,8 @@ msgid ""
"Data from such a repository can't be authenticated and is therefore "
"potentially dangerous to use."
msgstr ""
-"Данные из этого репозитория нельзя аутентифицировать, и "
-"поэтому потенциально из небезопасно использовать."
+"Данные из этого репозитория нельзя аутентифицировать, и поэтому потенциально "
+"из небезопасно использовать."
#: apt-pkg/acquire-item.cc
msgid ""
@@ -2564,8 +2578,7 @@ msgid ""
"architecture '%s'"
msgstr ""
"Пропускается получение настроенного файла «%s», так как репозиторий «%s» не "
-"поддерживает "
-"архитектуру «%s»"
+"поддерживает архитектуру «%s»"
#: apt-pkg/acquire-item.cc
#, c-format
@@ -2705,8 +2718,8 @@ msgid ""
"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
"user '%s'."
msgstr ""
-"Невозможно сбросить права для скачивания, так как файл «%s» "
-"недоступен для пользователя «%s»."
+"Невозможно сбросить права для скачивания, так как файл «%s» недоступен для "
+"пользователя «%s»."
#: apt-pkg/acquire.cc apt-pkg/clean.cc
#, c-format
@@ -3076,11 +3089,6 @@ msgstr ""
"Файл «%s» в каталоге «%s» игнорируется, так как он не имеет неправильное "
"расширение"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Ожидалось завершение процесса %s, но он не был запущен"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3314,6 +3322,11 @@ msgstr "Указаны конфликтующие значения параме
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr "Указано некорректное значения параметра %s из источника %s %s (%s)"
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr "Указаны конфликтующие значения параметра %s из источника %s %s"
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3385,7 +3398,7 @@ msgstr "Выполняется послеустановочный триггер
msgid "Directory '%s' missing"
msgstr "Отсутствует каталог «%s»"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Не удалось открыть файл «%s»"
diff --git a/po/sk.po b/po/sk.po
index 4d7127ffc..69e350486 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1919,6 +1919,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Zlučujú sa dostupné informácie"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Čakalo sa na %s, ale nebolo to tam"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2987,11 +3001,6 @@ msgid ""
msgstr ""
"Ignoruje sa „%s“ v adresári „%s“, pretože má neplatnú príponu názvu súboru"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Čakalo sa na %s, ale nebolo to tam"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3221,6 +3230,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3286,7 +3300,7 @@ msgstr "Vykonáva sa spúšťač post-installation %s"
msgid "Directory '%s' missing"
msgstr "Adresár „%s“ chýba"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Nedá sa otvoriť súbor „%s“"
diff --git a/po/sl.po b/po/sl.po
index 7100453af..420093db4 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1923,6 +1923,20 @@ msgstr "nad tem sporočilom. Popravite jih in poženite Namest[I]tev še enkrat"
msgid "Merging available information"
msgstr "Združevanje razpoložljivih podaktov"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Program je čakal na %s a ga ni bilo tam"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2991,11 +3005,6 @@ msgid ""
msgstr ""
"Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Program je čakal na %s a ga ni bilo tam"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3224,6 +3233,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3290,7 +3304,7 @@ msgstr "Poganjanje sprožilca po namestitvi %s"
msgid "Directory '%s' missing"
msgstr "Mapa '%s' manjka"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Ni mogoče odpreti datoteke '%s'"
diff --git a/po/sv.po b/po/sv.po
index 1775f6e4c..eca581b5f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1932,6 +1932,20 @@ msgstr "meddelande är viktiga. Försök korrigera dem och kör [I]nstallera ige
msgid "Merging available information"
msgstr "Sammanfogar tillgänglig information"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Väntade på %s men den fanns inte där"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3014,11 +3028,6 @@ msgid ""
msgstr ""
"Ignorerar filen ”%s” i katalogen ”%s” eftersom den har en ogiltig filändelse"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Väntade på %s men den fanns inte där"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3249,6 +3258,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3316,7 +3330,7 @@ msgstr "Kör efterinstallationsutlösare %s"
msgid "Directory '%s' missing"
msgstr "Katalogen ”%s” saknas"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Kunde inte öppna filen ”%s”"
diff --git a/po/th.po b/po/th.po
index 84366c667..96be71d22 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1873,6 +1873,20 @@ msgstr "กรุณาแก้ปัญหาเหล่านั้น แ
msgid "Merging available information"
msgstr "กำลังผสานรายชื่อของแพกเกจที่มี"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2922,11 +2936,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3153,6 +3162,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3218,7 +3232,7 @@ msgstr "กำลังเรียกการสะกิด %s หลัง
msgid "Directory '%s' missing"
msgstr "ไม่มีไดเรกทอรี '%s'"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "ไม่สามารถเปิดแฟ้ม '%s'"
diff --git a/po/tl.po b/po/tl.po
index b8694853b..61bcb7a94 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1895,6 +1895,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Pinagsasama ang magagamit na impormasyon"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Naghintay, para sa %s ngunit wala nito doon"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2968,11 +2982,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Naghintay, para sa %s ngunit wala nito doon"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3200,6 +3209,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3265,7 +3279,7 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr "Nawawala ang directory ng talaan %spartial."
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Hindi mabuksan ang talaksang %s"
diff --git a/po/tr.po b/po/tr.po
index 4e39b2afa..ad7af4b05 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+0200\n"
"PO-Revision-Date: 2015-10-21 18:21+0300\n"
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
"Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -1933,6 +1933,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Kullanılabilir bilgiler birleştiriliyor"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "%s için beklenildi ama o gelmedi"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3014,11 +3028,6 @@ msgstr ""
"'%2$s' dizinindeki '%1$s' dosyası geçersiz bir dosya uzantısı olduğu için "
"yok sayılıyor"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "%s için beklenildi ama o gelmedi"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3248,6 +3257,11 @@ msgstr "%s seçeneği için çakışan değer kümesi (kaynak %s %s)"
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr "%s seçeneği için geçersiz değer kümesi (kaynak: %s %s) (%s)"
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr "%s seçeneği için çakışan değer kümesi (kaynak %s %s)"
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3316,7 +3330,7 @@ msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor"
msgid "Directory '%s' missing"
msgstr "'%s' dizini bulunamadı"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "'%s' dosyası açılamadı"
diff --git a/po/uk.po b/po/uk.po
index 0b06e56f7..d2f318bc6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1941,6 +1941,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Об'єднання доступної інформації"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Очікував на %s, але його там не було"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3034,11 +3048,6 @@ msgid ""
msgstr ""
"Ігнорується файл '%s' у директорії '%s', так як він має невірне розширення"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Очікував на %s, але його там не було"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3268,6 +3277,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3337,7 +3351,7 @@ msgstr "Виконується післяустановочний ініціат
msgid "Directory '%s' missing"
msgstr "Директорія '%s' відсутня"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Неможливо відкрити файл '%s'"
diff --git a/po/vi.po b/po/vi.po
index 5abb47b46..05a25dd8e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.8\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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"
@@ -1919,6 +1919,20 @@ msgstr ""
msgid "Merging available information"
msgstr "Đang hòa trộn các thông tin sẵn có..."
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Cần %s nhưng mà không thấy nó ở đây"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -3010,11 +3024,6 @@ msgstr ""
"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp "
"lệ"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Cần %s nhưng mà không thấy nó ở đây"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3245,6 +3254,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3314,7 +3328,7 @@ msgstr "Đang chạy bẫy sau-cài-đặt %s"
msgid "Directory '%s' missing"
msgstr "Thiếu thư mục “%s”"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "Không thể mở tập tin “%s”"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 56100d404..0362d11bd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.2.x\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+0200\n"
"PO-Revision-Date: 2016-03-27 07:00+0000\n"
"Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -1884,6 +1884,20 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们,
msgid "Merging available information"
msgstr "正在合并可用信息"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "等待子进程 %s 的退出,但是它并不存在"
+
#: cmdline/apt-extracttemplates.cc
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -2931,11 +2945,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr "忽略‘%s’(于目录‘%s’),鉴于它的文件扩展名无效"
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "等待子进程 %s 的退出,但是它并不存在"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3162,6 +3171,11 @@ msgstr "软件源 %2$s %3$s 的选项 %1$s 中含有互相冲突的值"
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr "软件源 %2$s %3$s (%4$s) 的选项 %1$s 中含有无效值"
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr "软件源 %2$s %3$s 的选项 %1$s 中含有互相冲突的值"
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3227,7 +3241,7 @@ msgstr "执行安装后执行的触发器 %s"
msgid "Directory '%s' missing"
msgstr "目录 %s 缺失"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, c-format
msgid "Could not open file '%s'"
msgstr "无法打开文件 %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 42fc3c608..7f8e2aa1d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.2.X\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+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."
@@ -1870,6 +1870,20 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
msgid "Merging available information"
msgstr "整合現有的資料"
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "等待 %s 但是它並不存在"
+
#: cmdline/apt-extracttemplates.cc
#, fuzzy
msgid ""
@@ -2916,11 +2930,6 @@ msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "等待 %s 但是它並不存在"
-
#: apt-pkg/contrib/fileutl.cc
#, c-format
msgid "Sub-process %s received a segmentation fault."
@@ -3149,6 +3158,11 @@ msgstr ""
msgid "Invalid value set for option %s regarding source %s %s (%s)"
msgstr ""
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""
+
#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
#, c-format
msgid "Unable to parse package file %s (%d)"
@@ -3214,7 +3228,7 @@ msgstr "正在執行安裝後套件後續處理程式 %s"
msgid "Directory '%s' missing"
msgstr "找不到 '%s' 目錄"
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "無法開啟檔案 %s"