From faadaaccaf1c38e5f94b5672905db17d1916a76e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 11 Jun 2016 17:29:24 +0200 Subject: Release 1.2.13 --- configure.ac | 2 +- debian/changelog | 27 +++++++++++++++++++++++++++ doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 4 ++-- doc/po/de.po | 2 +- doc/po/es.po | 2 +- doc/po/fr.po | 2 +- doc/po/it.po | 2 +- doc/po/ja.po | 2 +- doc/po/nl.po | 2 +- doc/po/pl.po | 2 +- doc/po/pt.po | 2 +- doc/po/pt_BR.po | 2 +- po/apt-all.pot | 4 ++-- po/ar.po | 2 +- po/ast.po | 2 +- po/bg.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/dz.po | 2 +- po/el.po | 2 +- po/es.po | 2 +- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 33 +++++++++++++++------------------ po/km.po | 2 +- po/ko.po | 2 +- po/ku.po | 2 +- po/lt.po | 2 +- po/mr.po | 2 +- po/nb.po | 2 +- po/ne.po | 2 +- po/nl.po | 2 +- po/nn.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 24 ++++++++++-------------- po/sk.po | 2 +- po/sl.po | 2 +- po/sv.po | 2 +- po/th.po | 2 +- po/tl.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 9 ++++----- 57 files changed, 111 insertions(+), 92 deletions(-) diff --git a/configure.ac b/configure.ac index 1f05da528..5e28b2725 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="1.2.12" +PACKAGE_VERSION="1.2.13" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index e7f90913d..153f53661 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +apt (1.2.13) unstable; urgency=medium + + [ David Kalnischkies ] + * fail instead of segfault on unreadable config files (Closes: 824503) + * prevent C++ locale number formatting in text APIs (Closes: #825396) + * apt-key: change to / before find to satisfy its CWD needs. + Thanks to Samuel Thibault for 'finding' the culprit! (Closes: 826043) + * do not hang on piped input in PipedFileFdPrivate + * don't leak an FD in lz4 (de)compression + * don't leak FD in AutoProxyDetect command return parsing + + [ Julian Andres Klode ] + * Provide complete apt bash completion. + Thanks to Elias Fröhner and Svyatoslav Gryaznov for the initial work + (LP: #1573547) + + [ Zhou Mo ] + * zh_TW.po: remove several fuzzy tags after review + + [ Yuri Kozlov ] + * Russian program translation update (Closes: 824702) + + [ Takuma Yamada ] + * Japanese program translation update (Closes: 826291) + + -- Julian Andres Klode Sat, 11 Jun 2016 17:28:25 +0200 + apt (1.2.12) unstable; urgency=medium [ Patrick Cable ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 880f22843..11bc6658e 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -237,7 +237,7 @@ "> - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index cdeb561ed..769fc1401 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.2.12\n" +"Project-Id-Version: apt-doc 1.2.13\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/doc/po/de.po b/doc/po/de.po index 4d0962066..58a842100 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.8\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2014-09-14 14:46+0200\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" diff --git a/doc/po/es.po b/doc/po/es.po index 283480edb..f7fa6bb23 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2014-07-04 01:31+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" diff --git a/doc/po/fr.po b/doc/po/fr.po index cd69b3beb..5f75c554f 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2014-11-15 17:26+0100\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" diff --git a/doc/po/it.po b/doc/po/it.po index e93fc2702..91c7df8a9 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2015-12-27 21:26+0200\n" "Last-Translator: Beatrice Torracca \n" "Language-Team: Italian \n" diff --git a/doc/po/ja.po b/doc/po/ja.po index cf1f6d93b..6cae564d3 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2016-03-23 09:39+0900\n" "Last-Translator: Takuma Yamada \n" "Language-Team: Japanese \n" diff --git a/doc/po/nl.po b/doc/po/nl.po index 87a4e333c..2aedabeee 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.1.10-nl\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2016-02-01 16:17+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" diff --git a/doc/po/pl.po b/doc/po/pl.po index 6b6dfe58c..7d8af7b78 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2014-07-04 02:13+0200\n" "Last-Translator: Robert Luberda \n" "Language-Team: Polish \n" diff --git a/doc/po/pt.po b/doc/po/pt.po index e684ea0d2..bd7f2fb6d 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.7\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2014-08-29 00:34+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 28fbcd0d7..81468127b 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes \n" "Language-Team: \n" diff --git a/po/apt-all.pot b/po/apt-all.pot index e5a00f5f0..62b945f97 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 1.2.12\n" +"Project-Id-Version: apt 1.2.13\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ar.po b/po/ar.po index 9a94e74b2..508f82448 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" diff --git a/po/ast.po b/po/ast.po index 0a4ce69ce..ff8b672a1 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" diff --git a/po/bg.po b/po/bg.po index 662bd46de..839c40595 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" diff --git a/po/bs.po b/po/bs.po index 8c1fdf3db..cb10a3cc9 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" diff --git a/po/ca.po b/po/ca.po index 919c16625..b6458b568 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" diff --git a/po/cs.po b/po/cs.po index 97d3c2226..09d2ab841 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2015-08-29 15:24+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" diff --git a/po/cy.po b/po/cy.po index 7f59619a3..a5b13245a 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" diff --git a/po/da.po b/po/da.po index d11fb2a70..146978f6c 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2014-07-06 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 5895d4d1c..45969420c 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2014-09-19 13:04+0100\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" diff --git a/po/dz.po b/po/dz.po index e89c18e1d..6e566388b 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" diff --git a/po/el.po b/po/el.po index e339740ed..67153f963 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης \n" "Language-Team: Greek \n" diff --git a/po/es.po b/po/es.po index 3f5c64fbf..97e4b80fd 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2016-01-26 01:51+0100\n" "Last-Translator: Manuel \"Venturi\" Porras Peralta \n" diff --git a/po/eu.po b/po/eu.po index 63aa5008a..f8d3a549a 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" diff --git a/po/fi.po b/po/fi.po index 8593cec10..e0286883d 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index a5a904384..e7634e8d2 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2013-12-15 16:45+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" diff --git a/po/gl.po b/po/gl.po index 76dfa9bb6..166619ca1 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" diff --git a/po/hu.po b/po/hu.po index 9c16e10fe..2a06e00f1 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2016-04-10 19:46+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" diff --git a/po/it.po b/po/it.po index c012600c6..5a48371d7 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2015-04-07 16:51+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" diff --git a/po/ja.po b/po/ja.po index 84493ca2e..a78c56892 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2016-03-31 09:45+0900\n" "Last-Translator: Takuma Yamada \n" "Language-Team: Japanese \n" @@ -3776,7 +3776,7 @@ msgstr "sources.list に 'ソース' URI を指定する必要があります" msgid "Cannot convert %s to integer: out of range" msgstr "%s を整数に変換できません: 範囲外" -#: apt-pkg/update.cc apt-private/private-download.cc +#: apt-pkg/update.cc #, c-format msgid "Failed to fetch %s %s" msgstr "%s の取得に失敗しました %s" @@ -3793,24 +3793,21 @@ msgstr "" msgid "Calculating upgrade" msgstr "アップグレードパッケージを検出しています" -#. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc -#, fuzzy, c-format -msgid "" -"Signed file isn't valid, got '%s' (does the network require authentication?)" -msgstr "" -"クリアサインされたファイルが有効ではなく、'%s' を得ました (認証にネットワーク" -"が必要?)" +#, fuzzy +#~ msgid "" +#~ "Signed file isn't valid, got '%s' (does the network require " +#~ "authentication?)" +#~ msgstr "" +#~ "クリアサインされたファイルが有効ではなく、'%s' を得ました (認証にネット" +#~ "ワークが必要?)" -#: apt-pkg/deb/debmetaindex.cc -#, c-format -msgid "Invalid '%s' entry in Release file %s" -msgstr "Release ファイル %2$s に無効な '%1$s' エントリがあります" +#~ msgid "Invalid '%s' entry in Release file %s" +#~ msgstr "Release ファイル %2$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 の値が競合します" +#, fuzzy +#~ msgid "" +#~ "Conflicting values set for option %s regarding source %s %s: %s != %s" +#~ msgstr "ソース %2$s %3$s に関してオプション %1$s の値が競合します" #~ msgid "There is no public key available for the following key IDs:\n" #~ msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" diff --git a/po/km.po b/po/km.po index b63beec62..9f9990d0d 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" diff --git a/po/ko.po b/po/ko.po index 3cab0231f..18c857ae0 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" diff --git a/po/ku.po b/po/ku.po index 6292944b7..0b2940487 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" diff --git a/po/lt.po b/po/lt.po index 9aa775ac3..0cc1d584e 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" diff --git a/po/mr.po b/po/mr.po index ba37b50a0..72ccb7be9 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " diff --git a/po/nb.po b/po/nb.po index f54f95ca2..14d0071c8 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" diff --git a/po/ne.po b/po/ne.po index 92c539547..ff1fc9f81 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" diff --git a/po/nl.po b/po/nl.po index 819e43c76..ad9990e43 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2016-04-27 18:12+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" diff --git a/po/nn.po b/po/nn.po index fb8edb27e..d36d05b45 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" diff --git a/po/pl.po b/po/pl.po index ae7d9e21c..56781a41a 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index 070903c84..c98ffba65 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 538c73d7d..ecb8afbe2 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" diff --git a/po/ru.po b/po/ru.po index d067c993f..6090f919e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.9.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2015-06-23 20:40+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -3820,7 +3820,7 @@ msgstr "Вы должны заполнить sources.list, поместив ту msgid "Cannot convert %s to integer: out of range" msgstr "Невозможно преобразовать %s в целое число: выход за пределы диапазона" -#: apt-private/private-download.cc apt-pkg/update.cc +#: apt-pkg/update.cc #, c-format msgid "Failed to fetch %s %s" msgstr "Не удалось получить %s %s" @@ -3837,19 +3837,15 @@ msgstr "" msgid "Calculating upgrade" msgstr "Расчёт обновлений" -#. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc -#, c-format -msgid "" -"Signed file isn't valid, got '%s' (does the network require authentication?)" -msgstr "" -"Подписанный файл некорректен, получено «%s» (возможно в сети требуется " -"аутентификация?)" +#~ msgid "" +#~ "Signed file isn't valid, got '%s' (does the network require " +#~ "authentication?)" +#~ msgstr "" +#~ "Подписанный файл некорректен, получено «%s» (возможно в сети требуется " +#~ "аутентификация?)" -#: apt-pkg/deb/debmetaindex.cc -#, c-format -msgid "Invalid '%s' entry in Release file %s" -msgstr "Неправильный элемент «%s» в файле Release %s" +#~ msgid "Invalid '%s' entry in Release file %s" +#~ msgstr "Неправильный элемент «%s» в файле Release %s" #~ msgid "There is no public key available for the following key IDs:\n" #~ msgstr "Недоступен открытый ключ для следующих ID ключей:\n" diff --git a/po/sk.po b/po/sk.po index ed564969f..1845a1cf5 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" diff --git a/po/sl.po b/po/sl.po index f53ed289f..c449853f9 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" diff --git a/po/sv.po b/po/sv.po index 1b0d0418b..4f1749023 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2015-08-19 21:33+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" diff --git a/po/th.po b/po/th.po index 5236ed43d..21f0fcca0 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2014-12-12 13:00+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" diff --git a/po/tl.po b/po/tl.po index 9e4eecc15..941788e5b 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" diff --git a/po/tr.po b/po/tr.po index d67c81d99..f29fcde3d 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2015-10-21 18:21+0300\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian l10n Turkish \n" diff --git a/po/uk.po b/po/uk.po index 220a0d24c..223db2955 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" diff --git a/po/vi.po b/po/vi.po index 3357f7ce4..d25342fb0 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2014-09-12 13:48+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 6d375658b..b76177064 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 \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2016-03-27 07:00+0000\n" "Last-Translator: Zhou Mo \n" "Language-Team: Chinese (simplified) \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 309f91945..6acdae44c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-05-11 10:57+0200\n" +"POT-Creation-Date: 2016-06-11 17:28+0200\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5]