summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2013-04-02 15:20:16 +0200
committerMichael Vogt <egon@debian-devbox>2013-04-02 15:20:16 +0200
commitc1b21367668fb435cfb8a2a18c3292e006c2e795 (patch)
tree3c2afcfa7b6857eb90cc230b1f00cf3b737e07e7 /po
parentbc65130d13c2737aefb85e609f67be196ae10a7f (diff)
parentcfe9dc32900b537986c6765972307fd9e57ece0b (diff)
downloadapt-c1b21367668fb435cfb8a2a18c3292e006c2e795.tar.gz
merged lp:~mvo/apt/fix-inrelease5
Diffstat (limited to 'po')
-rw-r--r--po/apt-all.pot122
-rw-r--r--po/ar.po122
-rw-r--r--po/ast.po122
-rw-r--r--po/bg.po125
-rw-r--r--po/bs.po122
-rw-r--r--po/ca.po125
-rw-r--r--po/cs.po125
-rw-r--r--po/cy.po122
-rw-r--r--po/da.po125
-rw-r--r--po/de.po125
-rw-r--r--po/dz.po122
-rw-r--r--po/el.po122
-rw-r--r--po/es.po122
-rw-r--r--po/eu.po122
-rw-r--r--po/fi.po122
-rw-r--r--po/fr.po127
-rw-r--r--po/gl.po122
-rw-r--r--po/hu.po125
-rw-r--r--po/it.po125
-rw-r--r--po/ja.po125
-rw-r--r--po/km.po122
-rw-r--r--po/ko.po122
-rw-r--r--po/ku.po122
-rw-r--r--po/lt.po126
-rw-r--r--po/mr.po122
-rw-r--r--po/nb.po122
-rw-r--r--po/ne.po122
-rw-r--r--po/nl.po122
-rw-r--r--po/nn.po122
-rw-r--r--po/pl.po125
-rw-r--r--po/pt.po125
-rw-r--r--po/pt_BR.po122
-rw-r--r--po/ro.po122
-rw-r--r--po/ru.po125
-rw-r--r--po/sk.po125
-rw-r--r--po/sl.po125
-rw-r--r--po/sv.po122
-rw-r--r--po/th.po125
-rw-r--r--po/tl.po122
-rw-r--r--po/uk.po125
-rw-r--r--po/vi.po125
-rw-r--r--po/zh_CN.po122
-rw-r--r--po/zh_TW.po122
43 files changed, 2591 insertions, 2712 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot
index fd772e27..8ff4bb5f 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.9~exp1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1041,7 +1041,8 @@ msgid "%s was already not hold.\n"
msgstr ""
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1320,7 +1321,7 @@ msgstr ""
#: methods/connect.cc:209
#, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr ""
#: methods/connect.cc:211
@@ -1333,28 +1334,28 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr ""
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1664,87 +1665,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr ""
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2065,30 +2066,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2279,17 +2280,17 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr ""
@@ -2336,6 +2337,12 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr ""
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2730,8 +2737,8 @@ msgstr ""
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr ""
@@ -2763,7 +2770,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2771,56 +2778,56 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
@@ -2912,22 +2919,22 @@ msgstr ""
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2942,17 +2949,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr ""
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ar.po b/po/ar.po
index 7c9ea1d1..f61ab428 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1062,7 +1062,8 @@ msgid "%s was already not hold.\n"
msgstr "%s هي النسخة الأحدث.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1345,7 +1346,7 @@ msgstr ""
#: methods/connect.cc:209
#, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr ""
#: methods/connect.cc:211
@@ -1358,28 +1359,28 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "تعذر الاتصال بـ%s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1691,87 +1692,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: تعذرت قراءة الدليل %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "فشل فتح %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** فشل ربط %s بـ%s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2095,30 +2096,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "تعذر العثور على التحديد %s"
@@ -2309,17 +2310,17 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr ""
@@ -2366,6 +2367,12 @@ msgstr "مشكلة في إغلاق الملف"
msgid "Problem syncing the file"
msgstr "مشكلة في مزامنة الملف"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "إجهاض التثبيت."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2761,8 +2768,8 @@ msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum غير متطابقة"
@@ -2795,7 +2802,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2803,56 +2810,56 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "الحجم غير متطابق"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
@@ -2947,22 +2954,22 @@ msgstr "كتابة لائحة المصادر الجديدة\n"
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2977,17 +2984,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "إجهاض التثبيت."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ast.po b/po/ast.po
index 908155a6..dfdf26fd 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: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1189,7 +1189,8 @@ msgid "%s was already not hold.\n"
msgstr "%s yá ta na versión más nueva.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero nun taba ellí"
@@ -1472,7 +1473,7 @@ msgstr "Fallu temporal al resolver '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1485,29 +1486,29 @@ msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nun pudo coneutase a %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Fallu internu: Robla bona, pero nun se pudo determinar la so buelga dixital?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Atopóse polo menos una robla mala."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Nun pudo executase 'gpgv' pa verificar la robla (¿ta instaláu gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Fallu desconocíu al executar gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Les siguientes robles nun valieron:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1880,87 +1881,87 @@ msgstr "L'archivu nun tien rexistru de control"
msgid "Unable to get a cursor"
msgstr "Nun pudo algamase un cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Nun pudo lleese'l direutoriu %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Nun pudo lleese %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Errores aplicables al ficheru "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Nun pudo resolvese %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Falló'l percorríu pol árbol"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Nun pudo abrise %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Desenllazar %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Nun pudo lleese l'enllaz %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Nun pudo desenllazase %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falló enllazar enllazr %s a %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "L'archivu nun tien el campu paquetes"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nun tien la entrada saltos\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el curiador de %s ye %s y non %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nun tien la entrada saltos de fonte\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco nun tiene una entrada binaria de saltos\n"
@@ -2309,30 +2310,30 @@ msgstr ""
"desactivao pol usuariu."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Escoyeta %s que nun s'atopa"
@@ -2526,17 +2527,17 @@ msgstr "El subprocesu %s recibió un fallu de segmentación."
msgid "Sub-process %s received signal %u."
msgstr "El subprocesu %s recibió una señal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El subprocesu %s devolvió un códigu d'error (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El subprocesu %s terminó de manera inesperada"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nun se pudo abrir el ficheru %s"
@@ -2583,6 +2584,12 @@ msgstr "Hai problemes desvenceyando'l ficheru %s"
msgid "Problem syncing the file"
msgstr "Hai problemes al sincronizar el ficheru"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "L'aniellu de claves nun s'instaló en %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Caché de paquetes balera."
@@ -2995,8 +3002,8 @@ msgstr "falló'l cambiu de nome, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "La suma MD5 nun concasa"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "La suma hash nun concasa"
@@ -3028,7 +3035,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3038,12 +3045,12 @@ msgstr ""
"anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Fallu GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3052,7 +3059,7 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3061,7 +3068,7 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3069,31 +3076,31 @@ msgstr ""
"Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
"paquete %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "El tamañu nun concasa"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nun se pudo parchear el ficheru release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Ensin seiciones nel ficheru release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ensin entrada Hash nel ficheru release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada inválida pa 'Valid-Until' nel ficheru release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
@@ -3193,22 +3200,22 @@ msgstr "Escribiendo llista nueva d'oríxenes\n"
msgid "Source list entries for this disc are:\n"
msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i rexistros escritos.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i rexistros escritos con %i ficheros de menos.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3225,17 +3232,6 @@ msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s"
msgid "Hash mismatch for: %s"
msgstr "El hash nun concasa pa: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "L'aniellu de claves nun s'instaló en %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/bg.po b/po/bg.po
index f43ae753..f302170a 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: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1202,7 +1202,8 @@ msgid "%s was already not hold.\n"
msgstr "Пакетът „%s“ вече е задържан.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Изчака се завършването на %s, но той не беше пуснат"
@@ -1506,7 +1507,7 @@ msgstr "Временен неуспех при намирането на IP ад
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)"
#: methods/connect.cc:211
@@ -1519,32 +1520,32 @@ msgstr "Нещо лошо се случи при намирането на IP а
msgid "Unable to connect to %s:%s:"
msgstr "Неуспех при свързване с %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
"ключа?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Намерен е поне един невалиден подпис."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е "
"gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Неизвестна грешка при изпълнението на gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Следните подписи са невалидни:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1919,87 +1920,87 @@ msgstr "В архива няма поле „control“"
msgid "Unable to get a cursor"
msgstr "Неуспех при получаването на курсор"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Неуспех при четенето на директория %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Неуспех при четенето на %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Грешките се отнасят за файла "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Неуспех при превръщането на %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Неуспех при обхода на дървото"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Неуспех при отварянето на %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Неуспех при прочитането на връзка %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Неуспех при премахването на връзка %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Неуспех при създаването на връзка %s към %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "Превишен лимит на DeLink от %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Архивът няма поле „package“"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s няма запис „override“\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " поддържащия пакета %s е %s, а не %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s няма запис „source override“\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s няма също и запис „binary override“\n"
@@ -2347,30 +2348,30 @@ msgstr ""
"забранено от потребителя."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liд %liч %liм %liс"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%liч %liм %liс"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%liм %liс"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Изборът %s не е намерен"
@@ -2567,17 +2568,17 @@ msgstr "Нарушение на защитата на паметта (segmentati
msgid "Sub-process %s received signal %u."
msgstr "Под-процесът %s получи сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Подпроцесът %s върна код за грешка (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Подпроцесът %s завърши неочаквано"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Неуспех при отварянето на файла %s"
@@ -2625,6 +2626,12 @@ msgstr "Проблем при изтриване на файла %s"
msgid "Problem syncing the file"
msgstr "Проблем при синхронизиране на файла"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "В %s няма инсталиран ключодържател."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Празен кеш на пакети"
@@ -3049,8 +3056,8 @@ msgstr "преименуването се провали, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Несъответствие на контролна сума MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Несъответствие на контролната сума"
@@ -3086,7 +3093,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3096,12 +3103,12 @@ msgstr ""
"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Грешка от GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3110,7 +3117,7 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3119,38 +3126,38 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Несъответствие на размера"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Неуспех при анализиране на файл Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Във файла Release %s липсват раздели"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Във файла Release %s липсва контролна сума"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Неправилна стойност за „Date“ във файла Release %s"
@@ -3250,22 +3257,22 @@ msgstr "Запазване на новия списък с източници\n"
msgid "Source list entries for this disc are:\n"
msgstr "Записите в списъка с източници за този диск са:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Записани са %i записа.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Записани са %i записа с %i липсващи файла.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Записани са %i записа с %i несъответстващи файла\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
@@ -3280,17 +3287,6 @@ msgstr "Не е намерен oторизационен запис за: %s"
msgid "Hash mismatch for: %s"
msgstr "Несъответствие на контролната сума за: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Файлът %s не започва с информация за подписване в обикновен текст."
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "В %s няма инсталиран ключодържател."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3534,6 +3530,9 @@ msgstr ""
msgid "Not locked"
msgstr "Без заключване"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Файлът %s не започва с информация за подписване в обикновен текст."
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Пропускане на несъществуващ файл %s"
diff --git a/po/bs.po b/po/bs.po
index bce21d79..2e2dd119 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: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1060,7 +1060,8 @@ msgid "%s was already not hold.\n"
msgstr ""
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1342,7 +1343,7 @@ msgstr ""
#: methods/connect.cc:209
#, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr ""
#: methods/connect.cc:211
@@ -1355,29 +1356,29 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Ne mogu se povezati sa %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1688,87 +1689,87 @@ msgstr "Arhiva nema kontrolnog zapisa"
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Ne mogu otvoriti %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2092,30 +2093,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2306,17 +2307,17 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr ""
@@ -2363,6 +2364,12 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Odustajem od instalacije."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2759,8 +2766,8 @@ msgstr ""
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr ""
@@ -2792,7 +2799,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2800,56 +2807,56 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ne mogu otvoriti DB datoteku %s"
@@ -2944,22 +2951,22 @@ msgstr ""
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2974,17 +2981,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Odustajem od instalacije."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ca.po b/po/ca.po
index 64af4e6f..b9973477 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: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1210,7 +1210,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ja estava no retingut.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperava %s però no hi era"
@@ -1494,7 +1495,7 @@ msgstr "S'ha produït un error temporal en resoldre «%s»"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
#: methods/connect.cc:211
@@ -1507,32 +1508,32 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "No es pot connectar amb %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error intern: La signatura és correcta, però no s'ha pogut determinar "
"l'emprempta digital de la clau!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "S'ha trobat almenys una signatura invàlida."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"No s'ha pogut executar el «gpgv» per a verificar la signatura (està "
"instaŀlat el gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "S'ha produït un error desconegut en executar el gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Les signatures següents són invàlides:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1905,87 +1906,87 @@ msgstr "Arxiu sense registre de control"
msgid "Unable to get a cursor"
msgstr "No es pot aconseguir un cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: No es pot llegir el directori %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: No es pot veure l'estat %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Els errors s'apliquen al fitxer "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "No s'ha pogut resoldre %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "L'arbre està fallant"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "No s'ha pogut obrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "No s'ha pogut llegir l'enllaç %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "No s'ha pogut alliberar %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** No s'ha pogut enllaçar %s a %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink s'ha arribat al límit de %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arxiu sense el camp paquet"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no té una entrada dominant\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el mantenidor de %s és %s, no %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no té una entrada dominant de font\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s no té una entrada dominant de binari\n"
@@ -2333,30 +2334,30 @@ msgstr ""
"està deshabilitat per l'usuari."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "No s'ha trobat la selecció %s"
@@ -2554,17 +2555,17 @@ msgstr "El sub-procés %s ha rebut una violació de segment."
msgid "Sub-process %s received signal %u."
msgstr "El sub-procés %s ha rebut un senyal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El sub-procés %s ha retornat un codi d'error (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El sub-procés %s ha sortit inesperadament"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "No s'ha pogut obrir el fitxer %s"
@@ -2611,6 +2612,12 @@ msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
msgid "Problem syncing the file"
msgstr "Ha hagut un problema en sincronitzar el fitxer"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "No s'ha instaŀlat cap clauer a %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Memòria cau de paquets és buida"
@@ -3032,8 +3039,8 @@ msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "La suma MD5 no concorda"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "La suma resum no concorda"
@@ -3069,7 +3076,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3080,12 +3087,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "S'ha produït un error amb el GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3095,7 +3102,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3104,7 +3111,7 @@ msgstr ""
"No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
"d'arreglar aquest paquet manualment."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3112,31 +3119,31 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "La mida no concorda"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "No es pot analitzar el fitxer Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "No hi ha seccions al fitxer Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "No hi ha una entrada Hash al fitxer Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "El camp «Date» al fitxer Release %s és invàlid"
@@ -3236,22 +3243,22 @@ msgstr "S'està escrivint una nova llista de fonts\n"
msgid "Source list entries for this disc are:\n"
msgstr "Les entrades de la llista de fonts per a aquest disc són:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "S'han escrit %i registres.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3268,17 +3275,6 @@ msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s"
msgid "Hash mismatch for: %s"
msgstr "El resum no coincideix per a: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "El fitxer %s no comença amb un missatge signat en clar"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No s'ha instaŀlat cap clauer a %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3519,6 +3515,9 @@ msgstr ""
msgid "Not locked"
msgstr "No blocat"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "El fitxer %s no comença amb un missatge signat en clar"
+
#~ msgid "decompressor"
#~ msgstr "decompressor"
diff --git a/po/cs.po b/po/cs.po
index df8f64b3..5c17539b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-07-08 13:46+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -1185,7 +1185,8 @@ msgid "%s was already not hold.\n"
msgstr "%s již nebyl držen v aktuální verzi.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čekal jsem na %s, ale nebyl tam"
@@ -1486,7 +1487,7 @@ msgstr "Dočasné selhání při zjišťování „%s“"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - %s)"
#: methods/connect.cc:211
@@ -1499,28 +1500,28 @@ msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i -
msgid "Unable to connect to %s:%s:"
msgstr "Nelze se připojit k %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Neznámá chyba při spouštění gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Následující podpisy jsou neplatné:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1885,87 +1886,87 @@ msgstr "Archiv nemá kontrolní záznam"
msgid "Unable to get a cursor"
msgstr "Nelze získat kurzor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Nelze číst adresář %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Nelze vyhodnotit %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Chyby se týkají souboru "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Chyba při zjišťování %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Průchod stromem selhal"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Nelze otevřít %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "Odlinkování %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Nelze přečíst link %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Nelze odlinkovat %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nezdařilo se slinkovat %s s %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Odlinkovací limit %sB dosažen.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archiv nemá pole Package"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žádnou položku pro override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správce %s je %s, ne %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žádnou zdrojovou položku pro override\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá ani žádnou binární položku pro override\n"
@@ -2310,30 +2311,30 @@ msgstr ""
"zakázáno."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Výběr %s nenalezen"
@@ -2527,17 +2528,17 @@ msgstr "Podproces %s obdržel chybu segmentace."
msgid "Sub-process %s received signal %u."
msgstr "Podproces %s obdržel signál %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s vrátil chybový kód (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neočekávaně skončil"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nelze otevřít soubor %s"
@@ -2584,6 +2585,12 @@ msgstr "Problém při odstraňování souboru %s"
msgid "Problem syncing the file"
msgstr "Problém při synchronizování souboru"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s není nainstalována žádná klíčenka."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache balíků je prázdná"
@@ -2990,8 +2997,8 @@ msgstr "přejmenování selhalo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Neshoda kontrolních součtů"
@@ -3027,7 +3034,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3037,12 +3044,12 @@ msgstr ""
"se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3051,7 +3058,7 @@ msgstr ""
"Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento "
"balík je třeba opravit ručně (kvůli chybějící architektuře)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3060,38 +3067,38 @@ msgstr ""
"Nebylo možné nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ručně."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nelze zpracovat Release soubor %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Release soubor %s neobsahuje žádné sekce"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release soubor %s neobsahuje Hash záznam"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Neplatná položka „Valid-Until“ v Release souboru %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Neplatná položka „Date“ v Release souboru %s"
@@ -3191,22 +3198,22 @@ msgstr "Zapisuji nový seznam balíků\n"
msgid "Source list entries for this disc are:\n"
msgstr "Seznamy zdrojů na tomto disku jsou:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapsáno %i záznamů.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
@@ -3221,17 +3228,6 @@ msgstr "Nelze najít autentizační záznam pro: %s"
msgid "Hash mismatch for: %s"
msgstr "Neshoda kontrolních součtů pro: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Soubor %s nezačíná podpisem"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s není nainstalována žádná klíčenka."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3459,6 +3455,9 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%
msgid "Not locked"
msgstr "Není uzamčen"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Soubor %s nezačíná podpisem"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Přeskakuji neexistující soubor %s"
diff --git a/po/cy.po b/po/cy.po
index 3e684a48..82abc9ae 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1208,7 +1208,8 @@ msgid "%s was already not hold.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
@@ -1499,7 +1500,7 @@ msgstr "Methiant dros dro yn datrys '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
#: methods/connect.cc:211
@@ -1512,29 +1513,29 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Methwyd cysylltu i %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1908,88 +1909,88 @@ msgstr "Does dim cofnod rheoli gan yr archif"
msgid "Unable to get a cursor"
msgstr "Ni ellir cael cyrchydd"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "G: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "Rh: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Methwyd datrys %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Methwyd cerdded y goeden"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Methwyd agor %s"
# FIXME
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DatGysylltu %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Methwyd darllen y cyswllt %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Methwyd datgysylltu %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Methwyd cysylltu %s at %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
@@ -2344,30 +2345,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
@@ -2563,17 +2564,17 @@ msgstr "Derbyniodd is-broses %s wall segmentu."
msgid "Sub-process %s received signal %u."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
@@ -2622,6 +2623,12 @@ msgstr "Gwall wrth dadgysylltu'r ffeil"
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Yn Erthylu'r Sefydliad."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Storfa pecyn gwag"
@@ -3051,8 +3058,8 @@ msgstr "methwyd ailenwi, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
@@ -3086,7 +3093,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3094,13 +3101,13 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3109,7 +3116,7 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3118,40 +3125,40 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
# FIXME: number?
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
# FIXME: number?
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
@@ -3247,22 +3254,22 @@ msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3277,17 +3284,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Yn Erthylu'r Sefydliad."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/da.po b/po/da.po
index 4ca0c071..9f98df6a 100644
--- a/po/da.po
+++ b/po/da.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: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-07-03 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -1191,7 +1191,8 @@ msgid "%s was already not hold.\n"
msgstr "%s var allerede ikke i bero.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventede på %s, men den var der ikke"
@@ -1494,7 +1495,7 @@ msgstr "Midlertidig fejl ved omsætning af navnet '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1507,30 +1508,30 @@ msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Kunne ikke forbinde til %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Stødte på mindst én ugyldig signatur."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Kunne ikke køre 'gpgv' for at verificere signaturen (er gpgv installeret?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Ukendt fejl ved kørsel af gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Følgende signaturer var ugyldige:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1902,87 +1903,87 @@ msgstr "Arkivet har ingen kontrolindgang"
msgid "Unable to get a cursor"
msgstr "Kunne skaffe en markør"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Kunne ikke læse mappen %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Kunne ikke finde %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Fejlene vedrører filen "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Kunne ikke omsætte navnet %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Trævandring mislykkedes"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Kunne ikke åbne %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Kunne ikke »readlink« %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Kunne ikke frigøre %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Kunne ikke lænke %s til %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Nåede DeLink-begrænsningen på %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arkivet havde intet package-felt"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen tvangs-post\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " pakkeansvarlig for %s er %s, ikke %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2333,30 +2334,30 @@ msgstr ""
"bruger."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Det valgte %s blev ikke fundet"
@@ -2547,17 +2548,17 @@ msgstr "Underprocessen %s modtog en segmenteringsfejl."
msgid "Sub-process %s received signal %u."
msgstr "Underprocessen %s modtog en signal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s returnerede en fejlkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s afsluttedes uventet"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Kunne ikke åbne filen %s"
@@ -2604,6 +2605,12 @@ msgstr "Fejl ved frigivelse af filen %s"
msgid "Problem syncing the file"
msgstr "Problem under synkronisering af fil"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nøglering installeret i %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Tomt pakke-mellemlager"
@@ -3014,8 +3021,8 @@ msgstr "omdøbning mislykkedes, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hashsum stemmer ikke"
@@ -3052,7 +3059,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3062,12 +3069,12 @@ msgstr ""
"og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fejl: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3076,7 +3083,7 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3085,37 +3092,37 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Størrelsen stemmer ikke"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kunne ikke fortolke udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Ingen afsnit i udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Intet hashpunkt i udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldigt punkt 'Valid-Until' i udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ugyldigt punkt 'Date' i udgivelsesfil %s"
@@ -3215,22 +3222,22 @@ msgstr "Skriver ny kildeliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Denne disk har følgende kildeliste-indgange:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i manglende filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i ikke-trufne filer\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
@@ -3245,17 +3252,6 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s"
msgid "Hash mismatch for: %s"
msgstr "Hashsum stemmer ikke: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Fil %s starter ikke med en »clearsigned« besked"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nøglering installeret i %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3483,6 +3479,9 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre '%s' for at rette problemet."
msgid "Not locked"
msgstr "Ikke låst"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Fil %s starter ikke med en »clearsigned« besked"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Springer ikkeeksisterende fil over %s"
diff --git a/po/de.po b/po/de.po
index 60469614..ac0ca11b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-27 10:55+0200\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -1230,7 +1230,8 @@ msgid "%s was already not hold.\n"
msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
@@ -1540,7 +1541,7 @@ msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
#: methods/connect.cc:211
@@ -1553,32 +1554,32 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
msgid "Unable to connect to %s:%s:"
msgstr "Verbindung mit %s:%s nicht möglich:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte "
"jedoch nicht ermittelt werden?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"»gpgv« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist gpgv "
"installiert?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Unbekannter Fehler beim Ausführen von gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Die folgenden Signaturen waren ungültig:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1964,87 +1965,87 @@ msgstr "Archiv hat keinen Steuerungsdatensatz."
msgid "Unable to get a cursor"
msgstr "Unmöglich, einen Cursor zu bekommen"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s mit »stat« abfragen nicht möglich.\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Fehler gehören zu Datei "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s konnte nicht aufgelöst werden."
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Öffnen von %s fehlgeschlagen"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink von %s fehlgeschlagen"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Entfernen (unlink) von %s fehlgeschlagen"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-Limit von %sB erreicht\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archiv hatte kein Feld »package«"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-Betreuer ist %s und nicht %s.\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n"
@@ -2394,30 +2395,30 @@ msgstr ""
"MMap vom Benutzer deaktiviert ist."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li d %li h %li min %li s"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%li h %li min %li s"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%li min %li s"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%li s"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Auswahl %s nicht gefunden"
@@ -2616,17 +2617,17 @@ msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen."
msgid "Sub-process %s received signal %u."
msgstr "Unterprozess %s hat das Signal %u empfangen."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Unterprozess %s unerwartet beendet"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Datei %s konnte nicht geöffnet werden."
@@ -2677,6 +2678,12 @@ msgstr "Problem beim Entfernen (unlink) der Datei %s"
msgid "Problem syncing the file"
msgstr "Problem beim Synchronisieren der Datei"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Kein Schlüsselring in %s installiert"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Leerer Paketzwischenspeicher"
@@ -3105,8 +3112,8 @@ msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash-Summe stimmt nicht überein"
@@ -3143,7 +3150,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3154,12 +3161,12 @@ msgstr ""
"GPG-Fehler: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-Fehler: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3169,7 +3176,7 @@ msgstr ""
"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
"Architektur)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3178,38 +3185,38 @@ msgstr ""
"Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
"Sie dieses Paket von Hand korrigieren müssen."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Größe stimmt nicht überein"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release-Datei %s kann nicht verarbeitet werden."
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Keine Bereiche (Sections) in Release-Datei %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Kein Hash-Eintrag in Release-Datei %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ungültiger »Valid-Until«-Eintrag in Release-Datei %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
@@ -3309,22 +3316,22 @@ msgstr "Schreiben der neuen Quellliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Quelllisteneinträge für dieses Medium sind:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Es wurden %i Datensätze geschrieben.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3341,17 +3348,6 @@ msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash-Summe stimmt nicht überein für: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Kein Schlüsselring in %s installiert"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3596,6 +3592,9 @@ msgstr ""
msgid "Not locked"
msgstr "Nicht gesperrt"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Nicht vorhandene Datei %s wird übersprungen."
diff --git a/po/dz.po b/po/dz.po
index dd994747..ac74061d 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po.pot\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1176,7 +1176,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
@@ -1460,7 +1461,7 @@ msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
#: methods/connect.cc:211
@@ -1473,32 +1474,32 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་
msgid "Unable to connect to %s:%s:"
msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
"མ་ཚུགས?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1870,87 +1871,87 @@ msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་
msgid "Unable to get a cursor"
msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "ཨི:"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "ཌབ་ལུ:"
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
@@ -2297,30 +2298,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
@@ -2512,17 +2513,17 @@ msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བག
msgid "Sub-process %s received signal %u."
msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
@@ -2569,6 +2570,12 @@ msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེད
msgid "Problem syncing the file"
msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།"
@@ -2978,8 +2985,8 @@ msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འ
msgid "MD5Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
@@ -3012,7 +3019,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3020,12 +3027,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3034,7 +3041,7 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3043,38 +3050,38 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག "
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "ཚད་མ་མཐུན།"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
@@ -3171,22 +3178,22 @@ msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གས
msgid "Source list entries for this disc are:\n"
msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3203,17 +3210,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/el.po b/po/el.po
index f6252ed3..8dea2d55 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1197,7 +1197,8 @@ msgid "%s was already not hold.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
@@ -1480,7 +1481,7 @@ msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
#: methods/connect.cc:211
@@ -1493,33 +1494,33 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το
msgid "Unable to connect to %s:%s:"
msgstr "Αδύνατη η σύνδεση στο %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
"αποτυπώματος?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
"εγκατεστημένο το gpgv;)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1893,87 +1894,87 @@ msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχο
msgid "Unable to get a cursor"
msgstr "Αδύνατη η πρόσβαση σε δείκτη"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Αδύνατη η ανάγνωση του καταλόγου %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Σφάλματα στο αρχείο"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Αδύνατη η εύρεση του %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Αποτυχία ανεύρεσης"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Αποτυχία ανοίγματος του %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "Αποσύνδεση %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Αποτυχία ανάγνωσης του %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Αποτυχία αποσύνδεσης του %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr " Αποτυχία σύνδεσης του %s με το %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Αποσύνδεση ορίου του %sB hit.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s συντηρητής είναι ο %s όχι ο %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
@@ -2320,30 +2321,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Η επιλογή %s δε βρέθηκε"
@@ -2540,17 +2541,17 @@ msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμ
msgid "Sub-process %s received signal %u."
msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
@@ -2597,6 +2598,12 @@ msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
msgid "Problem syncing the file"
msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Εγκατάλειψη της εγκατάστασης."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Άδειο cache πακέτων"
@@ -3012,8 +3019,8 @@ msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
@@ -3045,7 +3052,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3053,12 +3060,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3067,7 +3074,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3076,7 +3083,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3084,31 +3091,31 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
@@ -3206,22 +3213,22 @@ msgstr "Eγγραφή νέας λίστας πηγών\n"
msgid "Source list entries for this disc are:\n"
msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Εγιναν %i εγγραφές.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
@@ -3236,17 +3243,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Εγκατάλειψη της εγκατάστασης."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/es.po b/po/es.po
index 56019b62..8209ac97 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,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: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2011-01-24 11:47+0100\n"
"Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1262,7 +1262,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ya está en su versión más reciente.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero no estaba allí"
@@ -1545,7 +1546,7 @@ msgstr "Fallo temporal al resolver «%s»"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
#: methods/connect.cc:211
@@ -1558,31 +1559,31 @@ msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "No se pudo conectar a %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error interno: Firma correcta, ¡¿pero no se pudo determinar su huella "
"digital?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Se encontró al menos una firma inválida."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"No se pudo ejecutar «gpgv» para verificar la firma (¿está instalado gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Error desconocido ejecutando gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Las siguientes firms fueron inválidas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1960,87 +1961,87 @@ msgstr "No hay registro de control del archivo"
msgid "Unable to get a cursor"
msgstr "No se pudo obtener un cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: No se pudo leer directorio %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: No se pudo leer %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Errores aplicables al archivo "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "No se pudo resolver %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Falló el recorrido por el árbol."
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "No se pudo abrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "No se pudo leer el enlace %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "No se pudo desligar %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** No pude enlazar %s con %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink se ha llegado al límite de %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archivo no tiene campo de paquetes"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no tiene entrada de predominio\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el encargado de %s es %s y no %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no tiene una entrada fuente predominante\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco tiene una entrada binaria predominante\n"
@@ -2391,30 +2392,30 @@ msgstr ""
"deshabilitado el crecimiento automático."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin. %liseg."
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin. %liseg."
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin. %liseg."
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%liseg."
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Selección %s no encontrada"
@@ -2611,17 +2612,17 @@ msgstr "El subproceso %s recibió un fallo de segmentación."
msgid "Sub-process %s received signal %u."
msgstr "El subproceso %s recibió la señal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El subproceso %s devolvió un código de error (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El subproceso %s terminó de forma inesperada"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "No pude abrir el fichero %s"
@@ -2668,6 +2669,12 @@ msgstr "Se produjo un problema al desligar el fichero %s"
msgid "Problem syncing the file"
msgstr "Se produjo un problema al sincronizar el fichero"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "No se instaló ningún anillo de claves %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Caché de paquetes vacía."
@@ -3092,8 +3099,8 @@ msgstr "falló el cambio de nombre, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "La suma hash difiere"
@@ -3127,7 +3134,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3138,12 +3145,12 @@ msgstr ""
"GPG es: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Error de GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3153,7 +3160,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3162,7 +3169,7 @@ msgstr ""
"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
"que necesita arreglar manualmente este paquete."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3170,31 +3177,31 @@ msgstr ""
"Los archivos de índice de paquetes están dañados. No existe un campo "
"«Filename:» para el paquete %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "El tamaño difiere"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "No se pudo leer el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "No se encontraron secciones en el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "No existe una entrada «Hash» en el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada «Valid-Until» inválida en el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada «Date» inválida en el archivo «Release» %s"
@@ -3294,22 +3301,22 @@ msgstr "Escribiendo nueva lista de fuente\n"
msgid "Source list entries for this disc are:\n"
msgstr "Las entradas de la lista de fuentes para este disco son:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i registros escritos.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i registros escritos con %i fichero de menos.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i registros escritos con %i fichero mal emparejado\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3325,17 +3332,6 @@ msgstr "No se pudo encontrar un registro de autenticación para: %s"
msgid "Hash mismatch for: %s"
msgstr "La suma hash difiere para: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No se instaló ningún anillo de claves %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/eu.po b/po/eu.po
index 4809d723..993e427c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1180,7 +1180,8 @@ msgid "%s was already not hold.\n"
msgstr "%s bertsiorik berriena da jada.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s espero zen baina ez zegoen han"
@@ -1468,7 +1469,7 @@ msgstr "Aldi baterako akatsa '%s' ebaztean"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
#: methods/connect.cc:211
@@ -1481,29 +1482,29 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
msgid "Unable to connect to %s:%s:"
msgstr "Ezin da konektatu -> %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Beintza sinadura baliogabe bat aurkitu da."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Errore ezezaguna gpgv exekutatzean"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Ondorengo sinadurak baliogabeak dira:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1869,87 +1870,87 @@ msgstr "Artxiboak ez du kontrol erregistrorik"
msgid "Unable to get a cursor"
msgstr "Ezin da kurtsorerik eskuratu"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Ezin da %s direktorioa irakurri\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Ezin da %s atzitu\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Erroreak fitxategiari dagozkio "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Huts egin du %s ebaztean"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Huts egin dute zuhaitz-urratsek"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Huts egin du %s irekitzean"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Huts egin du %s esteka irakurtzean"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Huts egin du %s desestekatzean"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-en mugara (%sB) heldu da.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Artxiboak ez du pakete eremurik"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s: ez du override sarrerarik\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s mantentzailea %s da, eta ez %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s: ez du jatorri gainidazketa sarrerarik\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s: ez du bitar gainidazketa sarrerarik\n"
@@ -2296,30 +2297,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "%s hautapena ez da aurkitu"
@@ -2514,17 +2515,17 @@ msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
msgid "Sub-process %s received signal %u."
msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s azpiprozesua ustekabean amaitu da"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "%s fitxategia ezin izan da ireki"
@@ -2571,6 +2572,12 @@ msgstr "Arazoa fitxategia desestekatzean"
msgid "Problem syncing the file"
msgstr "Arazoa fitxategia sinkronizatzean"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortatu instalazioa."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Paketeen katxea hutsik"
@@ -2976,8 +2983,8 @@ msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Egiaztapena ez dator bat"
@@ -3009,7 +3016,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3017,12 +3024,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3031,7 +3038,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3040,7 +3047,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3048,31 +3055,31 @@ msgstr ""
"Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Lerro baliogabea desbideratze fitxategian: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
@@ -3170,22 +3177,22 @@ msgstr "Jatorri zerrenda berria idazten\n"
msgid "Source list entries for this disc are:\n"
msgstr "Diskoarentzako jatorri sarrerak:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i erregistro grabaturik.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3201,17 +3208,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Egiaztapena ez dator bat"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortatu instalazioa."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/fi.po b/po/fi.po
index 53d63dbd..4c29cf2c 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: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1175,7 +1175,8 @@ msgid "%s was already not hold.\n"
msgstr "%s on jo uusin versio.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Odotettiin %s, mutta sitä ei ollut"
@@ -1458,7 +1459,7 @@ msgstr "Tilapäinen häiriö selvitettäessä \"%s\""
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
#: methods/connect.cc:211
@@ -1471,31 +1472,31 @@ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1866,87 +1867,87 @@ msgstr "Arkistolla ei ole ohjaustietuetta"
msgid "Unable to get a cursor"
msgstr "Kohdistinta ei saada"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kansiota %s ei voi lukea\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Tdstolle %s ei toimi stat\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Tiedostossa virheitä "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Osoitteen %s selvitys ei onnistunut"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Puun läpikäynti ei onnistunut"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Tiedoston %s avaaminen ei onnistunut"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink %s ei onnistunut"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "unlink %s ei onnistunut"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Linkin %s -> %s luonti ei onnistunut"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLinkin yläraja %st saavutettu.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arkistossa ei ollut pakettikenttää"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ylläpitäjä on %s eikä %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n"
@@ -2292,30 +2293,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Valintaa %s ei löydy"
@@ -2506,17 +2507,17 @@ msgstr "Aliprosessi %s aiheutti suojausvirheen."
msgid "Sub-process %s received signal %u."
msgstr "Aliprosessi %s aiheutti suojausvirheen."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Aliprosessi %s palautti virhekoodin (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Aliprosessi %s lopetti odottamatta"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Tiedostoa %s ei voitu avata"
@@ -2563,6 +2564,12 @@ msgstr "Pulmia tehtäessä tiedostolle unlink"
msgid "Problem syncing the file"
msgstr "Pulmia tehtäessä tiedostolle sync"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Asennus keskeytetään."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Pakettivarasto on tyhjä"
@@ -2968,8 +2975,8 @@ msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Tarkistussumma ei täsmää"
@@ -3001,7 +3008,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3009,12 +3016,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3023,7 +3030,7 @@ msgstr ""
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3032,7 +3039,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3040,31 +3047,31 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Koko ei täsmää"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Huomautus, valitaan %s eikä %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Virheellinen rivi korvautustiedostossa: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
@@ -3162,22 +3169,22 @@ msgstr "Kirjoitetaan uusi lähdeluettelo\n"
msgid "Source list entries for this disc are:\n"
msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Kirjoitettiin %i tietuetta.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3194,17 +3201,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Kohteen %s tarkistussumma ei täsmää"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Asennus keskeytetään."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/fr.po b/po/fr.po
index 129d70ba..97ff54fc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2013-03-24 08:57+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1229,7 +1229,8 @@ msgid "%s was already not hold.\n"
msgstr "%s était déjà marqué comme non figé.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "A attendu %s mais il n'était pas présent"
@@ -1539,8 +1540,8 @@ msgid "Temporary failure resolving '%s'"
msgstr "Erreur temporaire de résolution de « %s »"
#: methods/connect.cc:209
-#, c-format
-msgid "System error resolving '%s:%s' (%s)"
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
msgstr "Erreur système lors de la résolution de « %s:%s » (%s)"
#: methods/connect.cc:211
@@ -1555,32 +1556,32 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Impossible de se connecter à %s:%s :"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erreur interne : signature correcte, mais il est impossible de déterminer "
"l'empreinte de la clé."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Au moins une signature non valable a été rencontrée."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez "
"vérifier si gpgv est installé)."
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Erreur inconnue à l'exécution de gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Les signatures suivantes ne sont pas valables :\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1956,87 +1957,87 @@ msgstr "L'archive n'a pas d'enregistrement de contrôle"
msgid "Unable to get a cursor"
msgstr "Impossible d'obtenir un curseur"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A : Impossible de lire le contenu du répertoire %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A : Impossible de statuer %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E : "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A : "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E : des erreurs sont survenues sur le fichier "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Impossible de résoudre %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Échec du parcours de l'arbre"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Impossible d'ouvrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Délier %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Impossible de lire le lien %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Impossible de délier %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Impossible de lier %s à %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Seuil de delink de %so atteint.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "L'archive ne possède pas de champ de paquet"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ne possède pas d'entrée « override »\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " le responsable de %s est %s et non %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ne possède pas d'entrée « source override »\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ne possède pas également pas d'entrée « binary override »\n"
@@ -2390,30 +2391,30 @@ msgstr ""
"automatique a été désactivée par une option utilisateur."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "La sélection %s n'a pu être trouvée"
@@ -2616,17 +2617,17 @@ msgstr "Le sous-processus %s a commis une violation d'accès mémoire"
msgid "Sub-process %s received signal %u."
msgstr "Le sous-processus %s a reçu le signal %u"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Le sous-processus %s s'est arrêté prématurément"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Impossible d'ouvrir le fichier %s"
@@ -2673,6 +2674,12 @@ msgstr "Problème de suppression du lien %s"
msgid "Problem syncing the file"
msgstr "Problème de synchronisation du fichier"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Pas de porte-clés installé dans %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache des paquets vide"
@@ -3113,8 +3120,8 @@ msgstr "impossible de changer le nom, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Somme de contrôle MD5 incohérente"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Somme de contrôle de hachage incohérente"
@@ -3152,7 +3159,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3163,12 +3170,12 @@ msgstr ""
"GPG : %s : %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erreur de GPG : %s : %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3177,7 +3184,7 @@ msgstr ""
"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
"devrez corriger ce paquet vous-même (absence d'architecture)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3186,7 +3193,7 @@ msgstr ""
"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
"devrez corriger ce paquet vous-même."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3194,31 +3201,31 @@ msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Taille incohérente"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossible d'analyser le fichier Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Pas de sections dans le fichier Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Pas d'entrée de hachage dans le fichier Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrée « Date » non valable dans le fichier Release %s"
@@ -3318,22 +3325,22 @@ msgstr "Écriture de la nouvelle liste de sources\n"
msgid "Source list entries for this disc are:\n"
msgstr "Les entrées de listes de sources pour ce disque sont :\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i enregistrements écrits.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3350,17 +3357,6 @@ msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
msgid "Hash mismatch for: %s"
msgstr "Somme de contrôle de hachage incohérente pour %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Le fichier %s ne commence pas par un message signé en clair."
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Pas de porte-clés installé dans %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3603,6 +3599,9 @@ msgstr ""
msgid "Not locked"
msgstr "Non verrouillé"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Le fichier %s ne commence pas par un message signé en clair."
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Fichier %s inexistant ignoré"
diff --git a/po/gl.po b/po/gl.po
index 9bf5a9db..82122730 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1207,7 +1207,8 @@ msgid "%s was already not hold.\n"
msgstr "%s xa é a versión máis recente.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Agardouse por %s pero non estaba alí"
@@ -1491,7 +1492,7 @@ msgstr "Produciuse un fallo temporal ao buscar «%s»"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
#: methods/connect.cc:211
@@ -1504,32 +1505,32 @@ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Non é posíbel conectar %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Sinatura correcta, pero non foi posíbel determinar a pegada "
"dixital da chave"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Atopouse polo menos unha sinatura incorrecta."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Non é posíbel executar «gpgv» para verificar a sinatura (Está instalado "
"gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Produciuse un erro descoñecido ao executar gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "As seguintes sinaturas non eran correctas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1904,87 +1905,87 @@ msgstr "O arquivo non ten un rexistro de control"
msgid "Unable to get a cursor"
msgstr "Non é posíbel obter un cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: non é posíbel ler o directorio %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: non é posíbel atopar %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: os erros aplícanse ao ficheiro "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Non foi posíbel solucionar %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Fallou o percorrido da árbore"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Non foi posíbel abrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DesLig %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Non foi posíbel ler a ligazón %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Non foi posíbel desligar %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Non foi posíbel ligar %s con %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Acadouse o límite de desligado de %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "O arquivo non tiña un campo Package"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ten unha entrada de «override»\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " O mantedor de %s é %s, non %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ten unha entrada de «override» de código fonte\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampouco ten unha entrada de «override» de binarios\n"
@@ -2335,30 +2336,30 @@ msgstr ""
"desactivado polo usuario."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Non se atopou a selección %s"
@@ -2557,17 +2558,17 @@ msgstr "O subproceso %s recibiu un fallo de segmento."
msgid "Sub-process %s received signal %u."
msgstr "O subproceso %s recibiu o sinal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "O subproceso %s devolveu un código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "O subproceso %s saíu de xeito inesperado"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Non foi posíbel abrir o ficheiro %s"
@@ -2614,6 +2615,12 @@ msgstr "Produciuse un problema ao desligar o ficheiro %s"
msgid "Problem syncing the file"
msgstr "Produciuse un problema ao sincronizar o ficheiro"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Non ha ningún chaveiro instalado en %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Caché de paquetes baleira"
@@ -3032,8 +3039,8 @@ msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "A MD5Sum non coincide"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "A sumas «hash» non coinciden"
@@ -3068,7 +3075,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3079,12 +3086,12 @@ msgstr ""
"%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Produciuse un erro de GPG: %s %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3093,7 +3100,7 @@ msgstr ""
"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falta a arquitectura)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3102,7 +3109,7 @@ msgstr ""
"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3110,31 +3117,31 @@ msgstr ""
"Os ficheiros de índices de paquetes están danados. Non hai un campo "
"Filename: para o paquete %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Non se puido analizar o ficheiro de publicación %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Non hai seccións no ficheiro de publicación %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Non hai entrada de Hash no ficheiro de publicación %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "A entrada «Valid-Until» no ficheiro de publicación %s non é válida"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
@@ -3234,22 +3241,22 @@ msgstr "Escribindo a nova lista de orixes\n"
msgid "Source list entries for this disc are:\n"
msgstr "As entradas da lista de orixes deste disco son:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Escribíronse %i rexistros.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3266,17 +3273,6 @@ msgstr "Non é posíbel atopar un rexistro de autenticación para: %s"
msgid "Hash mismatch for: %s"
msgstr "Valor de hash non coincidente para: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Non ha ningún chaveiro instalado en %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/hu.po b/po/hu.po
index 325d396c..34ddd760 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt trunk\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-25 17:09+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -1195,7 +1195,8 @@ msgid "%s was already not hold.\n"
msgstr "%s eddig sem volt visszafogva.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, 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"
@@ -1502,7 +1503,7 @@ msgstr "Átmeneti hiba „%s” feloldása közben"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
#: methods/connect.cc:211
@@ -1515,29 +1516,29 @@ msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nem lehet csatlakozni ehhez: %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Belső hiba: Jó aláírás, de nem állapítható meg a kulcs ujjlenyomata."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Legalább egy aláírás érvénytelen."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Nem indítható el a „gpgv” az aláírás ellenőrzéséhez (telepítve van a gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Ismeretlen gpgv futtatási hiba"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1908,87 +1909,87 @@ msgstr "Az archívumnak nincs vezérlő rekordja"
msgid "Unable to get a cursor"
msgstr "Nem sikerült egy mutatóhoz jutni"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "F: %s nem érhető el\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "H: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "F: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "H: Hibás a fájl "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Nem sikerült feloldani ezt: %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Fabejárás nem sikerült"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s megnyitása sikertelen"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink nem hajtható végre erre: %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "%s törlése sikertelen"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s linkelése sikertelen ehhez: %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " a DeLink korlátja (%sB) elérve.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Az archívumnak nem volt csomag mezője"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s karbantartója %s, nem %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n"
@@ -2337,30 +2338,30 @@ msgstr ""
"automatikus emelést."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lin %lió %lip %limp"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lió %lip %limp"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%lip %limp"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%limp"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "%s kiválasztás nem található"
@@ -2559,17 +2560,17 @@ msgstr "%s alfolyamat szegmentálási hibát okozott."
msgid "Sub-process %s received signal %u."
msgstr "A(z) %s alfolyamat %u számú szignált kapott."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s alfolyamat hibakóddal tért vissza (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s alfolyamat váratlanul kilépett"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nem lehet megnyitni a(z) %s fájlt"
@@ -2616,6 +2617,12 @@ msgstr "Hiba a(z) %s fájl törlésekor"
msgid "Problem syncing the file"
msgstr "Hiba a fájl szinkronizálásakor"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nincs kulcstartó telepítve ide: %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Üres csomaggyorsítótár"
@@ -3039,8 +3046,8 @@ msgstr "sikertelen átnevezés, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "A Hash Sum nem megfelelő"
@@ -3076,7 +3083,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3086,12 +3093,12 @@ msgstr ""
"előző indexfájl lesz használva. GPG hiba: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hiba: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3100,7 +3107,7 @@ msgstr ""
"Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3109,38 +3116,38 @@ msgstr ""
"Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "A(z) %s Release fájl nem dolgozható fel"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nincs Hash bejegyzés a(z) %s Release fájlban"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Érvénytelen „Valid-Until” bejegyzés a(z) %s Release fájlban"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
@@ -3240,22 +3247,22 @@ msgstr "Új forráslista írása\n"
msgid "Source list entries for this disc are:\n"
msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i rekord kiírva.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i rekord kiírva, %i hiányzó fájllal.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i rekord kiírva %i eltérő fájllal\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "%i rekord kiírva %i hiányzó és %i eltérő fájllal\n"
@@ -3270,17 +3277,6 @@ msgstr "%s hitelesítési rekordja nem található"
msgid "Hash mismatch for: %s"
msgstr "%s ellenőrzőösszege nem megfelelő"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "A(z) %s fájl nem digitálisan aláírt üzenettel kezdődik"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nincs kulcstartó telepítve ide: %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3515,6 +3511,9 @@ msgstr ""
msgid "Not locked"
msgstr "Nincs zárolva"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "A(z) %s fájl nem digitálisan aláírt üzenettel kezdődik"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "A nem létező %s fájl kihagyása"
diff --git a/po/it.po b/po/it.po
index 8258eaa4..c8a1b87c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-25 21:54+0200\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1215,7 +1215,8 @@ msgid "%s was already not hold.\n"
msgstr "%s era già non bloccato.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "In attesa di %s ma non era presente"
@@ -1521,7 +1522,7 @@ msgstr "Risoluzione di \"%s\" temporaneamente non riuscita"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr ""
"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - %s)"
@@ -1536,32 +1537,32 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Impossibile connettersi a %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Errore interno: firma corretta, ma non è possibile determinare l'impronta "
"della chiave."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "È stata trovata almeno una firma non valida."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Impossibile eseguire \"gpgv\" per verificare la firma (forse gpgv non è "
"installato)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Le seguenti firme non erano valide:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1938,87 +1939,87 @@ msgstr "Impossibile ottenere un cursore"
# (ndt) messo A per Avviso
# Inizio con la maiuscola dopo i : perché mi sa che in molti
# casi molte stringhe sono così
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Impossibile leggere la directory %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Impossibile eseguire stat su %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Gli errori si applicano al file "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Risoluzione di %s non riuscita"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Visita dell'albero non riuscita"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Apertura di %s non riuscita"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Delink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Esecuzione di readlink su %s non riuscita"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Esecuzione di unlink su %s non riuscita"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Collegamento di %s a %s non riuscito"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Raggiunto il limite di DeLink di %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "L'archivio non ha un campo \"package\""
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ha un campo override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " il responsabile di %s è %s non %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ha un campo source override\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s non ha neppure un campo binario override\n"
@@ -2368,30 +2369,30 @@ msgstr ""
"ridimensionamento automatico è stato disabilitato dall'utente."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lig %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Selezione %s non trovata"
@@ -2595,17 +2596,17 @@ msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
msgid "Sub-process %s received signal %u."
msgstr "Il sottoprocesso %s ha ricevuto il segnale %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Il sottoprocesso %s è uscito inaspettatamente"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Impossibile aprire il file %s"
@@ -2652,6 +2653,12 @@ msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
msgid "Problem syncing the file"
msgstr "Si è verificato un problema nel sincronizzare il file"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nessun portachiavi installato in %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache dei pacchetti vuota"
@@ -3084,8 +3091,8 @@ msgstr "rename() non riuscita: %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5sum non corrispondente"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Somma hash non corrispondente"
@@ -3122,7 +3129,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3132,12 +3139,12 @@ msgstr ""
"aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Errore GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3146,7 +3153,7 @@ msgstr ""
"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3156,7 +3163,7 @@ msgstr ""
"correggere manualmente questo pacchetto."
# (ndt) sarebbe da controllare se veramente possono esistere più file indice
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3164,31 +3171,31 @@ msgstr ""
"I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
"per il pacchetto %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Le dimensioni non corrispondono"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossibile analizzare il file Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Nessuna sezione nel file Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nessuna voce Hash nel file Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Voce \"Valid-Until\" nel file Release %s non valida"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Voce \"Date\" nel file Release %s non valida"
@@ -3288,22 +3295,22 @@ msgstr "Scrittura nuovo elenco sorgenti\n"
msgid "Source list entries for this disc are:\n"
msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Scritti %i record.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Scritti %i record con %i file mancanti.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Scritti %i record con %i file senza corrispondenze\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3319,17 +3326,6 @@ msgstr "Impossibile trovare il record di autenticazione per %s"
msgid "Hash mismatch for: %s"
msgstr "Hash non corrispondente per %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Il file %s non inizia con un messaggio di firma in chiaro"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nessun portachiavi installato in %s."
-
# (ndt) dovrebbe essere inteso il file Release
#: apt-pkg/cacheset.cc:403
#, c-format
@@ -3576,6 +3572,9 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloccato"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Il file %s non inizia con un messaggio di firma in chiaro"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Saltato il file inesistente %s"
diff --git a/po/ja.po b/po/ja.po
index 70861162..a8872313 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-07-01 00:14+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1198,7 +1198,8 @@ msgid "%s was already not hold.\n"
msgstr "%s はすでに保留されていません。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s を待ちましたが、そこにはありませんでした"
@@ -1500,7 +1501,7 @@ msgstr "'%s' が一時的に解決できません"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
#: methods/connect.cc:211
@@ -1513,30 +1514,30 @@ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
msgid "Unable to connect to %s:%s:"
msgstr "%s:%s へ接続できません:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "少なくとも 1 つの不正な署名が発見されました。"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ"
"ていますか?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "gpgv の実行中に未知のエラーが発生"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "以下の署名が無効です:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1902,87 +1903,87 @@ msgstr "アーカイブにコントロールレコードがありません"
msgid "Unable to get a cursor"
msgstr "カーソルを取得できません"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告: ディレクトリ %s が読めません\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告: %s の状態を取得できません\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "エラー: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "警告: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "エラー: エラーが適用されるファイルは "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s の解決に失敗しました"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "ツリー内での移動に失敗しました"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s のオープンに失敗しました"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " リンク %s [%s] を外します\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "%s のリンク読み取りに失敗しました"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "%s のリンク解除に失敗しました"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s を %s にリンクするのに失敗しました"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " リンクを外す制限の %sB に到達しました。\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "アーカイブにパッケージフィールドがありませんでした"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s に override エントリがありません\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %1$s メンテナは %3$s ではなく %2$s です\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s にソース override エントリがありません\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s にバイナリ override エントリがありません\n"
@@ -2329,30 +2330,30 @@ msgstr ""
"自動増加がユーザによって無効にされているため、MMap のサイズを増やせません。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li日 %li時間 %li分 %li秒"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%li時間 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "選択された %s が見つかりません"
@@ -2548,17 +2549,17 @@ msgstr "子プロセス %s がセグメンテーション違反を受け取り
msgid "Sub-process %s received signal %u."
msgstr "子プロセス %s がシグナル %u を受け取りました。"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子プロセス %s がエラーコード (%u) を返しました"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子プロセス %s が予期せず終了しました"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "ファイル %s をオープンできませんでした"
@@ -2605,6 +2606,12 @@ msgstr "ファイル %s の削除中に問題が発生しました"
msgid "Problem syncing the file"
msgstr "ファイルの同期中に問題が発生しました"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s にキーリングがインストールされていません。"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "空のパッケージキャッシュ"
@@ -3024,8 +3031,8 @@ msgstr "名前の変更に失敗しました。%s (%s -> %s)"
msgid "MD5Sum mismatch"
msgstr "MD5Sum が適合しません"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "ハッシュサムが適合しません"
@@ -3063,7 +3070,7 @@ msgstr ""
"ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し"
"ました)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3073,12 +3080,12 @@ msgstr ""
"ファイルが使われます。GPG エラー: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG エラー: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3087,7 +3094,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3096,7 +3103,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります。"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3104,31 +3111,31 @@ msgstr ""
"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
"フィールドがありません。"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "サイズが適合しません"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release ファイル %s を解釈することができません"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Release ファイル %s にセクションがありません"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release ファイル %s に Hash エントリがありません"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
@@ -3228,22 +3235,22 @@ msgstr "新しいソースリストを書き込んでいます\n"
msgid "Source list entries for this disc are:\n"
msgstr "このディスクのソースリストのエントリ:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i レコードを書き込みました。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3260,17 +3267,6 @@ msgstr "認証レコードが見つかりません: %s"
msgid "Hash mismatch for: %s"
msgstr "ハッシュサムが適合しません: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "ファイル %s はクリア署名されたメッセージで始まっていません"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s にキーリングがインストールされていません。"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3507,5 +3503,8 @@ msgstr ""
msgid "Not locked"
msgstr "ロックされていません"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "ファイル %s はクリア署名されたメッセージで始まっていません"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "存在しないファイル %s をスキップしています"
diff --git a/po/km.po b/po/km.po
index aea6d34c..6e938ff0 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_km\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1160,7 +1160,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
@@ -1442,7 +1443,7 @@ msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
#: methods/connect.cc:211
@@ -1455,29 +1456,29 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក
msgid "Unable to connect to %s:%s:"
msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1841,87 +1842,87 @@ msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រ
msgid "Unable to get a cursor"
msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W ៖ មិន​អាច​ថ្លែង %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "មែក​ធាង បាន​បរាជ័យ"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
@@ -2266,30 +2267,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
@@ -2480,17 +2481,17 @@ msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​ក
msgid "Sub-process %s received signal %u."
msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
@@ -2537,6 +2538,12 @@ msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់
msgid "Problem syncing the file"
msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​"
@@ -2941,8 +2948,8 @@ msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (
msgid "MD5Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
@@ -2975,7 +2982,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2983,12 +2990,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2997,7 +3004,7 @@ msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
"(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3005,37 +3012,37 @@ msgid ""
msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
@@ -3132,22 +3139,22 @@ msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ
msgid "Source list entries for this disc are:\n"
msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "បានសរសេរ %i កំណត់ត្រា ។\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
@@ -3162,17 +3169,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ko.po b/po/ko.po
index ba7f6bef..9d84ac23 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1177,7 +1177,8 @@ msgid "%s was already not hold.\n"
msgstr "%s 패키지는 이미 최신 버전입니다.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
@@ -1460,7 +1461,7 @@ msgstr "'%s'의 주소를 알아내는데 임시로 실패했습니다"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)"
#: methods/connect.cc:211
@@ -1473,29 +1474,29 @@ msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생
msgid "Unable to connect to %s:%s:"
msgstr "%s:%s에 연결할 수 없습니다:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "다음 서명이 올바르지 않습니다:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1862,88 +1863,88 @@ msgstr "아카이브에 컨트롤 기록이 없습니다"
msgid "Unable to get a cursor"
msgstr "커서를 가져올 수 없습니다"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "경고: %s의 정보를 읽을 수 없습니다\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "오류: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "경고: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s의 경로를 알아내는데 실패했습니다"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "트리에서 이동이 실패했습니다"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s 파일을 여는데 실패했습니다"
# FIXME: ??
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " 링크 %s [%s] 없애기\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "%s 파일에 readlink하는데 실패했습니다"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "%s 파일을 지우는데 실패했습니다"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "아카이브에 패키지 필드가 없습니다"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s에는 override 항목이 없습니다\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 관리자가 %s입니다 (%s 아님)\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s에는 source override 항목이 없습니다\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s에는 binary override 항목이 없습니다\n"
@@ -2289,30 +2290,30 @@ msgstr ""
"mmap 크기를 늘릴 수 없습니다. 자동으로 늘리는 기능을 사용자가 금지했습니다."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li일 %li시간 %li분 %li초"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%li시간 %li분 %li초"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%li분 %li초"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%li초"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "선택한 %s이(가) 없습니다"
@@ -2503,17 +2504,17 @@ msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받
msgid "Sub-process %s received signal %u."
msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "%s 파일을 열 수 없습니다"
@@ -2560,6 +2561,12 @@ msgstr "%s 파일을 삭제하는데 문제가 있습니다"
msgid "Problem syncing the file"
msgstr "파일을 동기화하는데 문제가 있습니다"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s에 키 모음을 설치하지 않았습니다."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "패키지 캐시가 비어 있습니다"
@@ -2968,8 +2975,8 @@ msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "해시 합이 맞지 않습니다"
@@ -3001,7 +3008,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3011,12 +3018,12 @@ msgstr ""
"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 오류: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3025,7 +3032,7 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3034,38 +3041,38 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Release 파일 %s에 섹션이 없습니다"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release 파일 %s에 Hash 항목이 없습니다"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
@@ -3163,22 +3170,22 @@ msgstr "새 소스 리스트를 쓰는 중입니다\n"
msgid "Source list entries for this disc are:\n"
msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "레코드 %i개를 썼습니다.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
@@ -3193,17 +3200,6 @@ msgstr "다음의 인증 기록을 찾을 수 없습니다: %s"
msgid "Hash mismatch for: %s"
msgstr "다음의 해시가 다릅니다: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s에 키 모음을 설치하지 않았습니다."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ku.po b/po/ku.po
index e584866a..6f1e3148 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-ku\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2008-05-08 12:48+0200\n"
"Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
"Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -1063,7 +1063,8 @@ msgid "%s was already not hold.\n"
msgstr "%s jixwe guhertoya nûtirîn e.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1344,7 +1345,7 @@ msgstr ""
#: methods/connect.cc:209
#, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr ""
#: methods/connect.cc:211
@@ -1357,29 +1358,29 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Nikare bi %s re girêdan pêk bîne %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Di xebitandina gpgv de çewtiya nenas"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1690,87 +1691,87 @@ msgstr "Tomara kontrola arşîvê tuneye"
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: pelrêça %s nayê xwendin\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s ji hev nehate veçirandin"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s venebû"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Di arşîvê de qada pakêtê tuneye"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2110,30 +2111,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Hilbijartina %s nehatiye dîtin"
@@ -2324,17 +2325,17 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nikarî pelê %s veke"
@@ -2381,6 +2382,12 @@ msgstr "Di girtina pelî de pirsgirêkek derket"
msgid "Problem syncing the file"
msgstr ""
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Sazkirin tê betalkirin."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2775,8 +2782,8 @@ msgstr "nav guherandin biserneket, %s (%s -> %s)"
msgid "MD5Sum mismatch"
msgstr "MD5Sum li hev nayên"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash Sum li hev nayên"
@@ -2808,7 +2815,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2816,56 +2823,56 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Mezinahî li hev nayên"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Pakêt nehate dîtin %s"
@@ -2959,22 +2966,22 @@ msgstr ""
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i tomar hatin nivîsîn.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2989,17 +2996,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Hash Sum li hev nayên"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Sazkirin tê betalkirin."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/lt.po b/po/lt.po
index a7209df6..d8e98938 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1090,7 +1090,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ir taip jau yra naujausias.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1368,9 +1369,9 @@ msgid "Temporary failure resolving '%s'"
msgstr "Laikinas sutrikimas ieškant vardo „%s“"
#: methods/connect.cc:209
-#, c-format
-msgid "System error resolving '%s:%s' (%s)"
-msgstr ""
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Laikinas sutrikimas ieškant vardo „%s“"
#: methods/connect.cc:211
#, c-format
@@ -1382,28 +1383,28 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Nepavyko prisijungti prie %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Nežinoma klaida kviečiant gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Šie parašai buvo nevalidūs:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1777,87 +1778,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Į: Nepavyko perskaityti aplanko %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Į: Nepavyko patikrinti %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "K: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "Į: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "K: Klaidos failui "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Nepavyko išspręsti %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Judesys medyje nepavyko"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Nepavyko atverti %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Nepavyko nuskaityti nuorodos %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Nepavyko atsieti nuorodos %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nepavyko susieti %s su %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archyvas neturėjo paketo lauko"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s neturi perrašymo įrašo\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s prižiūrėtojas yra %s, o ne %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2204,30 +2205,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2418,17 +2419,17 @@ msgstr "Procesas %s gavo segmentavimo klaidą"
msgid "Sub-process %s received signal %u."
msgstr "Procesas %s gavo segmentavimo klaidą"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Procesas %s grąžino klaidos kodą (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Procesas %s netikėtai išėjo"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nepavyko atverti failo %s"
@@ -2475,6 +2476,12 @@ msgstr "Klaida užveriant failą"
msgid "Problem syncing the file"
msgstr "Klaida sinchronizuojant failą"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Diegimas nutraukiamas."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2874,8 +2881,8 @@ msgstr ""
msgid "MD5Sum mismatch"
msgstr "MD5 sumos neatitikimas"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Maišos sumos nesutapimas"
@@ -2907,7 +2914,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2915,56 +2922,56 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG klaida: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Neatitinka dydžiai"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Pastaba: pažymimas %s vietoje %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Pastaba: pažymimas %s vietoje %s\n"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nepavyko atverti DB failo %s: %s"
@@ -3058,22 +3065,22 @@ msgstr "Rašomas naujas šaltinių sąrašas\n"
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3088,17 +3095,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Maišos sumos nesutapimas"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Diegimas nutraukiamas."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/mr.po b/po/mr.po
index 3b2b8a45..300573bd 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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 "
@@ -1162,7 +1162,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
@@ -1445,7 +1446,7 @@ msgstr "'%s' रिझॉल्व्ह करताना तात्पु
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
#: methods/connect.cc:211
@@ -1458,30 +1459,30 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क
msgid "Unable to connect to %s:%s:"
msgstr "%s %s ला जोडण्यास असमर्थ:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "किमान एक अवैध सही सापडली."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "खालील सह्या अवैध आहेत:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1846,87 +1847,87 @@ msgstr "अर्काईव्ह मध्ये नियंत्रण म
msgid "Unable to get a cursor"
msgstr "संकेतक घेण्यास असमर्थ"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E:"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "धो.सू.:"
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "ई: संचिकेला लागू होणाऱ्या चुका"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s सोडवण्यास असमर्थ"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "ट्री चालणे असमर्थ"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s उघडण्यास असमर्थ"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "%s [%s] डी दुवा\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "%s वाचणारा दुवा असमर्थ"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "%s दुवा काढण्यास असमर्थ"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "%s चा %s दुवा साधण्यास असमर्थ"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB हीट ची डिलींक मर्यादा\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
@@ -2271,30 +2272,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "%s निवडक भाग सापडत नाही"
@@ -2485,17 +2486,17 @@ msgstr "%s उपक्रियेला सेगमेंटेशन दो
msgid "Sub-process %s received signal %u."
msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s उपक्रिया अचानकपणे बाहेर पडली"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "%s फाईल उघडता येत नाही"
@@ -2542,6 +2543,12 @@ msgstr "फाईल अनलिंकिंग करण्यात अडच
msgid "Problem syncing the file"
msgstr "संचिकेची syncing समस्या"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "संस्थापन खंडित करत आहे."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "पॅकेज अस्थाई स्मृतिकोष"
@@ -2951,8 +2958,8 @@ msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s
msgid "MD5Sum mismatch"
msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "हॅश बेरीज जुळत नाही"
@@ -2984,7 +2991,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2992,12 +2999,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3006,7 +3013,7 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3015,7 +3022,7 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3023,31 +3030,31 @@ msgstr ""
"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
"ठिकाण %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "आकार जुळतनाही"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
@@ -3145,22 +3152,22 @@ msgstr "नविन स्त्रोत सूची लिहित आह
msgid "Source list entries for this disc are:\n"
msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i माहितीसंच लिहिले.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच लिहिले.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
@@ -3175,17 +3182,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "हॅश बेरीज जुळत नाही"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "संस्थापन खंडित करत आहे."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/nb.po b/po/nb.po
index b51e2be5..99544811 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1188,7 +1188,8 @@ msgid "%s was already not hold.\n"
msgstr "%s er allerede nyeste versjon.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventet på %s, men den ble ikke funnet"
@@ -1473,7 +1474,7 @@ msgstr "Midlertidig feil ved oppslag av «%s»"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
#: methods/connect.cc:211
@@ -1486,29 +1487,29 @@ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikke koble til %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Minst en ugyldig signatur ble funnet."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Ukjent feil ved kjøring av gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "De følgende signaturene var ugyldige:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1880,87 +1881,87 @@ msgstr "Arkivet har ingen kontrollpost"
msgid "Unable to get a cursor"
msgstr "Klarte ikke å finne en peker"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Klarte ikke å lese katalogen %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Klarte ikke å få statusen på %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F:"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A:"
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Det er feil ved fila"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Klarte ikke å slå opp %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Klarte ikke å finne fram i treet"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Klarte ikke å åpne %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Klarte ikke å lese lenken %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Klarte ikke å oppheve lenken %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Klarte ikke å lenke %s til %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa på %s B er nådd.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arkivet har ikke noe pakkefelt"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen overstyringsoppføring\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikeholderen er %s, ikke %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen kildeoverstyringsoppføring\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har ingen binæroverstyringsoppføring heller\n"
@@ -2311,30 +2312,30 @@ msgstr ""
"av brukeren."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lit %lim %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lit %lim %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%lim %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Fant ikke utvalget %s"
@@ -2525,17 +2526,17 @@ msgstr "Underprosessen %s mottok et minnefeilsignal."
msgid "Sub-process %s received signal %u."
msgstr "Underprosessen %s mottok signalet %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s ga en feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avsluttet uventet"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Klarte ikke åpne fila %s"
@@ -2582,6 +2583,12 @@ msgstr "Problem ved oppheving av lenke til fila %s"
msgid "Problem syncing the file"
msgstr "Problem ved oppdatering av fila"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nøkkelring installert i %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Tomt pakkelager"
@@ -2990,8 +2997,8 @@ msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hashsummen stemmer ikke"
@@ -3024,7 +3031,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3034,12 +3041,12 @@ msgstr ""
"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-feil: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3048,7 +3055,7 @@ msgstr ""
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3057,37 +3064,37 @@ msgstr ""
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Feil størrelse"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Klarer ikke å fortolke Release-fila %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Ingen avsnitt i Release-fila %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ingen sjekksumoppføring i Release-fila %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
@@ -3187,22 +3194,22 @@ msgstr "Skriver ny kildeliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Kildelisteoppføringer for denne CD-en er:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i manglende filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i feile filer.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
@@ -3217,17 +3224,6 @@ msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
msgid "Hash mismatch for: %s"
msgstr "Hashsummen stemmer ikke for: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nøkkelring installert i %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ne.po b/po/ne.po
index 02c55d0d..d2464544 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1160,7 +1160,8 @@ msgid "%s was already not hold.\n"
msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
@@ -1443,7 +1444,7 @@ msgstr "'%s' हल गर्दा अस्थायी असफल"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
#: methods/connect.cc:211
@@ -1456,29 +1457,29 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट
msgid "Unable to connect to %s:%s:"
msgstr "%s %s मा जडान गर्न असफल भयो:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1843,87 +1844,87 @@ msgstr "संग्रह संग नियन्त्रण रेकर्
msgid "Unable to get a cursor"
msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s स्थिर गर्न असक्षम\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "%s हल गर्न असफल भयो"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "ट्री हिडाईँ असफल भयो"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s खोल्न असफल"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "लिङ्क पढ्न असफल %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "अनलिङ्क गर्न असफल %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s मा %s लिङ्क असफल भयो"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s संभारकर्ता %s हो %s होइन\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
@@ -2268,30 +2269,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "चयन %s फेला पार्न सकिएन"
@@ -2482,17 +2483,17 @@ msgstr "सहायक प्रक्रिया %s ले खण्डिक
msgid "Sub-process %s received signal %u."
msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "फाइल %s खोल्न सकिएन"
@@ -2539,6 +2540,12 @@ msgstr "फाइल अनलिङ्क गर्दा समस्या"
msgid "Problem syncing the file"
msgstr "फाइल गुप्तिकरण गर्दा समस्या"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "स्थापना परित्याग गरिदैछ ।"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "खाली प्याकेज क्यास"
@@ -2944,8 +2951,8 @@ msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s)
msgid "MD5Sum mismatch"
msgstr "MD5Sum मेल भएन"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum मेल भएन"
@@ -2978,7 +2985,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2986,12 +2993,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3000,7 +3007,7 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3009,37 +3016,37 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् ।"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "साइज मेल खाएन"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
@@ -3136,22 +3143,22 @@ msgstr "नयाँ स्रोत सूचि लेखिदैछ\n"
msgid "Source list entries for this disc are:\n"
msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i रेकर्डहरू लेखियो ।\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
@@ -3166,17 +3173,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum मेल भएन"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "स्थापना परित्याग गरिदैछ ।"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/nl.po b/po/nl.po
index fc47d1e3..4e438491 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.15.9\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2011-12-05 17:10+0100\n"
"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -1205,7 +1205,8 @@ msgid "%s was already not hold.\n"
msgstr "%s is reeds de nieuwste versie.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Er is gewacht op %s, maar die kwam niet"
@@ -1489,7 +1490,7 @@ msgstr "Tijdelijke fout bij het opzoeken van '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1502,32 +1503,32 @@ msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Kan geen verbinding maken met %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n"
"niet bepalen?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Er is tenminste één ongeldige ondertekening gevonden."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Kon 'gpgv' niet uitvoeren om ondertekening te verifiëren (is gpgv "
"geïnstalleerd?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Onbekende fout bij het uitvoeren van gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "De volgende ondertekeningen waren ongeldig:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1908,87 +1909,87 @@ msgstr "Archief heeft geen 'control'-record"
msgid "Unable to get a cursor"
msgstr "Kan geen cursor verkrijgen"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kon map %s niet lezen\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Kon de status van %s niet opvragen\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Er zijn fouten van toepassing op het bestand "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Oplossen van %s is mislukt"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Doorlopen boomstructuur is mislukt"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Openen van %s is mislukt"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " OntlLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink op %s is mislukt"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Ontlinken van %s is mislukt"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Linken van %s aan %s is mislukt"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Ontlinklimiet van %sB bereikt.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archief heeft geen 'package'-veld"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s heeft geen voorrangsingang\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s beheerder is %s, niet %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
@@ -2338,30 +2339,30 @@ msgstr ""
"door de gebruiker is uitgeschakeld."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %liu %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%liu %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Selectie %s niet gevonden"
@@ -2560,17 +2561,17 @@ msgstr "Subproces %s ontving een segmentatiefout."
msgid "Sub-process %s received signal %u."
msgstr "Subproces %s ontving signaal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Subproces %s gaf de foutcode %u terug"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subproces %s sloot onverwacht af"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Kon het bestand %s niet openen"
@@ -2617,6 +2618,12 @@ msgstr "Probleem bij het ontlinken van het bestand %s"
msgid "Problem syncing the file"
msgstr "Probleem bij het synchroniseren van het bestand"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Geen sleutelring geïnstalleerd in %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Lege pakketcache"
@@ -3038,8 +3045,8 @@ msgstr "herbenoeming is mislukt, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5-som komt niet overeen"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash-som komt niet overeen"
@@ -3072,7 +3079,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3083,12 +3090,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fout: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3097,7 +3104,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens missende architectuur)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, fuzzy, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3106,7 +3113,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3114,31 +3121,31 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kon Release-bestand %s niet ontleden"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Geen secties in Release-bestand %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Geen Hash-vermelding in Release-bestand %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Geen 'Valid-Until'-vermelding in Release-bestand %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Geen 'Date'-vermelding in Release-bestand %s"
@@ -3238,22 +3245,22 @@ msgstr "Nieuwe bronlijst wordt weggeschreven\n"
msgid "Source list entries for this disc are:\n"
msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i records weggeschreven.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i records weggeschreven met %i missende bestanden.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3270,17 +3277,6 @@ msgstr "Kan geen authenticatierecord vinden voor: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash-som komt niet overeen voor: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Geen sleutelring geïnstalleerd in %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/nn.po b/po/nn.po
index 9c4e9970..1b1eb7fd 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1175,7 +1175,8 @@ msgid "%s was already not hold.\n"
msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Venta p %s, men den fanst ikkje"
@@ -1460,7 +1461,7 @@ msgstr "Mellombels feil ved oppslag av %s"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
#: methods/connect.cc:211
@@ -1473,29 +1474,29 @@ msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikkje kopla til %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1855,87 +1856,87 @@ msgstr "Arkivet har ingen kontrollpost"
msgid "Unable to get a cursor"
msgstr "Klarte ikkje f peikar"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ": Klarte ikkje lesa katalogen %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ": Klarte ikkje f status til %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr ": "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Det er feil ved fila "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Klarte ikkje sl opp %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Treklatring mislukkast"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Klarte ikkje opna %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Klarte ikkje lesa lenkja %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Klarte ikkje oppheva lenkja %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Klarte ikkje lenkja %s til %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa p %sB er ndd.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arkivet har ikkje noko pakkefelt"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikehaldaren er %s, ikkje %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har inga overstyringsoppfring\n"
@@ -2281,30 +2282,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Fann ikkje utvalet %s"
@@ -2495,17 +2496,17 @@ msgstr "Underprosessen %s mottok ein segmenteringsfeil."
msgid "Sub-process %s received signal %u."
msgstr "Underprosessen %s mottok ein segmenteringsfeil."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s returnerte ein feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avslutta uventa"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Klarte ikkje opna fila %s"
@@ -2552,6 +2553,12 @@ msgstr "Problem ved oppheving av lenkje til fila"
msgid "Problem syncing the file"
msgstr "Problem ved synkronisering av fila"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Avbryt installasjon."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Tomt pakkelager"
@@ -2963,8 +2970,8 @@ msgstr "endring av namn mislukkast, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Feil MD5-sum"
@@ -2997,7 +3004,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3005,12 +3012,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3019,7 +3026,7 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3027,38 +3034,38 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Feil storleik"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Merk, vel %s i staden for %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldig linje i avleiingsfila: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
@@ -3155,22 +3162,22 @@ msgstr "Skriv ny kjeldeliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Kjeldelisteoppfringar for denne disken er:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skreiv %i postar.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skreiv %i postar med %i manglande filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
@@ -3185,17 +3192,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Feil MD5-sum"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Avbryt installasjon."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/pl.po b/po/pl.po
index d8e9d249..218b3769 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: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1222,7 +1222,8 @@ msgid "%s was already not hold.\n"
msgstr "%s został już odznaczony jako zatrzymany.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Oczekiwano na proces %s, ale nie było go"
@@ -1530,7 +1531,7 @@ msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\""
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
#: methods/connect.cc:211
@@ -1543,31 +1544,31 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nie udało się połączyć z %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Błąd wewnętrzny: Prawidłowy podpis, ale nie udało się ustalić odcisku klucza!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Nie udało się uruchomić gpgv by zweryfikować podpis (czy gpgv jest "
"zainstalowane?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Nieznany błąd podczas uruchamiania gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Następujące podpisy były błędne:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1941,87 +1942,87 @@ msgstr "Archiwum nie posiada rekordu kontrolnego"
msgid "Unable to get a cursor"
msgstr "Nie udało się pobrać kursora"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Nie udało się odczytać katalogu %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Nie można wykonać operacji stat na %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Błędy odnoszą się do pliku "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Nie udało się przetłumaczyć nazwy %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Przejście po drzewie nie powiodło się"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Nie udało się otworzyć %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Odłączenie %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Nie udało się odczytać dowiązania %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Nie udało się usunąć %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nie udało się dowiązać %s do %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archiwum nie posiadało pola pakietu"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nie posiada wpisu w pliku override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " opiekunem %s jest %s, a nie %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nie posiada wpisu w pliku override źródeł\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nie posiada również wpisu w pliku override binariów\n"
@@ -2371,30 +2372,30 @@ msgstr ""
"zostało wyłączone przez użytkownika."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lidni %lig %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lig %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Nie odnaleziono wyboru %s"
@@ -2592,17 +2593,17 @@ msgstr "Podproces %s spowodował naruszenie ochrony pamięci."
msgid "Sub-process %s received signal %u."
msgstr "Podproces %s otrzymał sygnał %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s zwrócił kod błędu (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s zakończył się niespodziewanie"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nie udało się otworzyć pliku %s"
@@ -2649,6 +2650,12 @@ msgstr "Problem przy odlinkowywaniu pliku %s"
msgid "Problem syncing the file"
msgstr "Problem przy zapisywaniu pliku na dysk"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Brak zainstalowanej bazy kluczy w %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Pusty magazyn podręczny pakietów"
@@ -3061,8 +3068,8 @@ msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
msgid "MD5Sum mismatch"
msgstr "Błędna suma MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Błędna suma kontrolna"
@@ -3098,7 +3105,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3108,12 +3115,12 @@ msgstr ""
"w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Błąd GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3122,7 +3129,7 @@ msgstr ""
"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3131,38 +3138,38 @@ msgstr ""
"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
"będzie ręcznie naprawić ten pakiet."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Błędny rozmiar"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nie udało się przeanalizować pliku Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Brak sekcji w pliku Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Brak wpisu Hash w pliku Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nieprawidłowy wpis Date w pliku Release %s"
@@ -3262,22 +3269,22 @@ msgstr "Zapisywanie nowej listy źródeł\n"
msgid "Source list entries for this disc are:\n"
msgstr "Źródła dla tej płyty to:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapisano %i rekordów.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n"
@@ -3292,17 +3299,6 @@ msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s"
msgid "Hash mismatch for: %s"
msgstr "Błędna suma kontrolna dla: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Plik %s nie zaczyna się wiadomością podpisaną w trybie clearsign"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Brak zainstalowanej bazy kluczy w %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3548,6 +3544,9 @@ msgstr ""
msgid "Not locked"
msgstr "Niezablokowany"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Plik %s nie zaczyna się wiadomością podpisaną w trybie clearsign"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Pomijanie nieistniejącego pliku %s"
diff --git a/po/pt.po b/po/pt.po
index b6b5d8b0..073a34c0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1201,7 +1201,8 @@ msgid "%s was already not hold.\n"
msgstr "%s já estava para não manter.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperou por %s mas não estava lá"
@@ -1504,7 +1505,7 @@ msgstr "Falha temporária a resolver '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1517,32 +1518,32 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Não foi possível ligar a %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
"digital da chave?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Pelo menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Não foi possível executar 'gpgv' para verificar a assinatura (o gpgv está "
"instalado?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Erro desconhecido ao executar gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1916,87 +1917,87 @@ msgstr "O arquivo não tem registo de controlo"
msgid "Unable to get a cursor"
msgstr "Não foi possível obter um cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Não foi possível ler o directório %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Não foi possível fazer stat %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Os erros aplicam-se ao ficheiro "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Falhou resolver %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Falhou ao percorrer a árvore"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Falhou abrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Falhou o readlink %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Falhou o unlink %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falhou ligar %s a %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arquivo não possuía campo package"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " o maintainer de %s é %s, não %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui fonte de entrada de 'override'\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada binária de 'override'\n"
@@ -2344,30 +2345,30 @@ msgstr ""
"está desabilitado pelo utilizador."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "A selecção %s não foi encontrada"
@@ -2569,17 +2570,17 @@ msgstr "O sub-processo %s recebeu uma falha de segmentação."
msgid "Sub-process %s received signal %u."
msgstr "O sub-processo %s recebeu o sinal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "O sub-processo %s retornou um código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "O sub-processo %s terminou inesperadamente"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Não foi possível abrir ficheiro o %s"
@@ -2626,6 +2627,12 @@ msgstr "Problema ao remover o link do ficheiro %s"
msgid "Problem syncing the file"
msgstr "Problema sincronizando o ficheiro"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nenhum keyring instalado em %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache de pacotes vazia"
@@ -3049,8 +3056,8 @@ msgstr "falhou renomear, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum não coincide"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Código de verificação hash não coincide"
@@ -3088,7 +3095,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3099,12 +3106,12 @@ msgstr ""
"GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erro GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3114,7 +3121,7 @@ msgstr ""
"significar que você precisa corrigir manualmente este pacote. (devido a "
"arquitectura em falta)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3123,7 +3130,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3131,31 +3138,31 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Não foi possível fazer parse ao ficheiro Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Nenhuma secção, no ficheiro Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nenhuma entrada hash no ficheiro Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
@@ -3255,22 +3262,22 @@ msgstr "A escrever lista de novas source\n"
msgid "Source list entries for this disc are:\n"
msgstr "As entradas de listas de Source para este Disco são:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Escreveu %i registos.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3287,17 +3294,6 @@ msgstr "Não foi possível encontrar registo de autenticação para: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash não coincide para: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "O ficheiro %s não começa com uma mensagem assinada"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nenhum keyring instalado em %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3539,6 +3535,9 @@ msgstr ""
msgid "Not locked"
msgstr "Sem acesso exclusivo"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "O ficheiro %s não começa com uma mensagem assinada"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "A saltar ficheiro %s inexistente"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bc73f09d..b4ecf3ed 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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."
@@ -1190,7 +1190,8 @@ msgid "%s was already not hold.\n"
msgstr "%s já é a versão mais nova.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperado %s mas este não estava lá"
@@ -1473,7 +1474,7 @@ msgstr "Falha temporária resolvendo '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
#: methods/connect.cc:211
@@ -1486,33 +1487,33 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Impossível conectar em %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Assinatura boa, mas não foi possível determinar a impressão "
"digital da chave?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Ao menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
"instalado?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Erro desconhecido executando gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1886,87 +1887,87 @@ msgstr "Repositório não possui registro de controle"
msgid "Unable to get a cursor"
msgstr "Impossível obter um cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Impossível ler o diretório %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Impossível executar \"stat\" em %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Erros que se aplicam ao arquivo "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Falhou ao resolver %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Falhou ao percorrer a árvore"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Falhou ao abrir %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Falhou ao executar \"readlink\" %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Falhou ao executar \"unlink\" %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falhou ao ligar %s a %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Repositório não possuía campo pacote"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " mantenedor de %s é %s, não %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui entrada override fonte\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada override binária\n"
@@ -2313,30 +2314,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Seleção %s não encontrada"
@@ -2530,17 +2531,17 @@ msgstr "Sub-processo %s recebeu uma falha de segmentação."
msgid "Sub-process %s received signal %u."
msgstr "Sub-processo %s recebeu uma falha de segmentação."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Sub-processo %s retornou um código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Sub-processo %s finalizou inesperadamente"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Não foi possível abrir arquivo %s"
@@ -2587,6 +2588,12 @@ msgstr "Problema removendo o arquivo"
msgid "Problem syncing the file"
msgstr "Problema sincronizando o arquivo"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortando instalação."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache de pacotes vazio"
@@ -3007,8 +3014,8 @@ msgstr "renomeação falhou, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash Sum incorreto"
@@ -3040,7 +3047,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3048,12 +3055,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3063,7 +3070,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3072,7 +3079,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3080,31 +3087,31 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
"\" para o pacote %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Tamanho incorreto"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Nota, selecionando %s ao invés de %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Linha inválida no arquivo de desvios: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Impossível analisar arquivo de pacote %s (1)"
@@ -3202,22 +3209,22 @@ msgstr "Gravando nova lista de fontes\n"
msgid "Source list entries for this disc are:\n"
msgstr "Entradas na lista de fontes para este disco são:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Gravados %i registros.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Gravados %i registros com %i arquivos faltando.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Gravados %i registros com %i arquivos que não combinam\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3234,17 +3241,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Hash Sum incorreto"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortando instalação."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ro.po b/po/ro.po
index f21f604a..662d0c72 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1192,7 +1192,8 @@ msgid "%s was already not hold.\n"
msgstr "%s este deja la cea mai nouă versiune.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Așteptat %s, dar n-a fost acolo"
@@ -1478,7 +1479,7 @@ msgstr "Eșec temporar la rezolvarea lui „%s”"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
#: methods/connect.cc:211
@@ -1491,32 +1492,32 @@ msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina "
"amprenta digitale a cheii?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Eroare necunoscută în timp ce se execută gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Următoarele semnături nu au fost valide:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1893,87 +1894,87 @@ msgstr "Arhiva nu are înregistrare de control"
msgid "Unable to get a cursor"
msgstr "Nu s-a putut obține un cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Nu s-a putut citi directorul %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Nu s-a putut efectua „stat” pentru %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Erori la fișierul "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Eșec la „resolve” pentru %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Parcurgerea arborelui a eșuat"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Eșec la „open” pentru %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Dezlegare %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Eșec la „readlink” pentru %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Eșec la „unlink” pentru %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Eșec la „link” între %s și %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arhiva nu are câmp de pachet"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nu are intrare de înlocuire\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s responsabil este %s nu %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nu are nici o intrare sursă de înlocuire\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nu are nici intrare binară de înlocuire\n"
@@ -2323,30 +2324,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Selecția %s nu a fost găsită"
@@ -2540,17 +2541,17 @@ msgstr "Subprocesul %s a primit o eroare de segmentare."
msgid "Sub-process %s received signal %u."
msgstr "Subprocesul %s a primit o eroare de segmentare."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Subprocesul %s a întors un cod de eroare (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subprocesul %s s-a terminat brusc"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nu s-a putut deschide fișierul %s"
@@ -2597,6 +2598,12 @@ msgstr "Problemă la dezlegarea fișierului"
msgid "Problem syncing the file"
msgstr "Problemă în timpul sincronizării fișierului"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abandonez instalarea."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache gol de pachet"
@@ -3012,8 +3019,8 @@ msgstr "redenumire eșuată, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Nepotrivire la suma de căutare"
@@ -3047,7 +3054,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3055,12 +3062,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3069,7 +3076,7 @@ msgstr ""
"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3078,7 +3085,7 @@ msgstr ""
"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
"că aveți nevoie să depanați manual acest pachet."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3086,31 +3093,31 @@ msgstr ""
"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Notă, se selectează %s în locul lui %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
@@ -3209,22 +3216,22 @@ msgstr "Scriere noua listă sursă\n"
msgid "Source list entries for this disc are:\n"
msgstr "Intrările listei surselor pentru acest disc sunt:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "S-au scris %i înregistrări.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3240,17 +3247,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Nepotrivire la suma de căutare"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abandonez instalarea."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/ru.po b/po/ru.po
index 488881aa..73fed5e3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt rev2227.1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-06-30 08:47+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1217,7 +1217,8 @@ msgid "%s was already not hold.\n"
msgstr "%s уже помечен как не зафиксированный.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ожидалось завершение процесса %s, но он не был запущен"
@@ -1526,7 +1527,7 @@ msgstr "Временная ошибка при попытке получить I
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Что-то странное произошло при определении «%s:%s» (%i - %s)"
#: methods/connect.cc:211
@@ -1539,30 +1540,30 @@ msgstr "Что-то странное произошло при определе
msgid "Unable to connect to %s:%s:"
msgstr "Невозможно соединиться с %s: %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
"ключа?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Найдена как минимум одна неправильная подпись."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Не удалось выполнить «gpgv» для проверки подписи (gpgv установлена?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Неизвестная ошибка при выполнении gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Следующие подписи неверные:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1938,87 +1939,87 @@ msgstr "В архиве нет поля control"
msgid "Unable to get a cursor"
msgstr "Невозможно получить курсор"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Не удалось прочитать каталог %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Не удалось прочитать атрибуты %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Ошибки относятся к файлу "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Не удалось проследовать по ссылке %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Не удалось совершить обход дерева"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Не удалось открыть %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Не удалось прочесть ссылку %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Не удалось удалить %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Не удалось создать ссылку %s на %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Превышен лимит в %sB в DeLink.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "В архиве нет поля package"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " Нет записи о переназначении (override) для %s\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакет %s сопровождает %s, а не %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " Нет записи source override для %s\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " Нет записи binary override для %s\n"
@@ -2367,30 +2368,30 @@ msgstr ""
"отключено пользователем."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liд %liч %liмин %liс"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%liч %liмин %liс"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%liмин %liс"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Не найдено: %s"
@@ -2592,17 +2593,17 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr "Порождённый процесс %s получил сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Порождённый процесс %s вернул код ошибки (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Порождённый процесс %s неожиданно завершился"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Не удалось открыть файл %s"
@@ -2650,6 +2651,12 @@ msgstr "Проблема при удалении файла %s"
msgid "Problem syncing the file"
msgstr "Проблема при синхронизации файла"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Связка ключей в %s не установлена."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Кэш пакетов пуст"
@@ -3068,8 +3075,8 @@ msgstr "переименовать не удалось, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Хеш сумма не совпадает"
@@ -3105,7 +3112,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3115,12 +3122,12 @@ msgstr ""
"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Ошибка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3129,7 +3136,7 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3138,37 +3145,37 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Не совпадает размер"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Невозможно разобрать содержимое файла Release (%s)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Отсутствуют разделы в файле Release (%s)"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Отсутствуют элементы Hash в файле Release (%s)"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Неправильный элемент «Date» в файле Release %s"
@@ -3268,22 +3275,22 @@ msgstr "Запись нового списка источников\n"
msgid "Source list entries for this disc are:\n"
msgstr "Записи в списке источников для этого диска:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Сохранено %i записей.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Сохранено %i записей с %i отсутствующими файлами.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Сохранено %i записей с %i несовпадающими файлами\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3300,17 +3307,6 @@ msgstr "Не удалось найти аутентификационную за
msgid "Hash mismatch for: %s"
msgstr "Не совпадает хеш сумма для: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Файл %s не начинается с прозрачно подписанного сообщения"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Связка ключей в %s не установлена."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3552,6 +3548,9 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблокирован"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Файл %s не начинается с прозрачно подписанного сообщения"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Пропускается несуществующий файл %s"
diff --git a/po/sk.po b/po/sk.po
index 8fb8e84e..d90f5099 100644
--- a/po/sk.po
+++ b/po/sk.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: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1199,7 +1199,8 @@ msgid "%s was already not hold.\n"
msgstr "%s bol už nastavený na nepodržanie.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čakalo sa na %s, ale nebolo to tam"
@@ -1501,7 +1502,7 @@ msgstr "Dočasné zlyhanie pri preklade „%s“"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
#: methods/connect.cc:211
@@ -1514,28 +1515,28 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nedá sa pripojiť k %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Bola zistená aspoň jedna nesprávna signatúra."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Neznáma chyba pri spustení gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Nasledovné signatúry sú neplatné:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1903,87 +1904,87 @@ msgstr "Archív nemá riadiaci záznam"
msgid "Unable to get a cursor"
msgstr "Nedá sa získať kurzor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Adresár %s sa nedá čítať\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s sa nedá vyhodnotiť\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Chyby sa týkajú súboru "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Chyba pri preklade %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Prechod stromom zlyhal"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "%s sa nedá otvoriť"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Odlinkovanie %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Nie je možné vykonať readlink %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Nie je možné vykonať unlink %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nepodarilo sa zlinkovať %s s %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Archív neobsahuje pole „package“"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žiadnu položku override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správcom %s je %s, nie %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žiadnu položku „source override“\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá žiadnu položku „binary override“\n"
@@ -2329,30 +2330,30 @@ msgstr ""
"používateľ."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li d %li h %li min %li s"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%li h %li min %li s"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%li min %li s"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%li s"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Voľba %s nenájdená"
@@ -2546,17 +2547,17 @@ msgstr "Podproces %s obdržal chybu segmentácie."
msgid "Sub-process %s received signal %u."
msgstr "Podproces %s dostal signál %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s vrátil chybový kód (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neočakávane skončil"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Nedá sa otvoriť súbor %s"
@@ -2603,6 +2604,12 @@ msgstr "Problém pri odstraňovaní súboru %s"
msgid "Problem syncing the file"
msgstr "Problém pri synchronizovaní súboru"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Vyrovnávacia pamäť balíkov je prázdna"
@@ -3011,8 +3018,8 @@ msgstr "premenovanie zlyhalo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Nezhoda kontrolných MD5 súčtov"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Nezhoda kontrolných haš súčtov"
@@ -3048,7 +3055,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3058,12 +3065,12 @@ msgstr ""
"použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3072,7 +3079,7 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3081,37 +3088,37 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
"manuálne."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nedá spracovať súbor Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Žiadne sekcie v Release súbore %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Chýba položka „Hash“ v súbore Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Chýba položka „Valid-Until“ v súbore Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Chýba položka „Date“ v súbore Release %s"
@@ -3211,22 +3218,22 @@ msgstr "Zapisuje sa nový zoznam zdrojov\n"
msgid "Source list entries for this disc are:\n"
msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapísaných %i záznamov.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
@@ -3241,17 +3248,6 @@ msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s"
msgid "Hash mismatch for: %s"
msgstr "Nezhoda kontrolných haš súčtov: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Súbor %s nezačína podpísanou správou v čistom texte (clearsigned)"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3484,6 +3480,9 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s
msgid "Not locked"
msgstr "Nie je zamknuté"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Súbor %s nezačína podpísanou správou v čistom texte (clearsigned)"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Preskakuje sa neexistujúci súbor %s"
diff --git a/po/sl.po b/po/sl.po
index ead4d109..ff4a0f09 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: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1198,7 +1198,8 @@ msgid "%s was already not hold.\n"
msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Program je čakal na %s a ga ni bilo tam"
@@ -1499,7 +1500,7 @@ msgstr "Začasna napaka med razreševanjem '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1512,29 +1513,29 @@ msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Ni se mogoče povezati z %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Notranja napaka: Dober podpis, toda ni mogoče določiti podpisa ključa?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Najden je bil vsaj en neveljaven podpis."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameščen?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Neznana napaka med izvajanjem gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Naslednji podpisi so bili neveljavni:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1902,87 +1903,87 @@ msgstr "Arhiv nima nadzornega zapisa"
msgid "Unable to get a cursor"
msgstr "Ni mogoče najti kazalke"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "O: ni mogoče brati mape %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "O: Ni mogoče določiti %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "O: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "N: Napake se sklicujejo na datoteko "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Ni mogoče razrešiti %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Hoja drevesa je spodletela"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Ni mogoče odprti %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " RazVeži %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Napaka med branjem povezave %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Napaka med odvezovanjem %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Napaka med povezovanjem %s in %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Dosežena meja RazVezovanja %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arhiv ni imel polja s paketom"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nima prepisanega vnosa\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Vzdrževalec %s je %s in ne %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nima izvornega vnosa prepisa\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nima tudi binarnega vnosa prepisa\n"
@@ -2329,30 +2330,30 @@ msgstr ""
"Ni mogoče povečati velikosti MMap, ker je samodejno povečevanje onemogočeno."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Izbire %s ni mogoče najti"
@@ -2546,17 +2547,17 @@ msgstr "Pod-opravilo %s je prejelo segmentacijsko napako."
msgid "Sub-process %s received signal %u."
msgstr "Pod-opravilo %s je prejelo signal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Pod-opravilo %s se je nepričakovano zaključilo"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Ni mogoče odpreti datoteke %s"
@@ -2603,6 +2604,12 @@ msgstr "Težava med razvezovanjem datoteke %s"
msgid "Problem syncing the file"
msgstr "Težava med usklajevanjem datoteke"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s ni nameščenih zbirk ključev."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Prazen predpomnilnik paketov"
@@ -3014,8 +3021,8 @@ msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Neujemanje vsote razpršil"
@@ -3051,7 +3058,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3061,12 +3068,12 @@ msgstr ""
"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Napaka GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3075,7 +3082,7 @@ msgstr ""
"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
"popraviti ta paket (zaradi manjkajočega arhiva)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3084,7 +3091,7 @@ msgstr ""
"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3092,31 +3099,31 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
"%s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Ni mogoče razčleniti Release datoteke %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Ni izbir v Release datoteki %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ni vnosa razpršila v Release datoteki %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
@@ -3216,22 +3223,22 @@ msgstr "Pisanje novega seznama virov\n"
msgid "Source list entries for this disc are:\n"
msgstr "Izvorni vnosi za ta disk so:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapisanih je bilo %i zapisov.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3248,17 +3255,6 @@ msgstr "Ni mogoče najti zapisa overitve za: %s"
msgid "Hash mismatch for: %s"
msgstr "Neujemanje razpršila za: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Datoteka %s se ne začne s čisto podpisanim sporočilom"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s ni nameščenih zbirk ključev."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3491,6 +3487,9 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
msgid "Not locked"
msgstr "Ni zaklenjeno"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Datoteka %s se ne začne s čisto podpisanim sporočilom"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Preskok neobstoječe datoteke %s"
diff --git a/po/sv.po b/po/sv.po
index 7ba779a6..04a75e60 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2010-08-24 21:18+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -1200,7 +1200,8 @@ msgid "%s was already not hold.\n"
msgstr "%s är redan den senaste versionen.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Väntade på %s men den fanns inte där"
@@ -1487,7 +1488,7 @@ msgstr "Temporärt fel vid uppslagning av \"%s\""
# Okänd felkod; %i = koden
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)"
# Okänd felkod; %i = koden
@@ -1501,31 +1502,31 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Kunde inte ansluta till %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Internt fel: Korrekt signatur men kunde inte fastställa nyckelns "
"fingeravtryck?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Minst en ogiltig signatur träffades på."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Kunde inte köra \"gpgv\" för att verifiera signatur (är gpgv installerad?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Okänt fel vid körning av gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Följande signaturer är ogiltiga:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1897,90 +1898,90 @@ msgstr "Arkivet har ingen styrpost"
msgid "Unable to get a cursor"
msgstr "Kunde inte få tag i någon markör"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "V: Kunde inte läsa katalogen %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "V: Kunde inte ta status på %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "V: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "F: Felen gäller filen "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Misslyckades med att slå upp %s"
# ???
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Trädvandring misslyckades"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Misslyckades med att öppna %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Avlänka %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Misslyckades med att läsa länken %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Misslyckades med att länka ut %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Misslyckades med att länka %s till %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Avlänkningsgränsen på %sB nåddes.\n"
# Fält vid namn "Package"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Arkivet har inget package-fält"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen post i override-filen\n"
# parametrar: paket, ny, gammal
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ansvarig för paketet %s är %s ej %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen källåsidosättningspost\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har heller ingen binär åsidosättningspost\n"
@@ -2330,30 +2331,30 @@ msgstr ""
"av användaren."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Valet %s hittades inte"
@@ -2545,17 +2546,17 @@ msgstr "Underprocessen %s råkade ut för ett segmenteringsfel."
msgid "Sub-process %s received signal %u."
msgstr "Underprocessen %s tog emot signal %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s svarade med en felkod (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s avslutades oväntat"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Kunde inte öppna filen %s"
@@ -2602,6 +2603,12 @@ msgstr "Problem med att avlänka filen %s"
msgid "Problem syncing the file"
msgstr "Problem med att synkronisera filen"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nyckelring installerad i %s."
+
# Felmeddelande
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
@@ -3017,8 +3024,8 @@ msgstr "namnbyte misslyckades, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumman stämmer inte"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash-kontrollsumman stämmer inte"
@@ -3050,7 +3057,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3061,12 +3068,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fel: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3075,7 +3082,7 @@ msgstr ""
"Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket (på grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3084,37 +3091,37 @@ msgstr ""
"Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Storleken stämmer inte"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kunde inte tolka \"Release\"-filen %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Inga sektioner i Release-filen %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ingen Hash-post i Release-filen %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ogiltig \"Date\"-post i Release-filen %s"
@@ -3214,22 +3221,22 @@ msgstr "Skriver ny källista\n"
msgid "Source list entries for this disc are:\n"
msgstr "Poster i källistan för denna skiva:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i saknade filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i filer som inte stämmer\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n"
@@ -3244,17 +3251,6 @@ msgstr "Kan inte hitta autentiseringspost för: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash-kontrollsumman stämmer inte för: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nyckelring installerad i %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/th.po b/po/th.po
index ef2b6a45..cfa65481 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-10-27 22:44+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -1159,7 +1159,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
@@ -1456,7 +1457,7 @@ msgstr "เกิดข้อผิดพลาดชั่วคราวขณ
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1469,28 +1470,28 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง
msgid "Unable to connect to %s:%s:"
msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "ไม่สามารถเรียก 'gpgv' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1846,87 +1847,87 @@ msgstr "แพกเกจไม่มีระเบียนควบคุม
msgid "Unable to get a cursor"
msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: stat %s ไม่สำเร็จ\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "หาพาธเต็มของ %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "เดินท่องต้นไม้ไม่สำเร็จ"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "เปิด %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "unlink %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ไม่มีข้อมูล override\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
@@ -2270,30 +2271,30 @@ msgid ""
msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liวัน %liชม. %liนาที %liวิ"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%liชม. %liนาที %liวิ"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%liนาที %liวิ"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%liวิ"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "ไม่พบรายการเลือก %s"
@@ -2484,17 +2485,17 @@ msgstr "โพรเซสย่อย %s เกิดข้อผิดพล
msgid "Sub-process %s received signal %u."
msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "ไม่สามารถเปิดแฟ้ม %s"
@@ -2541,6 +2542,12 @@ msgstr "เกิดปัญหาขณะลบแฟ้ม %s"
msgid "Problem syncing the file"
msgstr "เกิดปัญหาขณะ sync แฟ้ม"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "แคชของแพกเกจว่างเปล่า"
@@ -2943,8 +2950,8 @@ msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s ->
msgid "MD5Sum mismatch"
msgstr "MD5Sum ไม่ตรงกัน"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "ผลรวมแฮชไม่ตรงกัน"
@@ -2980,7 +2987,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2990,56 +2997,56 @@ msgstr ""
"ข้อผิดพลาดจาก GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package."
msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "ขนาดไม่ตรงกัน"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "ไม่สามารถแจงแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
@@ -3137,22 +3144,22 @@ msgstr "กำลังเขียนรายชื่อแหล่งแพ
msgid "Source list entries for this disc are:\n"
msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "เขียนแล้ว %i ระเบียน\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
@@ -3167,17 +3174,6 @@ msgstr "ไม่พบระเบียนยืนยันความแท
msgid "Hash mismatch for: %s"
msgstr "แฮชไม่ตรงกันสำหรับ: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "แฟ้ม %s ไม่ได้ขึ้นต้นด้วยการระบุการเซ็นกำกับครอบในตัวข้อความ"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3399,6 +3395,9 @@ msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรี
msgid "Not locked"
msgstr "ไม่ได้ล็อคอยู่"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "แฟ้ม %s ไม่ได้ขึ้นต้นด้วยการระบุการเซ็นกำกับครอบในตัวข้อความ"
+
#~ msgid "Failed to remove %s"
#~ msgstr "ไม่สามารถลบ %s"
diff --git a/po/tl.po b/po/tl.po
index 85f15954..19ef31f2 100644
--- a/po/tl.po
+++ b/po/tl.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: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1182,7 +1182,8 @@ msgid "%s was already not hold.\n"
msgstr "%s ay pinakabagong bersyon na.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Naghintay, para sa %s ngunit wala nito doon"
@@ -1465,7 +1466,7 @@ msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
#: methods/connect.cc:211
@@ -1478,32 +1479,32 @@ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Hindi maka-konekta sa %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error na internal: Tanggap na lagda, ngunit hindi malaman ang key "
"fingerprint?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Hindi kilalang error sa pag-execute ng gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1876,87 +1877,87 @@ msgstr "Walang kontrol rekord ang arkibo"
msgid "Unable to get a cursor"
msgstr "Hindi makakuha ng cursor"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Hindi mabasa ang directory %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Hindi ma-stat %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "E: Mga error ay tumutukoy sa talaksang "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Bigo sa pag-resolba ng %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Bigo ang paglakad sa puno"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Bigo ang pagbukas ng %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Bigo ang pagbasa ng link %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Bigo ang pag-unlink ng %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Bigo ang pag-link ng %s sa %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit na %sB tinamaan.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Walang field ng pakete ang arkibo"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ay walang override entry\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Tagapangalaga ng %s ay %s hindi %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ay walang override entry para sa pinagmulan\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ay wala ring override entry na binary\n"
@@ -2303,30 +2304,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Piniling %s ay hindi nahanap"
@@ -2524,17 +2525,17 @@ msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
msgid "Sub-process %s received signal %u."
msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Naghudyat ang sub-process %s ng error code (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Hindi mabuksan ang talaksang %s"
@@ -2581,6 +2582,12 @@ msgstr "Problema sa pag-unlink ng talaksan"
msgid "Problem syncing the file"
msgstr "Problema sa pag-sync ng talaksan"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Ina-abort ang pag-instol."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Walang laman ang cache ng pakete"
@@ -2996,8 +3003,8 @@ msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Di tugmang MD5Sum"
@@ -3030,7 +3037,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3038,12 +3045,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3052,7 +3059,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3061,7 +3068,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3069,31 +3076,31 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Di tugmang laki"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Paunawa, pinili ang %s imbes na %s\n"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Di tanggap na linya sa talaksang diversion: %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
@@ -3192,22 +3199,22 @@ msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
msgid "Source list entries for this disc are:\n"
msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Nagsulat ng %i na record.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3224,17 +3231,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Ina-abort ang pag-instol."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/uk.po b/po/uk.po
index cfad1393..6fa9320c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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"
@@ -1216,7 +1216,8 @@ msgid "%s was already not hold.\n"
msgstr "%s вже був незафіксований.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Очікував на %s, але його там не було"
@@ -1520,7 +1521,7 @@ msgstr "Тимчасова помилка при отриманні IP адре
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i - %s)"
#: methods/connect.cc:211
@@ -1533,30 +1534,30 @@ msgstr "Сталося щось дивне при спробі отримати
msgid "Unable to connect to %s:%s:"
msgstr "Неможливо під'єднатися до %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
"відбиток?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Знайдено як мінімум один невірний підпис."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи встановлено gpgv?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Невідома помилка виконання gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Наступні підписи були невірними:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1937,87 +1938,87 @@ msgstr "В архіві немає запису 'control'"
msgid "Unable to get a cursor"
msgstr "Неможливо одержати курсор"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "У: Не вдалося прочитати директорію %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "У: Неможливо прочитати атрибути %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "П: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "У: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "П: Помилки відносяться до файлу "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Не вдалося визначити %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Не вдалося зробити обхід дерева"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Не вдалося відкрити %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Не вдалося прочитати посилання (readlink) %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Не вдалося видалити посилання (unlink) %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Не вдалося створити посилання %s на %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Перевищено ліміт в %sB в DeLink.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Архів не мав поля 'package'"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, fuzzy, c-format
msgid " %s has no override entry\n"
msgstr " Відсутній запис про перепризначення (override) для %s\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакунок %s супроводжується %s, а не %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Відсутній запис про перепризначення вихідних текстів для %s\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Крім того, відсутній запис про бінарне перепризначення для %s\n"
@@ -2370,30 +2371,30 @@ msgstr ""
"користувачем."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liд %liг %liхв %liс"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%liг %liхв %liс"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%liхв %liс"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Вибір %s не знайдено"
@@ -2594,17 +2595,17 @@ msgstr "Підпроцес %s отримав 'segmentation fault' (фаталь
msgid "Sub-process %s received signal %u."
msgstr "Підпроцес %s отримав сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Підпроцес %s повернув код помилки (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Підпроцес %s раптово завершився"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Неможливо відкрити файл %s"
@@ -2651,6 +2652,12 @@ msgstr "Проблема з роз'єднанням файла %s"
msgid "Problem syncing the file"
msgstr "Проблема з синхронізацією файла"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Не встановлено 'keyring' у %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Кеш пакунків пустий"
@@ -3062,8 +3069,8 @@ msgstr "не вдалося перейменувати, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Невідповідність MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Невідповідність хешу MD5Sum"
@@ -3099,7 +3106,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3109,12 +3116,12 @@ msgstr ""
"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Помилка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3123,7 +3130,7 @@ msgstr ""
"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
"власноруч виправити цей пакунок. (через відсутність 'arch')"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3132,38 +3139,38 @@ msgstr ""
"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
"власноруч виправити цей пакунок."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Невідповідність розміру"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Неможливо проаналізувати 'Release' файл %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Немає секцій у 'Release' файлі %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Немає запису 'Hash' у 'Release' файлі %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Невірний запис 'Date' у 'Release' файлі %s"
@@ -3263,22 +3270,22 @@ msgstr "Записується новий перелік вихідних тек
msgid "Source list entries for this disc are:\n"
msgstr "Перелік вихідних текстів для цього диска:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Записано %i записів.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Записано %i записів з %i відсутніми файлами.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Записано %i записів з %i невідповідними файлам\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n"
@@ -3293,17 +3300,6 @@ msgstr "Неможливо знайти аутентифікаційний за
msgid "Hash mismatch for: %s"
msgstr "Невідповідність хешу для: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Файл %s починається з не 'clearsigned' повідомленням"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Не встановлено 'keyring' у %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3547,6 +3543,9 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблоковано"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Файл %s починається з не 'clearsigned' повідомленням"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Пропускається неіснуючий файл %s"
diff --git a/po/vi.po b/po/vi.po
index ac756e31..b81b8453 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2012-11-20 14:12+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -1194,7 +1194,8 @@ msgid "%s was already not hold.\n"
msgstr "%s đã sẵn được đặt là chưa nắm giữ.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Đã đợi %s nhưng mà chưa gặp nó"
@@ -1497,7 +1498,7 @@ msgstr "Việc tháo gỡ “%s” bị lỗi tạm thời"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)"
#: methods/connect.cc:211
@@ -1510,30 +1511,30 @@ msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Không thể kết nối đến %s: %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay của khóa ?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "Gặp ít nhất một chữ ký không hợp lệ."
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Không thể thực hiện “gpgv” để thẩm tra chữ ký (gpgv đã được cài đặt chưa?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "Gặp lỗi không rõ khi thực hiện gpgv"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "Những chữ ký theo đây vẫn không hợp lệ:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1924,87 +1925,87 @@ msgstr "Kho không có mục ghi điều khiển"
msgid "Unable to get a cursor"
msgstr "Không thể lấy con chạy"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "CB: Không thể đọc thư mục %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "CB: Không thể lấy thông tin toàn bộ cho %s\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "LỖI: "
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "CB: "
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "LỖI: có lỗi áp dụng vào tập tin "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "Việc quyết định %s bị lỗi"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "Việc di chuyển qua cây bị lỗi"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "Việc mở %s bị lỗi"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Bỏ liên kết %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "Việc tạo liên kết lại %s bị lỗi"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "Việc bỏ liên kết %s bị lỗi"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Việc liên kết %s đến %s bị lỗi"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Hết hạn bỏ liên kết của %sB.\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "Kho không có trường gói"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s không có mục ghi đè\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " người bảo trì %s là %s không phải %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s không có mục ghi đè nguồn\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s cũng không có mục ghi đè nhị phân\n"
@@ -2355,30 +2356,30 @@ msgstr ""
"dùng tắt."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lingày %ligiờ %liphút %ligiây"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%ligiờ %liphút %ligiây"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%liphút %ligiây"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%ligiây"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "Không tìm thấy vùng chọn %s"
@@ -2574,17 +2575,17 @@ msgstr "Tiến trình phụ %s đã nhận một lỗi chia ra từng đoạn."
msgid "Sub-process %s received signal %u."
msgstr "Tiến trình phụ %s đã nhận tín hiệu %u."
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Tiến trình phụ %s đã trả lời mã lỗi (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Tiến trình phụ %s đã thoát bất thường"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "Không thể mở tập tin %s"
@@ -2631,6 +2632,12 @@ msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s"
msgid "Problem syncing the file"
msgstr "Gặp vấn đề khi đồng bộ hóa tập tin"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Không có vòng khoá nào được cài đặt vào %s."
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Bộ nhớ tạm gói trống"
@@ -3049,8 +3056,8 @@ msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
msgid "MD5Sum mismatch"
msgstr "Sai khớp MD5Sum (tổng kiểm)"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Sai khớp tổng chuỗi duy nhất (hash sum)"
@@ -3086,7 +3093,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Bản phát hành xung đột: %s (mong đợi %s còn nhận %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3097,12 +3104,12 @@ msgstr ""
"Lỗi GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "Lỗi GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3111,7 +3118,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này, do thiếu kiến trúc."
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3120,7 +3127,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này."
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3128,33 +3135,33 @@ msgstr ""
"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
"tin:) cho gói %s."
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "Sai khớp kích cỡ"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "Không có phần nào trong tập tin Phát hành %s"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
"Gặp mục nhập “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát "
"hành %s"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
@@ -3254,22 +3261,22 @@ msgstr "Đang ghi danh sách nguồn mới\n"
msgid "Source list entries for this disc are:\n"
msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "Mới ghi %i mục ghi.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3286,17 +3293,6 @@ msgstr "Không tìm thấy mục ghi xác thực cho: %s"
msgid "Hash mismatch for: %s"
msgstr "Sai khớp chuỗi duy nhất cho: %s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr "Tập tin %s không bắt đầu bằng một đoạn chữ ký (gpg)"
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Không có vòng khoá nào được cài đặt vào %s."
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3523,6 +3519,9 @@ msgstr "dpkg bị gián đoạn, bạn cần phải tự động chạy “%s”
msgid "Not locked"
msgstr "Chưa được khoá"
+#~ msgid "File %s doesn't start with a clearsigned message"
+#~ msgstr "Tập tin %s không bắt đầu bằng một đoạn chữ ký (gpg)"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Đang bỏ qua tập tin không tồn tại %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d4ec54b3..841087b4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+0200\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -1160,7 +1160,8 @@ msgid "%s was already not hold.\n"
msgstr "%s 已经是最新的版本了。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
@@ -1442,7 +1443,7 @@ msgstr "暂时不能解析域名“%s”"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
#: methods/connect.cc:211
@@ -1455,28 +1456,28 @@ msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1835,87 +1836,87 @@ msgstr "归档文件没有包含控制字段"
msgid "Unable to get a cursor"
msgstr "无法获得游标"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:无法读取目录 %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:无法获得 %s 的状态\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "错误:"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "错误:处理文件时出错 "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解析 %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "无法遍历目录树"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读取符号链接 %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "无法使用 unlink 删除 %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
@@ -2259,30 +2260,30 @@ msgid ""
msgstr "无法增加 MMap 大小,因为用户已禁用自动增加。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li天 %li小时 %li分 %li秒"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%li小时 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
@@ -2473,17 +2474,17 @@ msgstr "子进程 %s 发生了段错误"
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
@@ -2530,6 +2531,12 @@ msgstr "用 unlink 删除文件 %s 出错"
msgid "Problem syncing the file"
msgstr "同步文件出错"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s 中没有安装密钥环。"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
@@ -2936,8 +2943,8 @@ msgstr "无法重命名文件,%s (%s -> %s)。"
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
@@ -2969,7 +2976,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2978,12 +2985,12 @@ msgstr ""
"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2992,7 +2999,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3000,37 +3007,37 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
@@ -3130,22 +3137,22 @@ msgstr "正在写入新的源列表\n"
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件源设置项是:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n"
@@ -3160,17 +3167,6 @@ msgstr "无法找到认证记录:%s"
msgid "Hash mismatch for: %s"
msgstr "Hash 校验和不符:%s"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s 中没有安装密钥环。"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 47fa334a..28f0c654 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-03-24 08:53+0100\n"
+"POT-Creation-Date: 2013-04-02 15:13+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."
@@ -1156,7 +1156,8 @@ msgid "%s was already not hold.\n"
msgstr "%s 已經是最新版本了。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待 %s 但是它並不存在"
@@ -1437,7 +1438,7 @@ msgstr "暫時無法解析 '%s'"
#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "System error resolving '%s:%s' (%s)"
+msgid "System error resolving '%s:%s'"
msgstr "在解析 '%s:%s' (%i) 時出了怪事"
#: methods/connect.cc:211
@@ -1450,29 +1451,29 @@ msgstr "在解析 '%s:%s' (%i) 時出了怪事"
msgid "Unable to connect to %s:%s:"
msgstr "無法連線至 %s %s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:169
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "內部錯誤:簽章無誤,但卻無法辨識密鑰的指紋碼?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:174
msgid "At least one invalid signature was encountered."
msgstr "至少發現一個無效的簽章。"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:178
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "無法執行 '%s' 來驗證簽章(gpgv 是否安裝了?)"
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
msgstr "在執行 gpgv 時發生未知的錯誤"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
msgid "The following signatures were invalid:\n"
msgstr "以下簽名無效:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1832,87 +1833,87 @@ msgstr "套件檔沒有 control 記錄"
msgid "Unable to get a cursor"
msgstr "無法取得遊標"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:無法讀取目錄 %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:無法取得 %s 狀態\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "錯誤:"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "錯誤:套用到檔案時發生錯誤"
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "無法解析 %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "無法走訪目錄樹"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "無法開啟 %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "無法讀取連結 %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "無法移除連結 %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 無法將 %s 連結到 %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 達到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "套件檔裡沒有套件資訊"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 沒有重新定義項目\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的維護者是 %s,而非 %s\n"
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:708
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 沒有原始碼重新定義項目\n"
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 也沒有二元碼重新定義項目\n"
@@ -2257,30 +2258,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/contrib/strutl.cc:1172
#, c-format
msgid "Selection %s not found"
msgstr "選項 %s 找不到"
@@ -2471,17 +2472,17 @@ msgstr "子程序 %s 收到一個記憶體錯誤。"
msgid "Sub-process %s received signal %u."
msgstr "子程序 %s 收到一個記憶體錯誤。"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子程序 %s 傳回錯誤碼 (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子程序 %s 不預期得結束"
-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
+#: apt-pkg/contrib/fileutl.cc:984
#, c-format
msgid "Could not open file %s"
msgstr "無法開啟檔案 %s"
@@ -2528,6 +2529,12 @@ msgstr "在刪除檔案時發生問題"
msgid "Problem syncing the file"
msgstr "在同步檔案時發生問題"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "放棄安裝。"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "清空套件快取"
@@ -2928,8 +2935,8 @@ msgstr "無法重新命名,%s (%s -> %s)。"
msgid "MD5Sum mismatch"
msgstr "MD5Sum 不符"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2008
msgid "Hash Sum mismatch"
msgstr "Hash Sum 不符"
@@ -2961,7 +2968,7 @@ msgstr ""
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "發行版本衝突:%s(應當是 %s 但卻得到 %s)"
-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/acquire-item.cc:1518
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2969,12 +2976,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/acquire-item.cc:1641
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2983,44 +2990,44 @@ msgstr ""
"找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。(因為找不到平"
"台)"
-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/acquire-item.cc:1700
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package."
msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。"
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1759
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
-#: apt-pkg/acquire-item.cc:1851
+#: apt-pkg/acquire-item.cc:1857
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "無法辨別 Release 檔 %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "在 Release 檔 %s 裡沒有區段"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
@@ -3116,22 +3123,22 @@ msgstr "正在寫入新的來源列表\n"
msgid "Source list entries for this disc are:\n"
msgstr "該碟片的來源列表項目為:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
#, c-format
msgid "Wrote %i records.\n"
msgstr "寫入 %i 筆紀錄。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案遺失了。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案不符\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案遺失了,有 %i 個檔案不符\n"
@@ -3146,17 +3153,6 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Hash Sum 不符"
-#: apt-pkg/indexcopy.cc:665
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:696
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "放棄安裝。"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"