summaryrefslogtreecommitdiff
path: root/po/en_GB.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po955
1 files changed, 558 insertions, 397 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 0c232b979..4ee752427 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
"PO-Revision-Date: 2008-11-13 11:47+0000\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en_gb@li.org>\n"
@@ -15,153 +15,148 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Package %s version %s has an unmet dep:\n"
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: 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
#, c-format
msgid "Unable to locate package %s"
msgstr "Unable to locate package %s"
-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245
msgid "Total package names: "
msgstr "Total package names: "
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
msgid " Normal packages: "
msgstr " Normal packages: "
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
msgid " Pure virtual packages: "
msgstr " Pure virtual packages: "
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
msgid " Single virtual packages: "
msgstr " Single virtual packages: "
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
msgid " Mixed virtual packages: "
msgstr " Mixed virtual packages: "
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
msgid " Missing: "
msgstr " Missing: "
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
msgid "Total distinct versions: "
msgstr "Total distinct versions: "
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
msgid "Total distinct descriptions: "
msgstr "Total distinct descriptions: "
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
msgid "Total dependencies: "
msgstr "Total dependencies: "
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
msgid "Total ver/file relations: "
msgstr "Total ver/file relations: "
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
msgid "Total Desc/File relations: "
msgstr "Total Desc/File relations: "
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
msgid "Total Provides mappings: "
msgstr "Total Provides mappings: "
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
msgid "Total globbed strings: "
msgstr "Total globbed strings: "
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
msgid "Total dependency version space: "
msgstr "Total dependency version space: "
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
msgid "Total slack space: "
msgstr "Total slack space: "
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
msgid "Total space accounted for: "
msgstr "Total space accounted for: "
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
#, c-format
msgid "Package file %s is out of sync."
msgstr "Package file %s is out of sync."
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
msgid "You must give exactly one pattern"
msgstr "You must give exactly one pattern"
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
msgid "No packages found"
msgstr "No packages found"
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
msgid "Package files:"
msgstr "Package files:"
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Cache is out of sync, can't x-ref a package file"
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
msgid "Pinned packages:"
msgstr "Pinned packages:"
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
msgid "(not found)"
msgstr "(not found)"
#. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
msgid " Installed: "
msgstr " Installed: "
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
msgid "(none)"
msgstr "(none)"
#. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
msgid " Candidate: "
msgstr " Candidate: "
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
msgid " Package pin: "
msgstr " Package pin: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
msgid " Version table:"
msgstr " Version table:"
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s compiled on %s %s\n"
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1725
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -235,15 +230,16 @@ msgstr ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
-#: cmdline/apt-cdrom.cc:78
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+#: cmdline/apt-cdrom.cc:77
+#, fuzzy
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Please provide a name for this Disc, such as ‘Debian 2.1r1 Disk 1’"
-#: cmdline/apt-cdrom.cc:93
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Please insert a Disc in the drive and press enter"
-#: cmdline/apt-cdrom.cc:117
+#: cmdline/apt-cdrom.cc:114
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repeat this process for the rest of the CDs in your set."
@@ -308,7 +304,7 @@ msgstr ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
#, c-format
msgid "Unable to write to %s"
msgstr "Unable to write to %s"
@@ -528,26 +524,26 @@ msgstr "*** Failed to link %s to %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit of %sB hit.\n"
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
msgid "Archive had no package field"
msgstr "Archive had no package field"
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
#, c-format
msgid " %s has no override entry\n"
msgstr " %s has no override entry\n"
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s maintainer is %s not %s\n"
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s has no source override entry\n"
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s has no binary override entry either\n"
@@ -647,79 +643,79 @@ msgstr "Problem unlinking %s"
msgid "Failed to rename %s to %s"
msgstr "Failed to rename %s to %s"
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex compilation error - %s"
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
msgid "The following packages have unmet dependencies:"
msgstr "The following packages have unmet dependencies."
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
#, c-format
msgid "but %s is installed"
msgstr "but %s is installed"
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
#, c-format
msgid "but %s is to be installed"
msgstr "but %s is to be installed"
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
msgid "but it is not installable"
msgstr "but it is not installable"
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
msgid "but it is a virtual package"
msgstr "but it is a virtual package"
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
msgid "but it is not installed"
msgstr "but it is not installed"
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
msgid "but it is not going to be installed"
msgstr "but it is not going to be installed"
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
msgid " or"
msgstr " or"
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
msgid "The following NEW packages will be installed:"
msgstr "The following NEW packages will be installed"
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
msgid "The following packages will be REMOVED:"
msgstr "The following packages will be REMOVED"
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
msgid "The following packages have been kept back:"
msgstr "The following packages have been kept back:"
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
msgid "The following packages will be upgraded:"
msgstr "The following packages will be upgraded:"
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
msgid "The following packages will be DOWNGRADED:"
msgstr "The following packages will be DOWNGRADED:"
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
msgid "The following held packages will be changed:"
msgstr "The following held packages will be changed:"
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
#, c-format
msgid "%s (due to %s) "
msgstr "%s (due to %s) "
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -727,143 +723,144 @@ msgstr ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu upgraded, %lu newly installed, "
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalled, "
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu downgraded, "
msgstr "%lu downgraded, "
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu to remove and %lu not upgraded.\n"
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu not fully installed or removed.\n"
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:669
msgid "Correcting dependencies..."
msgstr "Correcting dependencies..."
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:672
msgid " failed."
msgstr " failed."
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:675
msgid "Unable to correct dependencies"
msgstr "Unable to correct dependencies"
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:678
msgid "Unable to minimize the upgrade set"
msgstr "Unable to minimise the upgrade set"
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:680
msgid " Done"
msgstr "Done"
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:684
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "You might want to run ‘apt-get -f install’ to correct these."
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:687
msgid "Unmet dependencies. Try using -f."
msgstr "Unmet dependencies. Try using -f."
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:712
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "WARNING: The following packages cannot be authenticated!"
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:716
msgid "Authentication warning overridden.\n"
msgstr "Authentication warning overridden.\n"
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:723
msgid "Install these packages without verification [y/N]? "
msgstr "Install these packages without verification [y/N]? "
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:725
msgid "Some packages could not be authenticated"
msgstr "Some packages could not be authenticated"
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
msgid "There are problems and -y was used without --force-yes"
msgstr "There are problems and -y was used without --force-yes"
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Internal error, InstallPackages was called with broken packages!"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:784
msgid "Packages need to be removed but remove is disabled."
msgstr "Packages need to be removed but remove is disabled."
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:795
msgid "Internal error, Ordering didn't finish"
msgstr "Internal error, Ordering didn't finish"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
msgid "Unable to lock the download directory"
msgstr "Unable to lock the download directory"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "The list of sources could not be read."
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:836
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:841
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Need to get %sB/%sB of archives.\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:844
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Need to get %sB of archives.\n"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "After this operation, %sB of additional disk space will be used.\n"
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:852
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "After this operation, %sB disk space will be freed.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Couldn't determine free space in %s"
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:880
#, c-format
msgid "You don't have enough free space in %s."
msgstr "You don't have enough free space in %s."
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Trivial Only specified but this is not a trivial operation."
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:898
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:900
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -874,28 +871,28 @@ msgstr ""
"To continue type in the phrase ‘%s’\n"
" ?] "
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
msgid "Abort."
msgstr "Abort."
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:921
msgid "Do you want to continue [Y/n]? "
msgstr "Do you want to continue [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Failed to fetch %s %s\n"
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1011
msgid "Some files failed to download"
msgstr "Some files failed to download"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
msgid "Download complete and in download only mode"
msgstr "Download complete and in download only mode"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1018
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -903,47 +900,47 @@ msgstr ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1022
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing and media swapping is not currently supported"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1027
msgid "Unable to correct missing packages."
msgstr "Unable to correct missing packages."
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1028
msgid "Aborting install."
msgstr "Aborting install."
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1086
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Note, selecting %s instead of %s\n"
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1097
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1115
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Package %s is not installed, so not removed\n"
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1126
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Package %s is a virtual package provided by:\n"
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1138
msgid " [Installed]"
msgstr " [Installed]"
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1143
msgid "You should explicitly select one to install."
msgstr "You should explicitly select one to install."
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1148
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -954,53 +951,69 @@ msgstr ""
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1167
msgid "However the following packages replace it:"
msgstr "However the following packages replace it:"
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Package %s has no installation candidate"
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1190
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1198
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s is already the newest version.\n"
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1227
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release ‘%s’ for ‘%s’ was not found"
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1229
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version ‘%s’ for ‘%s’ was not found"
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1235
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Selected version %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1338
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Couldn't stat source package list %s"
+
+#: cmdline/apt-get.cc:1383
msgid "The update command takes no arguments"
msgstr "The update command takes no arguments"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1396
msgid "Unable to lock the list directory"
msgstr "Unable to lock the list directory"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1452
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "We are not supposed to delete stuff, cannot start AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1501
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1008,11 +1021,18 @@ msgstr ""
"The following packages were automatically installed and are no longer "
"required:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1503
+#, fuzzy, c-format
+msgid "%lu packages were automatically installed and are no longer required.\n"
+msgstr ""
+"The following packages were automatically installed and are no longer "
+"required:"
+
+#: cmdline/apt-get.cc:1504
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Use 'apt-get autoremove' to remove them."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1509
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1030,43 +1050,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
msgid "The following information may help to resolve the situation:"
msgstr "The following information may help to resolve the situation:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1516
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Internal Error, AutoRemoved broke stuff"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1535
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, AllUpgrade broke stuff"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1590
#, c-format
msgid "Couldn't find task %s"
msgstr "Couldn't find task %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
#, c-format
msgid "Couldn't find package %s"
msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1728
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1759
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s set to manually installed.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1772
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "You might want to run 'apt-get -f install' to correct these:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1775
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1074,7 +1094,7 @@ msgstr ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1787
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"
@@ -1086,116 +1106,116 @@ msgstr ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1805
msgid "Broken packages"
msgstr "Broken packages"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1834
msgid "The following extra packages will be installed:"
msgstr "The following extra packages will be installed:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1923
msgid "Suggested packages:"
msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1924
msgid "Recommended packages:"
msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1953
msgid "Calculating upgrade... "
msgstr "Calculating upgrade... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
msgid "Failed"
msgstr "Failed"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1961
msgid "Done"
msgstr "Done"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
msgid "Internal error, problem resolver broke stuff"
msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2136
msgid "Must specify at least one package to fetch source for"
msgstr "Must specify at least one package for which to fetch source"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Unable to find a source package for %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2215
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Skipping already downloaded file '%s'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2250
#, c-format
msgid "You don't have enough free space in %s"
msgstr "You don't have enough free space in %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Need to get %sB/%sB of source archives.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2259
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Need to get %sB of source archives.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2265
#, c-format
msgid "Fetch source %s\n"
msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2296
msgid "Failed to fetch some archives."
msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2324
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2337
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Check if the 'dpkg-dev' package is installed.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2354
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2373
msgid "Child process failed"
msgstr "Child process failed"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2389
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Must specify at least one package for which you want to check builddeps"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2417
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Unable to get build-dependency information for %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2437
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s has no build depends.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2489
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1204,7 +1224,7 @@ msgstr ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2542
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1213,31 +1233,32 @@ msgstr ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2578
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Failed to satisfy %s dependency for %s: Installed package %s is too new"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2605
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Failed to satisfy %s dependency for %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2621
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-dependencies for %s could not be satisfied."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2626
msgid "Failed to process build dependencies"
msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2658
msgid "Supported modules:"
msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2699
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1253,7 +1274,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1321,6 +1342,14 @@ msgstr ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
+#: cmdline/apt-get.cc:2866
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: cmdline/acqprogress.cc:55
msgid "Hit "
msgstr "Hit "
@@ -1400,11 +1429,13 @@ msgid "Do you want to erase any previously downloaded .deb files?"
msgstr "Do you want to erase any previously downloaded .deb files?"
#: dselect/install:101
-msgid "Some errors occurred while unpacking. I'm going to configure the"
+#, fuzzy
+msgid "Some errors occurred while unpacking. Packages that were installed"
msgstr "Some errors occurred while unpacking. I'm going to configure the"
#: dselect/install:102
-msgid "packages that were installed. This may result in duplicate errors"
+#, fuzzy
+msgid "will be configured. This may result in duplicate errors"
msgstr "packages that were installed. This may result in duplicate errors"
#: dselect/install:103
@@ -1450,7 +1481,12 @@ msgstr "Invalid archive signature"
msgid "Error reading archive member header"
msgstr "Error reading archive member header"
-#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:90
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Invalid archive member header"
+
+#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
msgstr "Invalid archive member header"
@@ -1550,9 +1586,13 @@ msgstr "Overwrite package match with no version for %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "File %s/%s overwrites the one in the package %s"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
-#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#. 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/configuration.cc:843
+#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
+#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
+#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
msgstr "Unable to read %s"
@@ -1582,9 +1622,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "The info and temp directories need to be on the same filesystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
-#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
-#: apt-pkg/pkgcachegen.cc:957
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
+#: apt-pkg/pkgcachegen.cc:961
msgid "Reading package lists"
msgstr "Reading package lists"
@@ -1687,12 +1727,12 @@ msgstr "Failed to locate a valid control file"
msgid "Unparsable control file"
msgstr "Unparsable control file"
-#: methods/cdrom.cc:114
+#: methods/cdrom.cc:200
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr "Unable to read the cdrom database %s"
-#: methods/cdrom.cc:123
+#: methods/cdrom.cc:209
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
@@ -1700,29 +1740,29 @@ msgstr ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
-#: methods/cdrom.cc:131
+#: methods/cdrom.cc:219
msgid "Wrong CD-ROM"
msgstr "Wrong CD-ROM"
-#: methods/cdrom.cc:166
+#: methods/cdrom.cc:245
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Unable to unmount the CD-ROM in %s, it may still be in use."
-#: methods/cdrom.cc:171
+#: methods/cdrom.cc:250
msgid "Disk not found."
msgstr "Disk not found."
-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "File not found"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr "Failed to stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr "Failed to set modification time"
@@ -1731,34 +1771,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Invalid URI, local URIS must not start with //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:162
+#: methods/ftp.cc:167
msgid "Logging in"
msgstr "Logging in"
-#: methods/ftp.cc:168
+#: methods/ftp.cc:173
msgid "Unable to determine the peer name"
msgstr "Unable to determine the peer name"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:178
msgid "Unable to determine the local name"
msgstr "Unable to determine the local name"
-#: methods/ftp.cc:204 methods/ftp.cc:232
+#: methods/ftp.cc:209 methods/ftp.cc:237
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "The server refused the connection and said: %s"
-#: methods/ftp.cc:210
+#: methods/ftp.cc:215
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER failed, server said: %s"
-#: methods/ftp.cc:217
+#: methods/ftp.cc:222
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS failed, server said: %s"
-#: methods/ftp.cc:237
+#: methods/ftp.cc:242
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1766,114 +1806,114 @@ msgstr ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
-#: methods/ftp.cc:265
+#: methods/ftp.cc:270
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Login script command ‘%s’ failed, server said: %s"
-#: methods/ftp.cc:291
+#: methods/ftp.cc:296
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE failed, server said: %s"
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Connection timeout"
-#: methods/ftp.cc:335
+#: methods/ftp.cc:340
msgid "Server closed the connection"
msgstr "Server closed the connection"
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Read error"
-#: methods/ftp.cc:345 methods/rsh.cc:197
+#: methods/ftp.cc:350 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "A response overflowed the buffer."
-#: methods/ftp.cc:362 methods/ftp.cc:374
+#: methods/ftp.cc:367 methods/ftp.cc:379
msgid "Protocol corruption"
msgstr "Protocol corruption"
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Write error"
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
msgid "Could not create a socket"
msgstr "Could not create a socket"
-#: methods/ftp.cc:698
+#: methods/ftp.cc:703
msgid "Could not connect data socket, connection timed out"
msgstr "Could not connect data socket, connection timed out"
-#: methods/ftp.cc:704
+#: methods/ftp.cc:709
msgid "Could not connect passive socket."
msgstr "Could not connect, passive socket."
-#: methods/ftp.cc:722
+#: methods/ftp.cc:727
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo was unable to get a listening socket"
-#: methods/ftp.cc:736
+#: methods/ftp.cc:741
msgid "Could not bind a socket"
msgstr "Could not bind a socket"
-#: methods/ftp.cc:740
+#: methods/ftp.cc:745
msgid "Could not listen on the socket"
msgstr "Could not listen on the socket"
-#: methods/ftp.cc:747
+#: methods/ftp.cc:752
msgid "Could not determine the socket's name"
msgstr "Could not determine the name of the socket"
-#: methods/ftp.cc:779
+#: methods/ftp.cc:784
msgid "Unable to send PORT command"
msgstr "Unable to send PORT command"
-#: methods/ftp.cc:789
+#: methods/ftp.cc:794
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Unknown address family %u (AF_*)"
-#: methods/ftp.cc:798
+#: methods/ftp.cc:803
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT failed, server said: %s"
-#: methods/ftp.cc:818
+#: methods/ftp.cc:823
msgid "Data socket connect timed out"
msgstr "Data socket connect timed out"
-#: methods/ftp.cc:825
+#: methods/ftp.cc:830
msgid "Unable to accept connection"
msgstr "Unable to accept connection"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
-#: methods/ftp.cc:877
+#: methods/ftp.cc:882
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Unable to fetch file, server said ‘%s’"
-#: methods/ftp.cc:892 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Data socket timed out"
-#: methods/ftp.cc:922
+#: methods/ftp.cc:927
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Data transfer failed, server said ‘%s’"
#. Get the files information
-#: methods/ftp.cc:997
+#: methods/ftp.cc:1002
msgid "Query"
msgstr "Query"
-#: methods/ftp.cc:1109
+#: methods/ftp.cc:1114
msgid "Unable to invoke "
msgstr "Unable to invoke"
@@ -1925,48 +1965,48 @@ msgid "Temporary failure resolving '%s'"
msgstr "Temporary failure resolving ‘%s’"
#: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
#: methods/connect.cc:240
-#, c-format
-msgid "Unable to connect to %s %s:"
+#, fuzzy, c-format
+msgid "Unable to connect to %s:%s:"
msgstr "Unable to connect to %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Couldn't access keyring: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "At least one invalid signature was encountered."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "Could not execute '%s' to verify signature (is gpgv installed?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Unknown error executing gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "The following signatures were invalid:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1984,147 +2024,181 @@ msgstr "Couldn't open pipe for %s"
msgid "Read error from %s process"
msgstr "Read error from %s process"
-#: methods/http.cc:377
+#: methods/http.cc:384
msgid "Waiting for headers"
msgstr "Waiting for headers"
-#: methods/http.cc:523
+#: methods/http.cc:530
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Got a single header line over %u chars"
-#: methods/http.cc:531
+#: methods/http.cc:538
msgid "Bad header line"
msgstr "Bad header line"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:557 methods/http.cc:564
msgid "The HTTP server sent an invalid reply header"
msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:586
+#: methods/http.cc:593
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:601
+#: methods/http.cc:608
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:603
+#: methods/http.cc:610
msgid "This HTTP server has broken range support"
msgstr "This HTTP server has broken range support"
-#: methods/http.cc:627
+#: methods/http.cc:634
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:774
+#: methods/http.cc:788
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:779
+#: methods/http.cc:793
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:802
+#: methods/http.cc:816
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:833
+#: methods/http.cc:847
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:861
+#: methods/http.cc:875
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:875
+#: methods/http.cc:889
msgid "Error reading from server. Remote end closed connection"
msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:877
+#: methods/http.cc:891
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Failed to truncate file"
-#: methods/http.cc:1105
+#: methods/http.cc:1147
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1164 methods/http.cc:1219
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1229
+#: methods/http.cc:1311
msgid "Internal error"
msgstr "Internal error"
-#: apt-pkg/contrib/mmap.cc:80
+#: apt-pkg/contrib/mmap.cc:76
msgid "Can't mmap an empty file"
msgstr "Cannot mmap an empty file"
-#: apt-pkg/contrib/mmap.cc:85
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Couldn't make mmap of %lu bytes"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:252
+#, 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:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:346
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:353
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:360
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:365
+#, c-format
+msgid "%lis"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1040
#, c-format
msgid "Selection %s not found"
msgstr "Selection %s not found"
-#: apt-pkg/contrib/configuration.cc:439
+#: apt-pkg/contrib/configuration.cc:458
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Unrecognized type abbreviation: ‘%c’"
-#: apt-pkg/contrib/configuration.cc:497
+#: apt-pkg/contrib/configuration.cc:516
#, c-format
msgid "Opening configuration file %s"
msgstr "Opening configuration file %s"
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:684
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntax error %s:%u: Block starts with no name."
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:703
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntax error %s:%u: Malformed tag"
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:720
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntax error %s:%u: Extra junk after value"
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:760
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Syntax error %s:%u: Directives can only be done at the top level"
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:767
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntax error %s:%u: Too many nested includes"
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntax error %s:%u: Included from here"
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:780
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntax error %s:%u: Unsupported directive ‘%s’"
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:831
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntax error %s:%u: Extra junk at end of file"
@@ -2190,13 +2264,13 @@ msgstr "Invalid operation %s"
msgid "Unable to stat the mount point %s"
msgstr "Unable to stat the mount point %s"
-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
#, c-format
msgid "Unable to change to %s"
msgstr "Unable to change to %s"
-#: apt-pkg/contrib/cdromutl.cc:188
+#: apt-pkg/contrib/cdromutl.cc:195
msgid "Failed to stat the cdrom"
msgstr "Failed to stat the cdrom"
@@ -2225,143 +2299,152 @@ msgstr "Could not get lock %s"
msgid "Waited for %s but it wasn't there"
msgstr "Waited for %s but it wasn't there"
-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:456
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Sub-process %s received a segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:457
+#: apt-pkg/contrib/fileutl.cc:458
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Sub-process %s received a segmentation fault."
+
+#: apt-pkg/contrib/fileutl.cc:462
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Sub-process %s returned an error code (%u)"
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:464
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Sub-process %s exited unexpectedly"
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:508
#, c-format
msgid "Could not open file %s"
msgstr "Could not open file %s"
-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:564
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "read, still have %lu to read but none left"
-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:594
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "write, still have %lu to write but couldn't"
-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:669
msgid "Problem closing the file"
msgstr "Problem closing the file"
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:675
msgid "Problem unlinking the file"
msgstr "Problem unlinking the file"
-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:686
msgid "Problem syncing the file"
msgstr "Problem syncing the file"
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
msgid "Empty package cache"
msgstr "Empty package cache"
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
msgid "The package cache file is corrupted"
msgstr "The package cache file is corrupted"
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
msgid "The package cache file is an incompatible version"
msgstr "The package cache file is an incompatible version"
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "This APT does not support the versioning system ‘%s’"
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
msgid "The package cache was built for a different architecture"
msgstr "The package cache was built for a different architecture"
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
msgid "Depends"
msgstr "Depends"
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
msgid "PreDepends"
msgstr "PreDepends"
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
msgid "Suggests"
msgstr "Suggests"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
msgid "Recommends"
msgstr "Recommends"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
msgid "Conflicts"
msgstr "Conflicts"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
msgid "Replaces"
msgstr "Replaces"
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
msgid "Obsoletes"
msgstr "Obsoletes"
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
msgid "Breaks"
msgstr "Breaks"
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
msgid "important"
msgstr "important"
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
msgid "required"
msgstr "required"
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
msgid "optional"
msgstr "optional"
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
msgid "Building dependency tree"
msgstr "Building dependency tree"
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
msgid "Candidate versions"
msgstr "Candidate versions"
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
msgid "Dependency generation"
msgstr "Dependency generation"
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
msgid "Reading state information"
msgstr "Reading state information"
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:223
#, c-format
msgid "Failed to open StateFile %s"
msgstr "Failed to open StateFile %s"
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:229
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Failed to write temporary StateFile %s"
@@ -2401,32 +2484,39 @@ msgstr "Malformed line %lu in source list %s (absolute dist)"
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Malformed line %lu in source list %s (dist parse)"
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:206
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
+#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Line %u too long in source list %s."
-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:243
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Malformed line %u in source list %s (type)"
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:247
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Type ‘%s’ is not known on line %u in source list %s"
-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
+#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Malformed line %u in source list %s (vendor id)"
-#: apt-pkg/packagemanager.cc:428
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, 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:437
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2437,6 +2527,13 @@ msgstr ""
"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."
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
@@ -2449,7 +2546,7 @@ msgid ""
msgstr ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1138
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2457,11 +2554,11 @@ msgstr ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
-#: apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1140
msgid "Unable to correct problems, you have held broken packages."
msgstr "Unable to correct problems, you have held broken packages."
-#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -2469,24 +2566,24 @@ msgstr ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
#, c-format
msgid "Lists directory %spartial is missing."
msgstr "Lists directory %spartial is missing."
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
#, c-format
msgid "Archive directory %spartial is missing."
msgstr "Archive directory %spartial is missing."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:826
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Retrieving file %li of %li (%s remaining)"
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:828
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Retrieving file %li of %li"
@@ -2501,22 +2598,22 @@ msgstr "The method driver %s could not be found."
msgid "Method %s did not start correctly"
msgstr "Method %s did not start correctly"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:132
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Packaging system ‘%s’ is not supported"
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:148
msgid "Unable to determine a suitable packaging system type"
msgstr "Unable to determine a suitable packaging system type"
-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:56
#, c-format
msgid "Unable to stat %s."
msgstr "Unable to stat %s."
@@ -2533,130 +2630,131 @@ msgstr "The package lists or status file could not be parsed or opened."
msgid "You may want to run apt-get update to correct these problems"
msgstr "You may want to run apt-get update to correct these problems"
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:347
+#, fuzzy, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Invalid record in the preferences file, no Package header"
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:369
#, c-format
msgid "Did not understand pin type %s"
msgstr "Did not understand pin type %s"
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:377
msgid "No priority (or zero) specified for pin"
msgstr "No priority (or zero) specified for pin"
-#: apt-pkg/pkgcachegen.cc:72
+#: apt-pkg/pkgcachegen.cc:74
msgid "Cache has an incompatible versioning system"
msgstr "Cache has an incompatible versioning system"
-#: apt-pkg/pkgcachegen.cc:115
+#: apt-pkg/pkgcachegen.cc:117
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Error occurred while processing %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:130
+#: apt-pkg/pkgcachegen.cc:132
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Error occurred while processing %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:164
+#: apt-pkg/pkgcachegen.cc:166
#, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Error occurred while processing %s (NewFileDesc1)"
-#: apt-pkg/pkgcachegen.cc:189
+#: apt-pkg/pkgcachegen.cc:191
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Error occurred while processing %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:193
+#: apt-pkg/pkgcachegen.cc:195
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Error occurred while processing %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:224
+#: apt-pkg/pkgcachegen.cc:226
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Error occurred while processing %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:228
+#: apt-pkg/pkgcachegen.cc:230
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Error occurred while processing %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:232
+#: apt-pkg/pkgcachegen.cc:234
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Error occurred while processing %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:258
#, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Error occurred while processing %s (NewFileDesc2)"
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:264
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Wow, you exceeded the number of package names this APT can handle.."
-#: apt-pkg/pkgcachegen.cc:265
+#: apt-pkg/pkgcachegen.cc:267
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Wow, you exceeded the number of versions this APT can handle."
-#: apt-pkg/pkgcachegen.cc:268
+#: apt-pkg/pkgcachegen.cc:270
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr "Wow, you exceeded the number of descriptions this APT can handle."
-#: apt-pkg/pkgcachegen.cc:271
+#: apt-pkg/pkgcachegen.cc:273
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Wow, you exceeded the number of dependencies this APT can handle."
-#: apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:301
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Error occurred while processing %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:312
+#: apt-pkg/pkgcachegen.cc:314
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Error occurred while processing %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:318
+#: apt-pkg/pkgcachegen.cc:320
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Package %s %s was not found while processing file dependencies"
-#: apt-pkg/pkgcachegen.cc:690
+#: apt-pkg/pkgcachegen.cc:693
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Couldn't stat source package list %s"
-#: apt-pkg/pkgcachegen.cc:775
+#: apt-pkg/pkgcachegen.cc:778
msgid "Collecting File Provides"
msgstr "Collecting File Provides"
-#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
+#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
msgid "IO Error saving source cache"
msgstr "IO Error saving source cache"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:128
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:401
+#: apt-pkg/acquire-item.cc:396
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
msgid "Hash Sum mismatch"
msgstr "Hash Sum mismatch"
-#: apt-pkg/acquire-item.cc:1118
+#: apt-pkg/acquire-item.cc:1114
msgid "There is no public key available for the following key IDs:\n"
msgstr "There is no public key available for the following key IDs:\n"
-#: apt-pkg/acquire-item.cc:1231
+#: apt-pkg/acquire-item.cc:1224
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2665,7 +2763,7 @@ msgstr ""
"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)"
-#: apt-pkg/acquire-item.cc:1290
+#: apt-pkg/acquire-item.cc:1283
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2674,23 +2772,38 @@ msgstr ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
-#: apt-pkg/acquire-item.cc:1331
+#: apt-pkg/acquire-item.cc:1324
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"The package index files are corrupted. No Filename: field for package %s."
-#: apt-pkg/acquire-item.cc:1418
+#: apt-pkg/acquire-item.cc:1411
msgid "Size mismatch"
msgstr "Size mismatch"
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Unable to parse package file %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Note, selecting %s instead of %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
#: apt-pkg/vendorlist.cc:66
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Vendor block %s contains no fingerprint"
-#: apt-pkg/cdrom.cc:529
+#: apt-pkg/cdrom.cc:525
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
@@ -2699,42 +2812,42 @@ msgstr ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
-#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
+#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
msgid "Identifying.. "
msgstr "Identifying.. "
-#: apt-pkg/cdrom.cc:563
+#: apt-pkg/cdrom.cc:559
#, c-format
msgid "Stored label: %s\n"
msgstr "Stored label: %s\n"
-#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
msgid "Unmounting CD-ROM...\n"
msgstr "Unmounting CD-ROM...\n"
-#: apt-pkg/cdrom.cc:590
+#: apt-pkg/cdrom.cc:585
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Using CD-ROM mount point %s\n"
-#: apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc:603
msgid "Unmounting CD-ROM\n"
msgstr "Unmounting CD-ROM\n"
-#: apt-pkg/cdrom.cc:612
+#: apt-pkg/cdrom.cc:607
msgid "Waiting for disc...\n"
msgstr "Waiting for disc...\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:620
+#: apt-pkg/cdrom.cc:615
msgid "Mounting CD-ROM...\n"
msgstr "Mounting CD-ROM...\n"
-#: apt-pkg/cdrom.cc:638
+#: apt-pkg/cdrom.cc:633
msgid "Scanning disc for index files..\n"
msgstr "Scanning disc for index files..\n"
-#: apt-pkg/cdrom.cc:678
+#: apt-pkg/cdrom.cc:673
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
@@ -2743,16 +2856,22 @@ msgstr ""
"Found %zu package indices, %zu source indices, %zu translation indices and %"
"zu signatures\n"
-#: apt-pkg/cdrom.cc:715
+#: apt-pkg/cdrom.cc:684
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:710
#, c-format
msgid "Found label '%s'\n"
msgstr "Found label: %s\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:739
msgid "That is not a valid name, try again.\n"
msgstr "That is not a valid name, try again.\n"
-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid ""
"This disc is called: \n"
@@ -2761,34 +2880,34 @@ msgstr ""
"This disc is called: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:764
+#: apt-pkg/cdrom.cc:759
msgid "Copying package lists..."
msgstr "Copying package lists..."
-#: apt-pkg/cdrom.cc:790
+#: apt-pkg/cdrom.cc:785
msgid "Writing new source list\n"
msgstr "Writing new source list\n"
-#: apt-pkg/cdrom.cc:799
+#: apt-pkg/cdrom.cc:794
msgid "Source list entries for this disc are:\n"
msgstr "Source list entries for this disc are:\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
#, c-format
msgid "Wrote %i records.\n"
msgstr "Wrote %i records.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Wrote %i records with %i missing files.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Wrote %i records with %i mismatched files\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
@@ -2798,12 +2917,12 @@ msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
msgid "Installing %s"
msgstr "Installing %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Configuring %s"
msgstr "Configuring %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Removing %s"
msgstr "Removing %s"
@@ -2813,65 +2932,107 @@ msgstr "Removing %s"
msgid "Running post-installation trigger %s"
msgstr "Running post-installation trigger %s"
-#: apt-pkg/deb/dpkgpm.cc:521
+#: apt-pkg/deb/dpkgpm.cc:557
#, c-format
msgid "Directory '%s' missing"
msgstr "Directory '%s' missing."
-#: apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:653
#, c-format
msgid "Preparing %s"
msgstr "Preparing %s"
-#: apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Unpacking %s"
msgstr "Unpacking %s"
-#: apt-pkg/deb/dpkgpm.cc:611
+#: apt-pkg/deb/dpkgpm.cc:659
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparing to configure %s"
-#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "Processing triggers for %s"
-
-#: apt-pkg/deb/dpkgpm.cc:617
+#: apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Installed %s"
msgstr "Installed %s"
-#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:666
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparing for removal of %s"
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removed %s"
msgstr "Removed %s"
-#: apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:673
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparing to completely remove %s"
-#: apt-pkg/deb/dpkgpm.cc:634
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Completely removed %s"
msgstr "Completely removed %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:878
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Could not patch file"
+#: apt-pkg/deb/dpkgpm.cc:907
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Unable to lock the list directory"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, 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
msgid "Connection closed prematurely"
msgstr "Connection closed prematurely"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Could not patch file"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Processing triggers for %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamic MMap ran out of room"