summaryrefslogtreecommitdiff
path: root/po/apt-all.pot
diff options
context:
space:
mode:
Diffstat (limited to 'po/apt-all.pot')
-rw-r--r--po/apt-all.pot714
1 files changed, 376 insertions, 338 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 41b46aeff..cd73ed59b 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: 2010-03-14 16:30+0100\n"
+"POT-Creation-Date: 2010-05-04 13:37+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"
@@ -21,9 +21,10 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
-#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
+#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
+#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
+#: cmdline/apt-cache.cc:1606
#, c-format
msgid "Unable to locate package %s"
msgstr ""
@@ -32,127 +33,129 @@ msgstr ""
msgid "Total package names: "
msgstr ""
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:247
+msgid "Total package structures: "
+msgstr ""
+
+#: cmdline/apt-cache.cc:287
msgid " Normal packages: "
msgstr ""
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:288
msgid " Pure virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:289
msgid " Single virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:290
msgid " Mixed virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:291
msgid " Missing: "
msgstr ""
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:293
msgid "Total distinct versions: "
msgstr ""
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:295
msgid "Total distinct descriptions: "
msgstr ""
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:297
msgid "Total dependencies: "
msgstr ""
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:300
msgid "Total ver/file relations: "
msgstr ""
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:302
msgid "Total Desc/File relations: "
msgstr ""
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:304
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:316
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:330
msgid "Total dependency version space: "
msgstr ""
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:335
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:343
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:1297
+#: cmdline/apt-cache.cc:1299
msgid "You must give exactly one pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1451
+#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
msgid "No packages found"
msgstr ""
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1548
msgid "Package files:"
msgstr ""
-#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
+#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1549
+#: cmdline/apt-cache.cc:1569
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
+#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
msgid "(not found)"
msgstr ""
-#. Installed version
-#: cmdline/apt-cache.cc:1582
+#: cmdline/apt-cache.cc:1590
msgid " Installed: "
msgstr ""
-#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
-msgid "(none)"
+#: cmdline/apt-cache.cc:1591
+msgid " Candidate: "
msgstr ""
-#. Candidate Version
-#: cmdline/apt-cache.cc:1589
-msgid " Candidate: "
+#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+msgid "(none)"
msgstr ""
-#: cmdline/apt-cache.cc:1599
+#: cmdline/apt-cache.cc:1634
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1643
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2693 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
+#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1725
+#: cmdline/apt-cache.cc:1761
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -247,7 +250,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -256,31 +259,31 @@ msgstr ""
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345
msgid "Package extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:187
+#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296
#, c-format
msgid "Error processing directory %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:251
+#: ftparchive/apt-ftparchive.cc:258
msgid "Source extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:368
+#: ftparchive/apt-ftparchive.cc:375
msgid "Error writing header to contents file"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:398
+#: ftparchive/apt-ftparchive.cc:405
#, c-format
msgid "Error processing contents %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:553
+#: ftparchive/apt-ftparchive.cc:590
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -322,11 +325,11 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:759
+#: ftparchive/apt-ftparchive.cc:796
msgid "No selections matched"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:832
+#: ftparchive/apt-ftparchive.cc:874
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr ""
@@ -366,87 +369,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:72
+#: ftparchive/writer.cc:73
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:77
+#: ftparchive/writer.cc:78
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:133
+#: ftparchive/writer.cc:134
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:135
+#: ftparchive/writer.cc:136
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:142
+#: ftparchive/writer.cc:143
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:160 ftparchive/writer.cc:192
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:173
+#: ftparchive/writer.cc:174
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:200
+#: ftparchive/writer.cc:201
#, c-format
msgid "Failed to open %s"
msgstr ""
-#: ftparchive/writer.cc:259
+#: ftparchive/writer.cc:260
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:268
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:271
+#: ftparchive/writer.cc:272
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:278
+#: ftparchive/writer.cc:279
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:289
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:392
+#: ftparchive/writer.cc:393
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:400 ftparchive/writer.cc:636
+#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:461 ftparchive/writer.cc:741
+#: ftparchive/writer.cc:464 ftparchive/writer.cc:790
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:646
+#: ftparchive/writer.cc:698
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:650
+#: ftparchive/writer.cc:702
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -550,7 +553,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -589,179 +592,175 @@ msgstr ""
msgid " or"
msgstr ""
-#: cmdline/apt-get.cc:382
+#: cmdline/apt-get.cc:384
msgid "The following NEW packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:408
+#: cmdline/apt-get.cc:412
msgid "The following packages will be REMOVED:"
msgstr ""
-#: cmdline/apt-get.cc:430
+#: cmdline/apt-get.cc:434
msgid "The following packages have been kept back:"
msgstr ""
-#: cmdline/apt-get.cc:451
+#: cmdline/apt-get.cc:457
msgid "The following packages will be upgraded:"
msgstr ""
-#: cmdline/apt-get.cc:472
+#: cmdline/apt-get.cc:480
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: cmdline/apt-get.cc:492
+#: cmdline/apt-get.cc:500
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:553
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:561
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:584
+#: cmdline/apt-get.cc:595
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:588
+#: cmdline/apt-get.cc:599
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:590
+#: cmdline/apt-get.cc:601
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:592
+#: cmdline/apt-get.cc:603
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:596
+#: cmdline/apt-get.cc:607
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:669
+#: cmdline/apt-get.cc:680
msgid "Correcting dependencies..."
msgstr ""
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:683
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:686
msgid "Unable to correct dependencies"
msgstr ""
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:689
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:691
msgid " Done"
msgstr ""
-#: cmdline/apt-get.cc:684
+#: cmdline/apt-get.cc:695
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:698
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:723
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: cmdline/apt-get.cc:716
+#: cmdline/apt-get.cc:727
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:734
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:736
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:786
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:795
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:806
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2129
-msgid "Unable to lock the download directory"
-msgstr ""
-
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2177 cmdline/apt-get.cc:2434
+#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:836
+#: cmdline/apt-get.cc:846
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:841
+#: cmdline/apt-get.cc:851
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:854
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:859
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:852
+#: cmdline/apt-get.cc:862
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2273
-#: cmdline/apt-get.cc:2276
+#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2311
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:880
+#: cmdline/apt-get.cc:890
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:908
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:910
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -769,79 +768,83 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:931
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2329 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:1021
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2338
+#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1028
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1032
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1037
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1038
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1096
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1107
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1107
+#: cmdline/apt-get.cc:1117
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1135
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1146
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1148
+#: cmdline/apt-get.cc:1159
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1153
+#: cmdline/apt-get.cc:1168
+msgid " [Not candidate version]"
+msgstr ""
+
+#: cmdline/apt-get.cc:1170
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1158
+#: cmdline/apt-get.cc:1175
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -849,69 +852,65 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1177
+#: cmdline/apt-get.cc:1194
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1197
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1200
+#: cmdline/apt-get.cc:1217
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1208
+#: cmdline/apt-get.cc:1225
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1237
+#: cmdline/apt-get.cc:1254
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1239
+#: cmdline/apt-get.cc:1256
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1245
+#: cmdline/apt-get.cc:1262
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1331
+#: cmdline/apt-get.cc:1363
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1362
+#: cmdline/apt-get.cc:1395
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1433
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1415
+#: cmdline/apt-get.cc:1449
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1428
-msgid "Unable to lock the list directory"
-msgstr ""
-
-#: cmdline/apt-get.cc:1484
+#: cmdline/apt-get.cc:1514
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1532
+#: cmdline/apt-get.cc:1562
msgid ""
"The following package is automatically installed and is no longer required:"
msgid_plural ""
@@ -920,7 +919,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1566
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -928,11 +927,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1568
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1573
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -948,49 +947,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1546 cmdline/apt-get.cc:1838
+#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1550
+#: cmdline/apt-get.cc:1580
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1569
+#: cmdline/apt-get.cc:1599
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1624
+#: cmdline/apt-get.cc:1654
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1739 cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1795
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1795
+#: cmdline/apt-get.cc:1828
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1808
+#: cmdline/apt-get.cc:1841
msgid "You might want to run 'apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1811
+#: cmdline/apt-get.cc:1844
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1823
+#: cmdline/apt-get.cc:1856
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"
@@ -998,152 +997,156 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1874
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1870
+#: cmdline/apt-get.cc:1903
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:1992
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1960
+#: cmdline/apt-get.cc:1993
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:2022
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1992 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:2030
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:2064 cmdline/apt-get.cc:2072
+#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2172
+#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+msgid "Unable to lock the download directory"
+msgstr ""
+
+#: cmdline/apt-get.cc:2205
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2202 cmdline/apt-get.cc:2452
+#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2321
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2327
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2295
+#: cmdline/apt-get.cc:2330
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2301
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2369
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2363
+#: cmdline/apt-get.cc:2398
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2410
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2411
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2428
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2413
+#: cmdline/apt-get.cc:2448
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2464
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2457
+#: cmdline/apt-get.cc:2494
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2477
+#: cmdline/apt-get.cc:2514
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2529
+#: cmdline/apt-get.cc:2566
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2582
+#: cmdline/apt-get.cc:2619
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2618
+#: cmdline/apt-get.cc:2655
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2645
+#: cmdline/apt-get.cc:2682
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2698
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:2703
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:2734
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2739
+#: cmdline/apt-get.cc:2775
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1187,7 +1190,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2908
+#: cmdline/apt-get.cc:2944
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1418,9 +1421,9 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
-#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
+#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
+#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1450,9 +1453,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
-#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
-#: apt-pkg/pkgcachegen.cc:1008
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
+#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
+#: apt-pkg/pkgcachegen.cc:1181
msgid "Reading package lists"
msgstr ""
@@ -1645,7 +1648,7 @@ msgstr ""
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
msgid "Read error"
msgstr ""
@@ -1657,7 +1660,7 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
msgid "Write error"
msgstr ""
@@ -1763,34 +1766,34 @@ msgstr ""
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:119
+#: methods/connect.cc:122
#, 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:147 methods/rsh.cc:425
+#: methods/connect.cc:150 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr ""
-#: methods/connect.cc:166 methods/connect.cc:185
+#: methods/connect.cc:169 methods/connect.cc:188
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:191
+#: methods/connect.cc:194
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:194
+#: methods/connect.cc:197
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:241
+#: methods/connect.cc:244
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr ""
@@ -1961,30 +1964,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:363
+#: apt-pkg/contrib/strutl.cc:371
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:370
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:377
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:382
+#: apt-pkg/contrib/strutl.cc:390
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1075
+#: apt-pkg/contrib/strutl.cc:1083
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2034,7 +2037,12 @@ msgstr ""
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:825
+#: apt-pkg/contrib/configuration.cc:777
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:827
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@@ -2101,7 +2109,7 @@ msgid "Unable to stat the mount point %s"
msgstr ""
#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2110,181 +2118,186 @@ msgstr ""
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:151
+#: apt-pkg/contrib/fileutl.cc:152
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:156
+#: apt-pkg/contrib/fileutl.cc:157
#, c-format
msgid "Could not open lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:174
+#: apt-pkg/contrib/fileutl.cc:175
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:178
+#: apt-pkg/contrib/fileutl.cc:179
#, c-format
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:568
+#: apt-pkg/contrib/fileutl.cc:615
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:580
+#: apt-pkg/contrib/fileutl.cc:627
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:582
+#: apt-pkg/contrib/fileutl.cc:629
#, c-format
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:586
+#: apt-pkg/contrib/fileutl.cc:633
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:588
+#: apt-pkg/contrib/fileutl.cc:635
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:632
+#: apt-pkg/contrib/fileutl.cc:679
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:688
+#: apt-pkg/contrib/fileutl.cc:735
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:718
+#: apt-pkg/contrib/fileutl.cc:765
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:793
+#: apt-pkg/contrib/fileutl.cc:840
msgid "Problem closing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:799
+#: apt-pkg/contrib/fileutl.cc:846
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:810
+#: apt-pkg/contrib/fileutl.cc:857
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:133
+#: apt-pkg/pkgcache.cc:139
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:145
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:144
+#: apt-pkg/pkgcache.cc:150
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:155
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:160
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:287
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:287
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:287
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:288
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:288
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:288
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:289
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:289
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:289
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:300
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:300
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:300
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:301
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:301
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:124
+#: apt-pkg/depcache.cc:125
msgid "Candidate versions"
msgstr ""
-#: apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:154
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
msgid "Reading state information"
msgstr ""
-#: apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc:236
#, c-format
msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc:242
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr ""
+#: apt-pkg/depcache.cc:851
+#, c-format
+msgid "Internal error, group '%s' has no installable pseudo package"
+msgstr ""
+
#: apt-pkg/tagfile.cc:102
#, c-format
msgid "Unable to parse package file %s (1)"
@@ -2295,64 +2308,84 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:83
+#: apt-pkg/sourcelist.cc:92
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:95
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:106
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:115
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:128
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:85
+#: apt-pkg/sourcelist.cc:130
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:133
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:94
+#: apt-pkg/sourcelist.cc:139
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:146
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:446
+#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:281
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
#, 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:440
+#: apt-pkg/packagemanager.cc:452
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2360,7 +2393,7 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/packagemanager.cc:478
+#: apt-pkg/packagemanager.cc:495
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2372,46 +2405,51 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:292
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1138
+#: apt-pkg/algorithms.cc:1182
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1140
+#: apt-pkg/algorithms.cc:1184
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
+#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: apt-pkg/acquire.cc:60
+#: apt-pkg/acquire.cc:79
#, c-format
-msgid "Lists directory %spartial is missing."
+msgid "List directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:64
+#: apt-pkg/acquire.cc:83
#, c-format
-msgid "Archive directory %spartial is missing."
+msgid "Archives directory %spartial is missing."
+msgstr ""
+
+#: apt-pkg/acquire.cc:91
+#, c-format
+msgid "Unable to lock directory %s"
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:826
+#: apt-pkg/acquire.cc:878
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:880
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
@@ -2457,110 +2495,110 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:316
+#: apt-pkg/policy.cc:333
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:338
+#: apt-pkg/policy.cc:355
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:346
+#: apt-pkg/policy.cc:363
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:75
msgid "Cache has an incompatible versioning system"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:131
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:146
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:166
+#: apt-pkg/pkgcachegen.cc:180
#, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:191
+#: apt-pkg/pkgcachegen.cc:210
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:195
+#: apt-pkg/pkgcachegen.cc:214
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:226
+#: apt-pkg/pkgcachegen.cc:234
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:230
+#: apt-pkg/pkgcachegen.cc:238
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:242
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:258
+#: apt-pkg/pkgcachegen.cc:266
#, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:264
+#: apt-pkg/pkgcachegen.cc:273
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:267
+#: apt-pkg/pkgcachegen.cc:276
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:270
+#: apt-pkg/pkgcachegen.cc:279
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:282
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:310
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:314
+#: apt-pkg/pkgcachegen.cc:323
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:320
+#: apt-pkg/pkgcachegen.cc:329
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:706
+#: apt-pkg/pkgcachegen.cc:860
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:808
+#: apt-pkg/pkgcachegen.cc:962
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
+#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
msgid "IO Error saving source cache"
msgstr ""
@@ -2573,7 +2611,7 @@ msgstr ""
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
msgid "Hash Sum mismatch"
msgstr ""
@@ -2595,13 +2633,13 @@ msgid ""
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1360
+#: apt-pkg/acquire-item.cc:1374
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1447
+#: apt-pkg/acquire-item.cc:1461
msgid "Size mismatch"
msgstr ""
@@ -2625,86 +2663,86 @@ msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:526
+#: apt-pkg/cdrom.cc:518
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:535 apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:560
+#: apt-pkg/cdrom.cc:552
#, c-format
msgid "Stored label: %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:567 apt-pkg/cdrom.cc:835
+#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
msgid "Unmounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:586
+#: apt-pkg/cdrom.cc:578
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:604
+#: apt-pkg/cdrom.cc:596
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc:600
msgid "Waiting for disc...\n"
msgstr ""
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:616
+#: apt-pkg/cdrom.cc:608
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:634
+#: apt-pkg/cdrom.cc:626
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:666
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
"zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:685
+#: apt-pkg/cdrom.cc:677
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:711
+#: apt-pkg/cdrom.cc:703
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:740
+#: apt-pkg/cdrom.cc:732
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:756
+#: apt-pkg/cdrom.cc:748
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:752
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:786
+#: apt-pkg/cdrom.cc:778
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:795
+#: apt-pkg/cdrom.cc:787
msgid "Source list entries for this disc are:\n"
msgstr ""
@@ -2748,12 +2786,12 @@ msgstr ""
msgid "Installing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:724
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
#, c-format
msgid "Removing %s"
msgstr ""
@@ -2768,61 +2806,61 @@ msgstr ""
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:569
+#: apt-pkg/deb/dpkgpm.cc:581
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:584 apt-pkg/deb/dpkgpm.cc:597
+#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
#, c-format
msgid "Could not open file '%s'"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:717
+#: apt-pkg/deb/dpkgpm.cc:730
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:718
+#: apt-pkg/deb/dpkgpm.cc:731
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:723
+#: apt-pkg/deb/dpkgpm.cc:736
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:725
+#: apt-pkg/deb/dpkgpm.cc:738
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:743
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:732
+#: apt-pkg/deb/dpkgpm.cc:745
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:750
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:751
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:942
+#: apt-pkg/deb/dpkgpm.cc:955
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:972
+#: apt-pkg/deb/dpkgpm.cc:986
msgid "Running dpkg"
msgstr ""