merge from the donkult branch

diff --cc apt-pkg/contrib/mmap.cc
Simple merge

diff --cc po/apt-all.pot
index b8305c25ce7b85f8f446c25a96b26d77c9a69a16,199b7f843aaee9b2044d637af469f58a019c459a..c2cd5e9d7bd303f9db63a120be2343556465b1c9
--- 1/po/apt-all.pot
--- 2/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-07-21 15:49+0200\n"
 -"POT-Creation-Date: 2009-07-01 10:24+0200\n"
++"POT-Creation-Date: 2009-07-21 18:36+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -20,9 -20,9 +20,9 @@@
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
 -#: cmdline/apt-cache.cc:793 cmdline/apt-cache.cc:1013
 -#: cmdline/apt-cache.cc:1415 cmdline/apt-cache.cc:1566
 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
- #: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
- #: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
++#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1017
++#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1571
  #, c-format
  msgid "Unable to locate package %s"
  msgstr ""
@@@ -91,72 -91,77 +91,72 @@@ msgstr "
  msgid "Total space accounted for: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
 -#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1213
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1217
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr ""
  
- #: cmdline/apt-cache.cc:1297
 -#: cmdline/apt-cache.cc:1289
++#: cmdline/apt-cache.cc:1293
  msgid "You must give exactly one pattern"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1451
 -#: cmdline/apt-cache.cc:1443
++#: cmdline/apt-cache.cc:1447
  msgid "No packages found"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1528
 -#: cmdline/apt-cache.cc:1520
++#: cmdline/apt-cache.cc:1524
  msgid "Package files:"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 -#: cmdline/apt-cache.cc:1527 cmdline/apt-cache.cc:1613
++#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1618
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1528
 -#, c-format
 -msgid "%4i %s\n"
 -msgstr ""
 -
  #. Show any packages have explicit pins
- #: cmdline/apt-cache.cc:1549
 -#: cmdline/apt-cache.cc:1540
++#: cmdline/apt-cache.cc:1545
  msgid "Pinned packages:"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 -#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1593
++#: cmdline/apt-cache.cc:1557 cmdline/apt-cache.cc:1598
  msgid "(not found)"
  msgstr ""
  
  #. Installed version
- #: cmdline/apt-cache.cc:1582
 -#: cmdline/apt-cache.cc:1573
++#: cmdline/apt-cache.cc:1578
  msgid "  Installed: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
 -#: cmdline/apt-cache.cc:1575 cmdline/apt-cache.cc:1583
++#: cmdline/apt-cache.cc:1580 cmdline/apt-cache.cc:1588
  msgid "(none)"
  msgstr ""
  
  #. Candidate Version
- #: cmdline/apt-cache.cc:1589
 -#: cmdline/apt-cache.cc:1580
++#: cmdline/apt-cache.cc:1585
  msgid "  Candidate: "
  msgstr ""
  
- #: cmdline/apt-cache.cc:1599
 -#: cmdline/apt-cache.cc:1590
++#: cmdline/apt-cache.cc:1595
  msgid "  Package pin: "
  msgstr ""
  
  #. Show the priority tables
- #: cmdline/apt-cache.cc:1608
 -#: cmdline/apt-cache.cc:1599
++#: cmdline/apt-cache.cc:1604
  msgid "  Version table:"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1623
 -#: cmdline/apt-cache.cc:1614
++#: cmdline/apt-cache.cc:1619
  #, c-format
  msgid "       %4i %s\n"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 -#: cmdline/apt-cache.cc:1709 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
- #: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
+ #: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s compiled on %s %s\n"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1726
 -#: cmdline/apt-cache.cc:1716
++#: cmdline/apt-cache.cc:1721
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -246,7 -251,7 +246,7 @@@ msgid "
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
- #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
 -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:826
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
  #, c-format
  msgid "Unable to write to %s"
  msgstr ""
@@@ -712,8 -717,8 +712,8 @@@ msgstr "
  msgid "Unable to lock the download directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
+ #: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2328
 -#: apt-pkg/cachefile.cc:64
 +#: apt-pkg/cachefile.cc:65
  msgid "The list of sources could not be read."
  msgstr ""
  
@@@ -775,7 -780,7 +775,7 @@@ msgstr "
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
 -#: cmdline/apt-get.cc:986 cmdline/apt-get.cc:2225 apt-pkg/algorithms.cc:1382
++#: cmdline/apt-get.cc:986 cmdline/apt-get.cc:2225 apt-pkg/algorithms.cc:1389
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
@@@ -1158,7 -1163,7 +1158,7 @@@ msgid "
  "                       This APT has Super Cow Powers.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2799
 -#: cmdline/apt-get.cc:2796
++#: cmdline/apt-get.cc:2797
  msgid ""
  "NOTE: This is only a simulation!\n"
  "      apt-get needs root privileges for real execution.\n"
@@@ -1382,8 -1387,8 +1382,10 @@@ msgid "File %s/%s overwrites the one i
  msgstr ""
  
  #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
--#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
- #: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:33
++#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:163
++#: apt-pkg/sourcelist.cc:169 apt-pkg/sourcelist.cc:324 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 ""
@@@ -1413,9 -1418,9 +1415,9 @@@ msgid "The info and temp directories ne
  msgstr ""
  
  #. 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:759
 -#: apt-pkg/pkgcachegen.cc:828 apt-pkg/pkgcachegen.cc:833
 -#: apt-pkg/pkgcachegen.cc:956
++#: 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 ""
  
@@@ -1515,31 -1520,31 +1517,31 @@@ msgstr "
  msgid "Unparsable control file"
  msgstr ""
  
--#: methods/cdrom.cc:114
++#: methods/cdrom.cc:200
  #, c-format
  msgid "Unable to read the cdrom database %s"
  msgstr ""
  
--#: 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"
  msgstr ""
  
--#: methods/cdrom.cc:131
++#: methods/cdrom.cc:219
  msgid "Wrong CD-ROM"
  msgstr ""
  
--#: 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 ""
  
--#: methods/cdrom.cc:171
++#: methods/cdrom.cc:250
  msgid "Disk not found."
  msgstr ""
  
--#: 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 ""
  
@@@ -1866,7 -1871,7 +1868,7 @@@ msgstr "
  msgid "Error reading from server"
  msgstr ""
  
--#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
++#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:215
  msgid "Failed to truncate file"
  msgstr ""
  
@@@ -1882,16 -1887,16 +1884,16 @@@ msgstr "
  msgid "Internal error"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:80
++#: apt-pkg/contrib/mmap.cc:76
  msgid "Can't mmap an empty file"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:85
++#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
  #, c-format
  msgid "Couldn't make mmap of %lu bytes"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
++#: apt-pkg/contrib/mmap.cc:234
  #, c-format
  msgid ""
  "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@@ -2038,13 -2043,13 +2040,13 @@@ msgstr "
  msgid "Unable to stat the mount point %s"
  msgstr ""
  
--#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
- #: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
 -#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:39
++#: 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 ""
  
--#: apt-pkg/contrib/cdromutl.cc:188
++#: apt-pkg/contrib/cdromutl.cc:195
  msgid "Failed to stat the cdrom"
  msgstr ""
  
@@@ -2258,27 -2258,27 +2260,27 @@@ msgstr "
  msgid "Malformed line %lu in source list %s (dist parse)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:199
++#: apt-pkg/sourcelist.cc:203
  #, c-format
  msgid "Opening %s"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
 -#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:445
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:236
++#: apt-pkg/sourcelist.cc:240
  #, c-format
  msgid "Malformed line %u in source list %s (type)"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:240
++#: apt-pkg/sourcelist.cc:244
  #, c-format
  msgid "Type '%s' is not known on line %u in source list %s"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
  #, c-format
  msgid "Malformed line %u in source list %s (vendor id)"
  msgstr ""
@@@ -2302,17 -2302,17 +2304,17 @@@ msgid "
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1154
 -#: apt-pkg/algorithms.cc:1131
++#: apt-pkg/algorithms.cc:1138
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1156
 -#: apt-pkg/algorithms.cc:1133
++#: apt-pkg/algorithms.cc:1140
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
 -#: apt-pkg/algorithms.cc:1408 apt-pkg/algorithms.cc:1410
++#: 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."
@@@ -2330,12 -2330,12 +2332,12 @@@ msgstr "
  
  #. only show the ETA if it makes sense
  #. two days
- #: apt-pkg/acquire.cc:829
 -#: apt-pkg/acquire.cc:825
++#: apt-pkg/acquire.cc:826
  #, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
  msgstr ""
  
- #: apt-pkg/acquire.cc:831
 -#: apt-pkg/acquire.cc:827
++#: apt-pkg/acquire.cc:828
  #, c-format
  msgid "Retrieving file %li of %li"
  msgstr ""
@@@ -2355,12 -2355,12 +2357,12 @@@ msgstr "
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
- #: apt-pkg/init.cc:125
 -#: apt-pkg/init.cc:124
++#: apt-pkg/init.cc:132
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
- #: apt-pkg/init.cc:141
 -#: apt-pkg/init.cc:140
++#: apt-pkg/init.cc:148
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
@@@ -2381,110 -2381,109 +2383,110 @@@ msgstr "
  msgid "You may want to run apt-get update to correct these problems"
  msgstr ""
  
- #: apt-pkg/policy.cc:329
 -#: apt-pkg/policy.cc:289
 -msgid "Invalid record in the preferences file, no Package header"
++#: apt-pkg/policy.cc:347
 +#, c-format
 +msgid "Invalid record in the preferences file %s, no Package header"
  msgstr ""
  
- #: apt-pkg/policy.cc:351
 -#: apt-pkg/policy.cc:311
++#: apt-pkg/policy.cc:369
  #, c-format
  msgid "Did not understand pin type %s"
  msgstr ""
  
- #: apt-pkg/policy.cc:359
 -#: apt-pkg/policy.cc:319
++#: apt-pkg/policy.cc:377
  msgid "No priority (or zero) specified for pin"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:72
++#: apt-pkg/pkgcachegen.cc:74
  msgid "Cache has an incompatible versioning system"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:115
++#: apt-pkg/pkgcachegen.cc:117
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:130
++#: apt-pkg/pkgcachegen.cc:132
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:164
++#: apt-pkg/pkgcachegen.cc:166
  #, c-format
  msgid "Error occurred while processing %s (NewFileDesc1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:189
++#: apt-pkg/pkgcachegen.cc:191
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:193
++#: apt-pkg/pkgcachegen.cc:195
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:224
++#: apt-pkg/pkgcachegen.cc:226
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:228
++#: apt-pkg/pkgcachegen.cc:230
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:232
++#: apt-pkg/pkgcachegen.cc:234
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:256
++#: apt-pkg/pkgcachegen.cc:258
  #, c-format
  msgid "Error occurred while processing %s (NewFileDesc2)"
  msgstr ""
  
--#: 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 ""
  
--#: apt-pkg/pkgcachegen.cc:265
++#: apt-pkg/pkgcachegen.cc:267
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:268
++#: apt-pkg/pkgcachegen.cc:270
  msgid "Wow, you exceeded the number of descriptions this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:271
++#: apt-pkg/pkgcachegen.cc:273
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:299
++#: apt-pkg/pkgcachegen.cc:301
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:312
++#: apt-pkg/pkgcachegen.cc:314
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:318
++#: apt-pkg/pkgcachegen.cc:320
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:690
 -#: apt-pkg/pkgcachegen.cc:689
++#: apt-pkg/pkgcachegen.cc:693
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:775
 -#: apt-pkg/pkgcachegen.cc:774
++#: apt-pkg/pkgcachegen.cc:778
  msgid "Collecting File Provides"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
 -#: apt-pkg/pkgcachegen.cc:901 apt-pkg/pkgcachegen.cc:908
++#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
  msgid "IO Error saving source cache"
  msgstr ""
  
@@@ -2598,13 -2582,7 +2600,13 @@@ msgid "
  "zu signatures\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:689
++#: 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:715
+ #: apt-pkg/cdrom.cc:710
  #, c-format
  msgid "Found label '%s'\n"
  msgstr ""
@@@ -2632,22 -2610,22 +2634,22 @@@ msgstr "
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
 -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:822
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
 -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:824
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:834
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
 -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:827
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:837
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
 -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:830
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:840
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""