summaryrefslogtreecommitdiff
path: root/po/apt-all.pot
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-11-10 16:56:21 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-11-10 16:56:21 +0100
commit7cb543fb742a837c4931513674febaec5e4c1401 (patch)
treeddefe5b9329907818aa6eb3b593f555b29ccb869 /po/apt-all.pot
parentf6cb0880a4b5d31e398cceb2e2577b6b82f4fffb (diff)
parent71ecaad29d8066a494f516efc5efd80860653fe2 (diff)
merged from lp:~mvo/apt/mvo (that has all the changes from debian-experimental2) and resolved a bunch of conflicts
Diffstat (limited to 'po/apt-all.pot')
-rw-r--r--po/apt-all.pot1422
1 files changed, 732 insertions, 690 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 245ffce91..c655eb9a6 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-14 11:38+0200\n"
+"POT-Creation-Date: 2011-11-10 16:46+0100\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"
@@ -17,149 +17,150 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
msgid "Total package names: "
msgstr ""
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
msgid "Total package structures: "
msgstr ""
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
msgid " Normal packages: "
msgstr ""
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
msgid " Pure virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
msgid " Single virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
msgid " Mixed virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
msgid " Missing: "
msgstr ""
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
msgid "Total distinct versions: "
msgstr ""
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
msgid "Total distinct descriptions: "
msgstr ""
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
msgid "Total dependencies: "
msgstr ""
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
msgid "Total ver/file relations: "
msgstr ""
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
msgid "Total Desc/File relations: "
msgstr ""
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
msgid "Total dependency version space: "
msgstr ""
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:39
+#: cmdline/apt-mark.cc:86 cmdline/apt-mark.cc:162
msgid "No packages found"
msgstr ""
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
msgid "You must give at least one search pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:445
#, c-format
msgid "Unable to locate package %s"
msgstr ""
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
msgid "Package files:"
msgstr ""
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
msgid "(not found)"
msgstr ""
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
msgid " Installed: "
msgstr ""
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
msgid " Candidate: "
msgstr ""
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
msgid "(none)"
msgstr ""
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3125 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3247 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:266 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1682
+#: cmdline/apt-cache.cc:1686
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -196,28 +197,28 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr ""
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
msgid "Arguments not in pairs"
msgstr ""
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
msgid ""
"Usage: apt-config [options] command\n"
"\n"
@@ -233,12 +234,12 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr ""
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -252,40 +253,40 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1269
#, c-format
msgid "Unable to write to %s"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
msgid "Package extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
+#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
+#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
#, c-format
msgid "Error processing directory %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
msgid "Source extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
msgid "Error writing header to contents file"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
#, c-format
msgid "Error processing contents %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -327,136 +328,136 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
msgid "No selections matched"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr ""
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr ""
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr ""
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr ""
-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
#, c-format
msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
msgid "Archive has no control record"
msgstr ""
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr ""
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
msgid "realloc - Failed to allocate memory"
msgstr ""
@@ -467,17 +468,17 @@ msgstr ""
#: ftparchive/override.cc:60 ftparchive/override.cc:166
#, c-format
-msgid "Malformed override %s line %lu #1"
+msgid "Malformed override %s line %llu #1"
msgstr ""
#: ftparchive/override.cc:74 ftparchive/override.cc:178
#, c-format
-msgid "Malformed override %s line %lu #2"
+msgid "Malformed override %s line %llu #2"
msgstr ""
#: ftparchive/override.cc:88 ftparchive/override.cc:191
#, c-format
-msgid "Malformed override %s line %lu #3"
+msgid "Malformed override %s line %llu #3"
msgstr ""
#: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -485,63 +486,63 @@ msgstr ""
msgid "Failed to read the override file %s"
msgstr ""
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:69
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr ""
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:99
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr ""
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:167 methods/rsh.cc:97
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:193
msgid "Failed to create FILE*"
msgstr ""
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:196
msgid "Failed to fork"
msgstr ""
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:210
msgid "Compress child"
msgstr ""
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:233
#, c-format
msgid "Internal error, failed to create %s"
msgstr ""
-#: ftparchive/multicompress.cc:282
+#: ftparchive/multicompress.cc:284
msgid "Failed to create subprocess IPC"
msgstr ""
-#: ftparchive/multicompress.cc:319
+#: ftparchive/multicompress.cc:321
msgid "Failed to exec compressor "
msgstr ""
-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:360
msgid "decompressor"
msgstr ""
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:403
msgid "IO to subprocess/file failed"
msgstr ""
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:455
msgid "Failed to read while computing MD5"
msgstr ""
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:472
#, c-format
msgid "Problem unlinking %s"
msgstr ""
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr ""
@@ -550,133 +551,137 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
#, c-format
msgid "but %s is installed"
msgstr ""
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
#, c-format
msgid "but %s is to be installed"
msgstr ""
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
msgid "but it is not installable"
msgstr ""
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
msgid "but it is a virtual package"
msgstr ""
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
msgid "but it is not installed"
msgstr ""
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
msgid "but it is not going to be installed"
msgstr ""
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
msgid " or"
msgstr ""
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
msgid "The following NEW packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
msgid "The following packages will be REMOVED:"
msgstr ""
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
msgid "The following packages have been kept back:"
msgstr ""
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
msgid "The following packages will be upgraded:"
msgstr ""
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:633
#, c-format
msgid "Note, selecting '%s' for task '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:639
#, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:656
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:667
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:676
msgid " [Not candidate version]"
msgstr ""
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:678
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:681
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -684,177 +689,177 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:699
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:711
#, c-format
msgid "Package '%s' has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:722
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
msgstr ""
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:753
#, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:783
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:787
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:799
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:804
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2080 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:61
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:849
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:854
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:896
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:974
msgid "Correcting dependencies..."
msgstr ""
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:977
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:980
msgid "Unable to correct dependencies"
msgstr ""
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:983
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:985
msgid " Done"
msgstr ""
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:989
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:992
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1017
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1028
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1030
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1080
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1089
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1100
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1138
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1142
+#: cmdline/apt-get.cc:1145
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1147
+#: cmdline/apt-get.cc:1150
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1154
+#: cmdline/apt-get.cc:1157
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1159
+#: cmdline/apt-get.cc:1162
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2492
-#: cmdline/apt-get.cc:2495
+#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2523
+#: cmdline/apt-get.cc:2526
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1190
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1208
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1210
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -862,46 +867,46 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1231
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2557 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2588 apt-pkg/algorithms.cc:1492
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1321
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2569
+#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2600
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1328
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1332
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1337
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1338
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -911,35 +916,35 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1370
msgid "Note: This is done automatic and on purpose by dpkg."
msgstr ""
-#: cmdline/apt-get.cc:1497
+#: cmdline/apt-get.cc:1508
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1540
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1567
+#: cmdline/apt-get.cc:1578
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1594
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1645
+#: cmdline/apt-get.cc:1657
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1761
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -955,15 +960,15 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1913
+#: cmdline/apt-get.cc:1764 cmdline/apt-get.cc:1933
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1768
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1754
+#: cmdline/apt-get.cc:1775
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -972,7 +977,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1758
+#: cmdline/apt-get.cc:1779
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -980,25 +985,25 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1760
+#: cmdline/apt-get.cc:1781
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1779
+#: cmdline/apt-get.cc:1800
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1878
+#: cmdline/apt-get.cc:1899
msgid "You might want to run 'apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1882
+#: cmdline/apt-get.cc:1903
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1898
+#: cmdline/apt-get.cc:1918
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1006,201 +1011,222 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1916
+#: cmdline/apt-get.cc:1939
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1942
+#: cmdline/apt-get.cc:1965
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:2032
+#: cmdline/apt-get.cc:2055
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2056
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2098
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:2082 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2105 cmdline/apt-mark.cc:63
#, c-format
msgid "%s set to automatically installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2113 cmdline/apt-mark.cc:107
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:2106
+#: cmdline/apt-get.cc:2129
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:2109 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2132 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2137
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:2181 cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2204 cmdline/apt-get.cc:2212
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2213 cmdline/apt-get.cc:2246
+#: cmdline/apt-get.cc:2240 cmdline/apt-get.cc:2276
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:2297
+#: cmdline/apt-get.cc:2327
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2353
+#: cmdline/apt-get.cc:2385
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2394 cmdline/apt-get.cc:2690
+#: cmdline/apt-get.cc:2425 cmdline/apt-get.cc:2737
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2442
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2416
+#: cmdline/apt-get.cc:2447
#, c-format
msgid ""
"Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2469
+#: cmdline/apt-get.cc:2500
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2506
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2546
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2520
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2526
+#: cmdline/apt-get.cc:2557
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2564
+#: cmdline/apt-get.cc:2595
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2595
+#: cmdline/apt-get.cc:2626
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2607
+#: cmdline/apt-get.cc:2638
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2608
+#: cmdline/apt-get.cc:2639
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2661
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2645
+#: cmdline/apt-get.cc:2681
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2664
+#: cmdline/apt-get.cc:2700
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2695
+#: cmdline/apt-get.cc:2725
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+
+#: cmdline/apt-get.cc:2742
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2715
+#: cmdline/apt-get.cc:2762
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2892
+#, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+
+#: cmdline/apt-get.cc:2913
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2819
+#: cmdline/apt-get.cc:2936
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+
+#: cmdline/apt-get.cc:2975
#, c-format
msgid ""
-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2855
+#: cmdline/apt-get.cc:2981
#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
msgstr ""
-#: cmdline/apt-get.cc:2882
+#: cmdline/apt-get.cc:3004
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2898
+#: cmdline/apt-get.cc:3020
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2903
+#: cmdline/apt-get.cc:3025
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2996 cmdline/apt-get.cc:3008
+#: cmdline/apt-get.cc:3118 cmdline/apt-get.cc:3130
#, c-format
msgid "Changelog for %s (%s)"
msgstr ""
-#: cmdline/apt-get.cc:3130
+#: cmdline/apt-get.cc:3252
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:3171
+#: cmdline/apt-get.cc:3293
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1246,7 +1272,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3333
+#: cmdline/apt-get.cc:3458
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1254,33 +1280,33 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
msgid "Hit "
msgstr ""
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
msgid "Get:"
msgstr ""
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
msgid "Ign "
msgstr ""
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
msgid "Err "
msgstr ""
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr ""
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
#, c-format
msgid " [Working]"
msgstr ""
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -1288,46 +1314,62 @@ msgid ""
"in the drive '%s' and press enter\n"
msgstr ""
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"apt.conf(5) manual pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:48
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:54
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:56
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:171
#, c-format
msgid "%s was already set on hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:173
#, c-format
msgid "%s was already not hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:209
#, c-format
msgid "%s set on hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:189 cmdline/apt-mark.cc:214
#, c-format
msgid "Canceled hold on %s.\n"
msgstr ""
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:222
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:270
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -1349,11 +1391,11 @@ msgid ""
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
msgstr ""
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -1401,196 +1443,196 @@ msgstr ""
msgid "Merging available information"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr ""
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
msgid "Corrupted archive"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
msgid "Invalid archive signature"
msgstr ""
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
msgid "Error reading archive member header"
msgstr ""
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
#, c-format
msgid "Invalid archive member header %s"
msgstr ""
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
msgid "Invalid archive member header"
msgstr ""
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
msgid "Archive is too short"
msgstr ""
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
msgid "Failed to read the archive headers"
msgstr ""
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
msgid "DropNode called on still linked node"
msgstr ""
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
msgid "Failed to locate the hash element!"
msgstr ""
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
msgid "Failed to allocate diversion"
msgstr ""
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
msgid "Internal error in AddDiversion"
msgstr ""
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
msgstr ""
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
#, c-format
msgid "Double add of diversion %s -> %s"
msgstr ""
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
#, c-format
msgid "Duplicate conf file %s/%s"
msgstr ""
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr ""
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
#, c-format
msgid "Failed to close file %s"
msgstr ""
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr ""
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr ""
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr ""
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr ""
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr ""
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr ""
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr ""
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr ""
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:338
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:344 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
#, c-format
msgid "Unable to read %s"
msgstr ""
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
#, c-format
msgid "Failed to remove %s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
#, c-format
msgid "Unable to create %s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
#, c-format
msgid "Failed to stat %sinfo"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1304
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1168
+#: apt-pkg/pkgcachegen.cc:1272 apt-pkg/pkgcachegen.cc:1278
+#: apt-pkg/pkgcachegen.cc:1434
msgid "Reading package lists"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
#, c-format
msgid "Failed to change to the admin dir %sinfo"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
msgid "Internal error getting a package name"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
#, c-format
msgid ""
"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1598,482 +1640,487 @@ msgid ""
"package!"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
#, c-format
msgid "Failed reading the list file %sinfo/%s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
msgid "Internal error getting a node"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
#, c-format
msgid "Failed to open the diversions file %sdiversions"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
msgid "The diversion file is corrupted"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
#, c-format
msgid "Invalid line in the diversion file: %s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
msgid "Internal error adding a diversion"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
msgid "The pkg cache must be initialized first"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
#, c-format
msgid "Error parsing MD5. Offset %lu"
msgstr ""
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr ""
#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56
#, c-format
msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
#, c-format
msgid "Couldn't change to %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157
#, c-format
msgid "Internal error, could not locate member %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
msgid "Failed to locate a valid control file"
msgstr ""
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277
msgid "Unparsable control file"
msgstr ""
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
#, c-format
msgid "Couldn't open pipe for %s"
msgstr ""
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
#, c-format
msgid "Read error from %s process"
msgstr ""
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:530
+#: methods/rred.cc:539
msgid "Failed to stat"
msgstr ""
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:536
msgid "Failed to set modification time"
msgstr ""
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr ""
-#: methods/cdrom.cc:208
+#: methods/cdrom.cc:212
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
msgid "Wrong CD-ROM"
msgstr ""
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
msgid "Disk not found."
msgstr ""
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
msgid "File not found"
msgstr ""
-#: methods/file.cc:44
+#: methods/file.cc:47
msgid "Invalid URI, local URIS must not start with //"
msgstr ""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
msgid "Logging in"
msgstr ""
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
msgid "Unable to determine the peer name"
msgstr ""
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
msgid "Unable to determine the local name"
msgstr ""
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
#, c-format
msgid "The server refused the connection and said: %s"
msgstr ""
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
#, c-format
msgid "USER failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
#, c-format
msgid "PASS failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
#, c-format
msgid "TYPE failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
msgid "Connection timeout"
msgstr ""
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:832 methods/rsh.cc:197
msgid "Read error"
msgstr ""
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
msgid "A response overflowed the buffer."
msgstr ""
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:874 methods/rsh.cc:239
msgid "Write error"
msgstr ""
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
msgid "Could not create a socket"
msgstr ""
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
msgid "Could not connect passive socket."
msgstr ""
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
msgid "getaddrinfo was unable to get a listening socket"
msgstr ""
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
msgid "Could not bind a socket"
msgstr ""
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
msgid "Could not listen on the socket"
msgstr ""
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
msgid "Could not determine the socket's name"
msgstr ""
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
msgid "Unable to send PORT command"
msgstr ""
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr ""
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
#, c-format
msgid "EPRT failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
msgid "Data socket connect timed out"
msgstr ""
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1031 methods/rsh.cc:309
msgid "Problem hashing file"
msgstr ""
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr ""
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
msgid "Data socket timed out"
msgstr ""
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr ""
#. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:71
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr ""
-#: methods/connect.cc:82
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr ""
-#: methods/connect.cc:89
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:95
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:103
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:121
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
#, c-format
msgid "Connecting to %s"
msgstr ""
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:193
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:196
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:243
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr ""
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
-#: methods/http.cc:385
+#: methods/http.cc:393
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:539
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:539
+#: methods/http.cc:547
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:600
+#: methods/http.cc:608
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:615
+#: methods/http.cc:623
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:617
+#: methods/http.cc:625
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:641
+#: methods/http.cc:649
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:800
+#: methods/http.cc:808
msgid "Select failed"
msgstr ""
-#: methods/http.cc:805
+#: methods/http.cc:813
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:828
+#: methods/http.cc:836
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:859
+#: methods/http.cc:867
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:887
+#: methods/http.cc:895
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:901
+#: methods/http.cc:909
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:903
+#: methods/http.cc:911
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
+#: methods/http.cc:1016 apt-pkg/contrib/mmap.cc:293
msgid "Failed to truncate file"
msgstr ""
-#: methods/http.cc:1183
+#: methods/http.cc:1191
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1208 methods/http.cc:1263
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1347
+#: methods/http.cc:1355
msgid "Internal error"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:91
#, c-format
msgid "Couldn't duplicate file descriptor %i"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
+#: apt-pkg/contrib/mmap.cc:99
#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+msgid "Couldn't make mmap of %llu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:126
msgid "Unable to close mmap"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:154 apt-pkg/contrib/mmap.cc:182
msgid "Unable to synchronize mmap"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:260
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:312
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:411
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:414
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
@@ -2102,93 +2149,93 @@ msgstr ""
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
#, c-format
msgid "Selection %s not found"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:452
+#: apt-pkg/contrib/configuration.cc:468
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:510
+#: apt-pkg/contrib/configuration.cc:526
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:678
+#: apt-pkg/contrib/configuration.cc:694
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:713
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:714
+#: apt-pkg/contrib/configuration.cc:730
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:761
+#: apt-pkg/contrib/configuration.cc:777
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:790
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:777
+#: apt-pkg/contrib/configuration.cc:793
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:827
+#: apt-pkg/contrib/configuration.cc:843
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
#, c-format
msgid "%c%s... Error!"
msgstr ""
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
#, c-format
msgid "%c%s... Done"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
#, c-format
msgid "Command line option %s is not understood"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
#, c-format
msgid "Command line option %s is not boolean"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
#, c-format
msgid "Option %s requires an argument."
msgstr ""
@@ -2198,602 +2245,573 @@ msgstr ""
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
#, c-format
msgid "Option '%s' is too long"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:300
+#: apt-pkg/contrib/cmndline.cc:298
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
#, c-format
msgid "Invalid operation %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
#, c-format
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
#, c-format
msgid "Unable to change to %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:169
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Could not open lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:192
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:196
#, c-format
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:336
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:363
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:381
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:691
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:703
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:705
#, c-format
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:709
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:711
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:776 apt-pkg/indexcopy.cc:676
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:793
#, c-format
msgid "Could not open file descriptor %d"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:841
+#: apt-pkg/contrib/fileutl.cc:853
#, c-format
-msgid "read, still have %lu to read but none left"
+msgid "read, still have %llu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:874
+#: apt-pkg/contrib/fileutl.cc:886
#, c-format
-msgid "write, still have %lu to write but couldn't"
+msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1023
#, c-format
msgid "Problem closing the gzip file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1026
#, c-format
msgid "Problem closing the file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1031
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1042
#, c-format
msgid "Problem unlinking the file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1055
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:167
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:131
msgid "Candidate versions"
msgstr ""
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:160
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:180 apt-pkg/depcache.cc:213 apt-pkg/depcache.cc:217
msgid "Reading state information"
msgstr ""
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:242
#, c-format
msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:248
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr ""
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr ""
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:447
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
+msgid "Could not configure '%s'. "
msgstr ""
-#: apt-pkg/packagemanager.cc:501
+#: apt-pkg/packagemanager.cc:507
#, c-format
msgid ""
-"Could not perform immediate configuration on already unpacked '%s'. Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
#, c-format
msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
msgstr ""
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
#, c-format
msgid "List directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
#, c-format
msgid "Archives directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
#, c-format
msgid "Unable to lock directory %s"
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
#, c-format
msgid "The method driver %s could not be found."
msgstr ""
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
#, c-format
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:151
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:167
msgid "Unable to determine a suitable packaging system type"
msgstr ""
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
#, c-format
msgid "Unable to stat %s."
msgstr ""
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
msgid "The list of sources could not be read."
msgstr ""
-#: apt-pkg/policy.cc:375
+#: apt-pkg/policy.cc:74
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:396
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:397
+#: apt-pkg/policy.cc:418
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:405
+#: apt-pkg/policy.cc:426
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:83
msgid "Cache has an incompatible versioning system"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:309
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275
+#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353
+#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374
+#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388
+#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:413
+#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:463
+#: apt-pkg/pkgcachegen.cc:494 apt-pkg/pkgcachegen.cc:508
#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (%s%d)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:232
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:235
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:238
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:241
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:515
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1080
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1185
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1243 apt-pkg/pkgcachegen.cc:1250
+#: apt-pkg/pkgcachegen.cc:1376 apt-pkg/pkgcachegen.cc:1383
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1415
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1450
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1488
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1510
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2801,424 +2819,448 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
#, 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:1698
+#: apt-pkg/acquire-item.cc:1709
#, 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:1768
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
#, c-format
msgid "Unable to parse Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:528
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:537 apt-pkg/cdrom.cc:634
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:565
#, c-format
msgid "Stored label: %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:574 apt-pkg/cdrom.cc:850
msgid "Unmounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:594
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:612
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:617
msgid "Waiting for disc...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:626
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:645
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:687
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:698
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:725
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:754
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:771
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:773
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:800
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:808
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:930
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:281 apt-pkg/indexcopy.cc:938
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:540
#, c-format
msgid "Skipping nonexistent file %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:546
#, c-format
msgid "Can't find authentication record for: %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:552
#, c-format
msgid "Hash mismatch for: %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:680
#, 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:708
+#: apt-pkg/indexcopy.cc:711
#, c-format
msgid "No keyring installed in %s."
msgstr ""
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:342
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:345
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:452
#, c-format
msgid "Couldn't find task '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:459
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:472
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:480 apt-pkg/cacheset.cc:488
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:496
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:504
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:512
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:70
#, c-format
msgid "Installing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:865
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:872
#, c-format
msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:56
+#: apt-pkg/deb/dpkgpm.cc:73
#, c-format
msgid "Completely removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:671
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:668 apt-pkg/deb/dpkgpm.cc:688
+#: apt-pkg/deb/dpkgpm.cc:686 apt-pkg/deb/dpkgpm.cc:706
#, c-format
msgid "Could not open file '%s'"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:840
+#: apt-pkg/deb/dpkgpm.cc:858
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:859
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:846
+#: apt-pkg/deb/dpkgpm.cc:864
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:866
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:853
+#: apt-pkg/deb/dpkgpm.cc:871
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:873
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:860
+#: apt-pkg/deb/dpkgpm.cc:878
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:879
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1081
+#: apt-pkg/deb/dpkgpm.cc:1110
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1112
+#: apt-pkg/deb/dpkgpm.cc:1140
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1337
+#: apt-pkg/deb/dpkgpm.cc:1319
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1376
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1342
+#: apt-pkg/deb/dpkgpm.cc:1381
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1344
+#: apt-pkg/deb/dpkgpm.cc:1383
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1350
+#: apt-pkg/deb/dpkgpm.cc:1389
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1396
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1364 apt-pkg/deb/dpkgpm.cc:1370
+#: apt-pkg/deb/dpkgpm.cc:1403 apt-pkg/deb/dpkgpm.cc:1409
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1391
+#: apt-pkg/deb/dpkgpm.cc:1430
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
msgstr ""
#. TRANSLATORS: the %s contains the recovery command, usually
#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
msgstr ""
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
msgstr ""
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
#, c-format
msgid "No mirror file '%s' found "
msgstr ""
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
#, c-format
msgid "Can not read mirror file '%s'"
msgstr ""
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
#, c-format
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:503
+#: methods/rred.cc:509
#, c-format
msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
-#: methods/rred.cc:508
+#: methods/rred.cc:514
#, c-format
msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
msgid "Connection closed prematurely"
msgstr ""