summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 17:01:27 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 17:01:27 +0000
commit930f0f789f36550bff69c8a5d40370dab503ee73 (patch)
tree0f7cff4751110fece60c5ab90aa0d79fad4923f9 /po
parent1d3bfa86b2b754d6baf3e91405a730adf8f6e90d (diff)
downloadapt-930f0f789f36550bff69c8a5d40370dab503ee73.tar.gz
Corrections for 0.5.5
Author: piefel Date: 2003-05-14 08:48:58 GMT Corrections for 0.5.5
Diffstat (limited to 'po')
-rw-r--r--po/en_GB.po326
1 files changed, 170 insertions, 156 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index a866e577b..83ba1d3da 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.4\n"
-"POT-Creation-Date: 2003-02-09 21:51-0600\n"
+"POT-Creation-Date: 2003-04-27 01:12-0500\n"
"PO-Revision-Date: 2002-11-10 20:56+0100\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: en_GB <en@li.org>\n"
@@ -18,8 +18,9 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
-#: cmdline/apt-cache.cc:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:671
-#: cmdline/apt-cache.cc:1037 cmdline/apt-cache.cc:1183
+#: cmdline/apt-cache.cc:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:613
+#: cmdline/apt-cache.cc:769 cmdline/apt-cache.cc:987 cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1499
#, c-format
msgid "Unable to locate package %s"
msgstr ""
@@ -80,73 +81,73 @@ msgstr ""
msgid "Total Space Accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:871
+#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:1187
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:913
+#: cmdline/apt-cache.cc:1229
msgid "You must give exactly one pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1137
+#: cmdline/apt-cache.cc:1453
msgid "Package Files:"
msgstr ""
-#: cmdline/apt-cache.cc:1144 cmdline/apt-cache.cc:1230
+#: cmdline/apt-cache.cc:1460 cmdline/apt-cache.cc:1546
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-#: cmdline/apt-cache.cc:1145
+#: cmdline/apt-cache.cc:1461
#, c-format
msgid "%4i %s\n"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1157
+#: cmdline/apt-cache.cc:1473
msgid "Pinned Packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1169 cmdline/apt-cache.cc:1210
+#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1526
msgid "(not found)"
msgstr ""
#. Installed version
-#: cmdline/apt-cache.cc:1190
+#: cmdline/apt-cache.cc:1506
msgid " Installed: "
msgstr ""
-#: cmdline/apt-cache.cc:1192 cmdline/apt-cache.cc:1200
+#: cmdline/apt-cache.cc:1508 cmdline/apt-cache.cc:1516
msgid "(none)"
msgstr ""
#. Candidate Version
-#: cmdline/apt-cache.cc:1197
+#: cmdline/apt-cache.cc:1513
msgid " Candidate: "
msgstr ""
-#: cmdline/apt-cache.cc:1207
+#: cmdline/apt-cache.cc:1523
msgid " Package Pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1216
+#: cmdline/apt-cache.cc:1532
msgid " Version Table:"
msgstr ""
-#: cmdline/apt-cache.cc:1231
+#: cmdline/apt-cache.cc:1547
#, c-format
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1258 cmdline/apt-cdrom.cc:730 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1574 cmdline/apt-cdrom.cc:730 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:544
-#: cmdline/apt-get.cc:2049 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2165 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1262
+#: cmdline/apt-cache.cc:1578
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file1 ...]\n"
@@ -168,8 +169,10 @@ msgid ""
" search - Search the package list for a regex pattern\n"
" show - Show a readable record for the package\n"
" depends - Show raw dependency information for a package\n"
+" rdepends - Show reverse dependency information for a package\n"
" pkgnames - List the names of all packages\n"
" dotty - Generate package graphs for GraphVis\n"
+" xvcg - Generate package graphs for xvcg\n"
" policy - Show policy settings\n"
"\n"
"Options:\n"
@@ -541,179 +544,179 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:193
+#: cmdline/apt-get.cc:220
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: cmdline/apt-get.cc:283
+#: cmdline/apt-get.cc:310
#, c-format
msgid "but %s is installed"
msgstr ""
-#: cmdline/apt-get.cc:285
+#: cmdline/apt-get.cc:312
#, c-format
msgid "but %s is to be installed"
msgstr ""
-#: cmdline/apt-get.cc:292
+#: cmdline/apt-get.cc:319
msgid "but it is not installable"
msgstr ""
-#: cmdline/apt-get.cc:294
+#: cmdline/apt-get.cc:321
msgid "but it is a virtual package"
msgstr ""
-#: cmdline/apt-get.cc:297
+#: cmdline/apt-get.cc:324
msgid "but it is not installed"
msgstr ""
-#: cmdline/apt-get.cc:297
+#: cmdline/apt-get.cc:324
msgid "but it is not going to be installed"
msgstr ""
-#: cmdline/apt-get.cc:302
+#: cmdline/apt-get.cc:329
msgid " or"
msgstr ""
-#: cmdline/apt-get.cc:328
+#: cmdline/apt-get.cc:358
msgid "The following NEW packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:384
msgid "The following packages will be REMOVED:"
msgstr ""
-#: cmdline/apt-get.cc:371
+#: cmdline/apt-get.cc:406
msgid "The following packages have been kept back"
msgstr ""
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:427
msgid "The following packages will be upgraded"
msgstr ""
-#: cmdline/apt-get.cc:409
+#: cmdline/apt-get.cc:448
msgid "The following packages will be DOWNGRADED"
msgstr ""
-#: cmdline/apt-get.cc:426
+#: cmdline/apt-get.cc:468
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:477
+#: cmdline/apt-get.cc:521
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:484
+#: cmdline/apt-get.cc:529
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:514
+#: cmdline/apt-get.cc:559
#, c-format
msgid "%lu packages upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:518
+#: cmdline/apt-get.cc:563
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:520
+#: cmdline/apt-get.cc:565
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:522
+#: cmdline/apt-get.cc:567
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:526
+#: cmdline/apt-get.cc:571
#, c-format
msgid "%lu packages not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:631
msgid "Correcting dependencies..."
msgstr ""
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:634
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:592
+#: cmdline/apt-get.cc:637
msgid "Unable to correct dependencies"
msgstr ""
-#: cmdline/apt-get.cc:595
+#: cmdline/apt-get.cc:640
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:597
+#: cmdline/apt-get.cc:642
msgid " Done"
msgstr ""
-#: cmdline/apt-get.cc:601
+#: cmdline/apt-get.cc:646
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:604
+#: cmdline/apt-get.cc:649
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:702
msgid "Packages need to be removed but Remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:683 cmdline/apt-get.cc:1578 cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:728 cmdline/apt-get.cc:1694 cmdline/apt-get.cc:1727
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:693 cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1870
+#: cmdline/apt-get.cc:738 cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1986
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:713
+#: cmdline/apt-get.cc:758
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:716
+#: cmdline/apt-get.cc:761
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:721
+#: cmdline/apt-get.cc:766
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:724
+#: cmdline/apt-get.cc:769
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:741
+#: cmdline/apt-get.cc:786
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:795
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:756 cmdline/apt-get.cc:776
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:821
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:758
+#: cmdline/apt-get.cc:803
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:760
+#: cmdline/apt-get.cc:805
#, c-format
msgid ""
"You are about to do something potentially harmful\n"
@@ -724,74 +727,74 @@ msgstr ""
"To continue type in the phrase ‘%s’\n"
" ?] "
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:830
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:781
+#: cmdline/apt-get.cc:826
msgid "Do you want to continue? [Y/n] "
msgstr ""
-#: cmdline/apt-get.cc:850 cmdline/apt-get.cc:1219 cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:895 cmdline/apt-get.cc:1266 cmdline/apt-get.cc:1884
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:868
+#: cmdline/apt-get.cc:913
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:914 cmdline/apt-get.cc:1893
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:875
+#: cmdline/apt-get.cc:920
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:924
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:929
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:885
+#: cmdline/apt-get.cc:930
msgid "Aborting Install."
msgstr ""
-#: cmdline/apt-get.cc:918
+#: cmdline/apt-get.cc:963
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:928
+#: cmdline/apt-get.cc:973
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:991
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:957
+#: cmdline/apt-get.cc:1002
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:969
+#: cmdline/apt-get.cc:1014
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:1019
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1024
#, c-format
msgid ""
"Package %s has no available version, but exists in the database.\n"
@@ -800,78 +803,78 @@ msgid ""
"of sources.list\n"
msgstr ""
-#: cmdline/apt-get.cc:997
+#: cmdline/apt-get.cc:1044
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1000
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1020
+#: cmdline/apt-get.cc:1067
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1075
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1055
+#: cmdline/apt-get.cc:1102
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release ‘%s’ for ‘%s’ was not found"
-#: cmdline/apt-get.cc:1057
+#: cmdline/apt-get.cc:1104
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version ‘%s’ for ‘%s’ was not found"
-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1110
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1173
+#: cmdline/apt-get.cc:1220
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1233
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1238
+#: cmdline/apt-get.cc:1285
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1257
+#: cmdline/apt-get.cc:1304
msgid "Internal Error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1347 cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1394 cmdline/apt-get.cc:1430
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1360
+#: cmdline/apt-get.cc:1407
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:1370
+#: cmdline/apt-get.cc:1417
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1447
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:1403
+#: cmdline/apt-get.cc:1450
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -879,7 +882,7 @@ msgstr ""
"Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1415
+#: cmdline/apt-get.cc:1462
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"
@@ -887,118 +890,126 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1423
+#: cmdline/apt-get.cc:1470
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1428
+#: cmdline/apt-get.cc:1475
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1431
+#: cmdline/apt-get.cc:1478
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1504
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1473
+#: cmdline/apt-get.cc:1568
+msgid "Suggested packages:"
+msgstr ""
+
+#: cmdline/apt-get.cc:1569
+msgid "Recommended packages:"
+msgstr ""
+
+#: cmdline/apt-get.cc:1589
msgid "Calculating Upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1476 methods/ftp.cc:700 methods/connect.cc:99
+#: cmdline/apt-get.cc:1592 methods/ftp.cc:700 methods/connect.cc:99
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1481
+#: cmdline/apt-get.cc:1597
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1770
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1681 cmdline/apt-get.cc:1888
+#: cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2004
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1844
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1733
+#: cmdline/apt-get.cc:1849
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1736
+#: cmdline/apt-get.cc:1852
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1742
+#: cmdline/apt-get.cc:1858
#, c-format
msgid "Fetch Source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1773
+#: cmdline/apt-get.cc:1889
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:1801
+#: cmdline/apt-get.cc:1917
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:1929
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:1830
+#: cmdline/apt-get.cc:1946
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:1849
+#: cmdline/apt-get.cc:1965
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:1865
+#: cmdline/apt-get.cc:1981
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:2009
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1913
+#: cmdline/apt-get.cc:2029
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1948
+#: cmdline/apt-get.cc:2064
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1990
+#: cmdline/apt-get.cc:2106
#, 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:2017
+#: cmdline/apt-get.cc:2133
msgid ""
"Some broken packages were found while trying to process build-dependencies.\n"
"You might want to run `apt-get -f install' to correct these."
@@ -1006,15 +1017,15 @@ msgstr ""
"Some broken packages were found while trying to process build-dependencies.\n"
"You might want to run ‘apt-get -f install’ to correct these."
-#: cmdline/apt-get.cc:2022
+#: cmdline/apt-get.cc:2138
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2054
+#: cmdline/apt-get.cc:2170
msgid "Supported Modules:"
msgstr ""
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2211
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1048,6 +1059,7 @@ msgid ""
" -m Attempt to continue if archives are unlocatable\n"
" -u Show a list of upgraded packages as well\n"
" -b Build the source package after fetching it\n"
+" -V Show verbose version numbers\n"
" -c=? Read this configuration file\n"
" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
@@ -1083,11 +1095,13 @@ msgstr ""
#: cmdline/acqprogress.cc:271
#, c-format
msgid ""
-"Media Change: Please insert the disc labeled '%s' in the drive '%s' and "
-"press enter\n"
+"Media Change: Please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
msgstr ""
-"Media Change: Please insert the disc labeled ‘%s’ in the drive ‘%s’ and "
-"press enter\n"
+"Media Change: Please insert the disc labelled\n"
+" ‘%s’\n"
+"in the drive ‘%s’ and press enter\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
@@ -1107,6 +1121,36 @@ msgid ""
" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr ""
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
+#: dselect/install:104 dselect/update:45
+msgid "Press enter to continue."
+msgstr ""
+
+#: dselect/install:100
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr ""
+
+#: dselect/install:101
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr ""
+
+#: dselect/install:102
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr ""
+
+#: dselect/install:103
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+
+#: dselect/update:30
+msgid "Merging Available information"
+msgstr ""
+
#: apt-inst/contrib/extracttar.cc:115
msgid "Failed to create pipes"
msgstr ""
@@ -1376,36 +1420,6 @@ msgstr ""
msgid "Unparsible control file"
msgstr ""
-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr ""
-
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
-msgid "Press enter to continue."
-msgstr ""
-
-#: dselect/install:100
-msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr ""
-
-#: dselect/install:101
-msgid "packages that were installed. This may result in duplicate errors"
-msgstr ""
-
-#: dselect/install:102
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
-
-#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-
-#: dselect/update:30
-msgid "Merging Available information"
-msgstr ""
-
#: methods/cdrom.cc:113
#, c-format
msgid "Unable to read the cdrom database %s"
@@ -1655,7 +1669,7 @@ msgid "Read error from %s process"
msgstr ""
#: methods/http.cc:340
-msgid "Waiting for file"
+msgid "Waiting for headers"
msgstr ""
#: methods/http.cc:486
@@ -2008,12 +2022,12 @@ msgstr ""
msgid "Dependency Generation"
msgstr ""
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:81
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr ""
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:174
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr ""