Merge with Matt

[ntk/apt.git] / po / apt-all.pot

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 7d8e9d4..53be3fc 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-20 10:20+0100\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,23 +28,23 @@ msgid "Unable to locate package %s"
 msgstr ""
 
 #: cmdline/apt-cache.cc:232
-msgid "Total Package Names : "
+msgid "Total package names : "
 msgstr ""
 
 #: cmdline/apt-cache.cc:272
-msgid "  Normal Packages: "
+msgid "  Normal packages: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:273
-msgid "  Pure Virtual Packages: "
+msgid "  Pure virtual packages: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:274
-msgid "  Single Virtual Packages: "
+msgid "  Single virtual packages: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:275
-msgid "  Mixed Virtual Packages: "
+msgid "  Mixed virtual packages: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:276
@@ -52,35 +52,35 @@ msgid "  Missing: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:278
-msgid "Total Distinct Versions: "
+msgid "Total distinct versions: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:280
-msgid "Total Dependencies: "
+msgid "Total dependencies: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:283
-msgid "Total Ver/File relations: "
+msgid "Total ver/file relations: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:285
-msgid "Total Provides Mappings: "
+msgid "Total Provides mappings: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:297
-msgid "Total Globbed Strings: "
+msgid "Total globbed strings: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:311
-msgid "Total Dependency Version space: "
+msgid "Total dependency version space: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:316
-msgid "Total Slack space: "
+msgid "Total slack space: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:324
-msgid "Total Space Accounted for: "
+msgid "Total space accounted for: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
@@ -97,7 +97,7 @@ msgid "No packages found"
 msgstr ""
 
 #: cmdline/apt-cache.cc:1462
-msgid "Package Files:"
+msgid "Package files:"
 msgstr ""
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
@@ -111,7 +111,7 @@ msgstr ""
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1482
-msgid "Pinned Packages:"
+msgid "Pinned packages:"
 msgstr ""
 
 #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
@@ -133,12 +133,12 @@ msgid "  Candidate: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:1532
-msgid "  Package Pin: "
+msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541
-msgid "  Version Table:"
+msgid "  Version table:"
 msgstr ""
 
 #: cmdline/apt-cache.cc:1556
@@ -146,9 +146,9 @@ msgstr ""
 msgid "       %4i %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr ""
@@ -188,7 +188,7 @@ msgid ""
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -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"
 msgstr ""
 
@@ -209,7 +209,7 @@ msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc:98
@@ -228,7 +228,7 @@ msgid ""
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
@@ -248,7 +248,7 @@ msgstr ""
 #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
 #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
 #, c-format
-msgid "Error Processing directory %s"
+msgid "Error processing directory %s"
 msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:250
@@ -261,7 +261,7 @@ msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:397
 #, c-format
-msgid "Error Processing Contents %s"
+msgid "Error processing contents %s"
 msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:551
@@ -303,7 +303,7 @@ msgid ""
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitary configuration option"
+"  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:757
@@ -426,7 +426,7 @@ msgstr ""
 
 #: ftparchive/contents.cc:317
 #, c-format
-msgid "Internal Error, could not locate member %s"
+msgid "Internal error, could not locate member %s"
 msgstr ""
 
 #: ftparchive/contents.cc:353 ftparchive/contents.cc:384
@@ -460,7 +460,7 @@ msgstr ""
 
 #: ftparchive/multicompress.cc:75
 #, c-format
-msgid "Unknown Compresison Algorithm '%s'"
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
 #: ftparchive/multicompress.cc:105
@@ -481,12 +481,12 @@ msgid "Failed to fork"
 msgstr ""
 
 #: ftparchive/multicompress.cc:215
-msgid "Compress Child"
+msgid "Compress child"
 msgstr ""
 
 #: ftparchive/multicompress.cc:238
 #, c-format
-msgid "Internal Error, Failed to create %s"
+msgid "Internal error, failed to create %s"
 msgstr ""
 
 #: ftparchive/multicompress.cc:289
@@ -523,7 +523,7 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
@@ -593,7 +593,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:544
 msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
@@ -655,7 +655,7 @@ msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 
 #: cmdline/apt-get.cc:698
-msgid "Install these packages without verification? [y/N] "
+msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
 #: cmdline/apt-get.cc:700
@@ -667,14 +667,14 @@ msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
 #: cmdline/apt-get.cc:762
-msgid "Packages need to be removed but Remove is disabled."
+msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr ""
@@ -715,7 +715,7 @@ msgstr ""
 #: cmdline/apt-get.cc:865
 #, c-format
 msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
@@ -725,10 +725,10 @@ msgid "Abort."
 msgstr ""
 
 #: cmdline/apt-get.cc:886
-msgid "Do you want to continue? [Y/n] "
+msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
@@ -737,7 +737,7 @@ msgstr ""
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
 msgid "Download complete and in download only mode"
 msgstr ""
 
@@ -756,7 +756,7 @@ msgid "Unable to correct missing packages."
 msgstr ""
 
 #: cmdline/apt-get.cc:993
-msgid "Aborting Install."
+msgid "Aborting install."
 msgstr ""
 
 #: cmdline/apt-get.cc:1026
@@ -833,7 +833,7 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
 msgid "Unable to lock the list directory"
 msgstr ""
 
@@ -844,30 +844,30 @@ msgid ""
 msgstr ""
 
 #: cmdline/apt-get.cc:1372
-msgid "Internal Error, AllUpgrade broke stuff"
+msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
 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"
@@ -875,149 +875,149 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
 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:1543
+#: cmdline/apt-get.cc:1552
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1664
-msgid "Calculating Upgrade... "
+#: cmdline/apt-get.cc:1673
+msgid "Calculating upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
 msgid "Failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
 #, c-format
-msgid "Fetch Source %s\n"
+msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2013
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
 #, 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:2243
+#: cmdline/apt-get.cc:2252
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2277
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2318
-msgid "Supported Modules:"
+#: cmdline/apt-get.cc:2327
+msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1053,7 +1053,7 @@ msgid ""
 "  -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"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
@@ -1088,7 +1088,7 @@ msgstr ""
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""
-"Media Change: Please insert the disc labeled\n"
+"Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
@@ -1108,7 +1108,7 @@ msgid ""
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 #: dselect/install:32
@@ -1138,7 +1138,7 @@ msgid ""
 msgstr ""
 
 #: dselect/update:30
-msgid "Merging Available information"
+msgid "Merging available information"
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:117
@@ -1154,7 +1154,7 @@ msgid "Corrupted archive"
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:195
-msgid "Tar Checksum failed, archive corrupted"
+msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:298
@@ -1195,7 +1195,7 @@ msgid "Failed to allocate diversion"
 msgstr ""
 
 #: apt-inst/filelist.cc:468
-msgid "Internal Error in AddDiversion"
+msgid "Internal error in AddDiversion"
 msgstr ""
 
 #: apt-inst/filelist.cc:481
@@ -1215,7 +1215,7 @@ msgstr ""
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 #, c-format
-msgid "Failed write file %s"
+msgid "Failed to write file %s"
 msgstr ""
 
 #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
@@ -1304,7 +1304,7 @@ msgstr ""
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
 #: apt-pkg/pkgcachegen.cc:840
-msgid "Reading Package Lists"
+msgid "Reading package lists"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:180
@@ -1314,11 +1314,11 @@ msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
 #: apt-inst/deb/dpkgdb.cc:448
-msgid "Internal Error getting a Package Name"
+msgid "Internal error getting a package name"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:205
-msgid "Reading File Listing"
+msgid "Reading file listing"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:216
@@ -1335,7 +1335,7 @@ msgid "Failed reading the list file %sinfo/%s"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:266
-msgid "Internal Error getting a Node"
+msgid "Internal error getting a node"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:309
@@ -1354,20 +1354,20 @@ msgid "Invalid line in the diversion file: %s"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:362
-msgid "Internal Error adding a diversion"
+msgid "Internal error adding a diversion"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading File List"
+msgid "Reading file list"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
-msgid "Failed to find a Package: Header, offset %lu"
+msgid "Failed to find a Package: header, offset %lu"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:465
@@ -1396,7 +1396,7 @@ msgid "Couldn't change to %s"
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:138
-msgid "Internal Error, could not locate member"
+msgid "Internal error, could not locate member"
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:171
@@ -1404,7 +1404,7 @@ msgid "Failed to locate a valid control file"
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:256
-msgid "Unparsible control file"
+msgid "Unparsable control file"
 msgstr ""
 
 #: methods/cdrom.cc:113
@@ -1414,12 +1414,12 @@ msgstr ""
 
 #: methods/cdrom.cc:122
 msgid ""
-"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
-"cannot be used to add new CDs"
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
 msgstr ""
 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD"
+msgid "Wrong CD-ROM"
 msgstr ""
 
 #: methods/cdrom.cc:163
@@ -1427,7 +1427,7 @@ msgstr ""
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 
-#: methods/cdrom.cc:177 methods/file.cc:77
+#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
 msgid "File not found"
 msgstr ""
 
@@ -1458,7 +1458,7 @@ msgstr ""
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
-msgid "Server refused our connection and said: %s"
+msgid "The server refused the connection and said: %s"
 msgstr ""
 
 #: methods/ftp.cc:210
@@ -1495,7 +1495,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:452
+#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
 msgid "Read error"
 msgstr ""
 
@@ -1507,8 +1507,8 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write Error"
+#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492
+msgid "Write error"
 msgstr ""
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
@@ -1561,7 +1561,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1669,69 +1669,65 @@ msgid "Bad header line"
 msgstr ""
 
 #: methods/http.cc:517 methods/http.cc:524
-msgid "The http server sent an invalid reply header"
+msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
 #: methods/http.cc:553
-msgid "The http server sent an invalid Content-Length header"
+msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
 #: methods/http.cc:568
-msgid "The http server sent an invalid Content-Range header"
+msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
 #: methods/http.cc:570
-msgid "This http server has broken range support"
+msgid "This HTTP server has broken range support"
 msgstr ""
 
 #: methods/http.cc:594
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:737
+#: methods/http.cc:741
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:742
+#: methods/http.cc:746
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:765
+#: methods/http.cc:769
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:793
+#: methods/http.cc:797
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:818
+#: methods/http.cc:822
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:832
-msgid "Error reading from server Remote end closed connection"
+#: methods/http.cc:836
+msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:834
+#: methods/http.cc:838
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1065
-msgid "Bad header Data"
+#: methods/http.cc:1069
+msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1082
+#: methods/http.cc:1086
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1173
+#: methods/http.cc:1177
 msgid "Internal error"
 msgstr ""
 
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr ""
-
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr ""
@@ -1772,7 +1768,7 @@ msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:586
 #, c-format
-msgid "Syntax error %s:%u: Malformed Tag"
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:603
@@ -1895,54 +1891,50 @@ msgstr ""
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:359
 #, c-format
-msgid "Waited, for %s but it wasn't there"
+msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:374
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:473
+#: apt-pkg/contrib/fileutl.cc:474
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:491
-msgid "Write error"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:504
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
 msgid "Problem closing the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
 msgid "Problem syncing the file"
 msgstr ""
 
@@ -1960,7 +1952,7 @@ msgstr ""
 
 #: apt-pkg/pkgcache.cc:142
 #, c-format
-msgid "This APT does not support the Versioning System '%s'"
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
 #: apt-pkg/pkgcache.cc:147
@@ -2016,15 +2008,15 @@ msgid "extra"
 msgstr ""
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-msgid "Building Dependency Tree"
+msgid "Building dependency tree"
 msgstr ""
 
 #: apt-pkg/depcache.cc:61
-msgid "Candidate Versions"
+msgid "Candidate versions"
 msgstr ""
 
 #: apt-pkg/depcache.cc:90
-msgid "Dependency Generation"
+msgid "Dependency generation"
 msgstr ""
 
 #: apt-pkg/tagfile.cc:73
@@ -2054,7 +2046,7 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc:98
 #, c-format
-msgid "Malformed line %lu in source list %s (Absolute dist)"
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
 #: apt-pkg/sourcelist.cc:105
@@ -2181,37 +2173,37 @@ msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:207
@@ -2228,12 +2220,12 @@ msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:260
@@ -2259,31 +2251,31 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:893
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:707
+#: apt-pkg/acquire-item.cc:714
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:760
+#: apt-pkg/acquire-item.cc:767
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:796
+#: apt-pkg/acquire-item.cc:803
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:883
+#: apt-pkg/acquire-item.cc:890
 msgid "Size mismatch"
 msgstr ""
 
@@ -2291,3 +2283,93 @@ msgstr ""
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
+
+#: apt-pkg/cdrom.cc:504
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:538
+#, c-format
+msgid "Stored label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:558
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:576
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:580
+msgid "Waiting for disc...\n"
+msgstr ""
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:588
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:606
+msgid "Scanning disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:644
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:701
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:717
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:721
+msgid "Copying package lists..."
+msgstr ""
+
+#: apt-pkg/cdrom.cc:745
+msgid "Writing new source list\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:754
+msgid "Source list entries for this disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:788
+msgid "Unmounting CD-ROM..."
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""