* merged with matts tree

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-72
   Open 0.6.36

 * apt@packages.debian.org/apt--main--0--patch-73
   Merge apt--mvo--0

 * apt@packages.debian.org/apt--main--0--patch-74
   Update changelog

 * apt@packages.debian.org/apt--main--0--patch-75
   Merge bubulle@debian.org--2005/apt--main--0

 * apt@packages.debian.org/apt--main--0--patch-76
   Update changelog

 * bubulle@debian.org--2005/apt--main--0--patch-58
   Correct file permissions

 * bubulle@debian.org--2005/apt--main--0--patch-59
   Bring consistency to the use of capitals in programs messages

 * bubulle@debian.org--2005/apt--main--0--patch-60
   Correct the permission change on configure.in

 * bubulle@debian.org--2005/apt--main--0--patch-61
   Complete unfuzzification of PO files after the capitalization fixes

 * bubulle@debian.org--2005/apt--main--0--patch-62
   Final work of capitalization cleaning and translation unfuzzyfication

 * bubulle@debian.org--2005/apt--main--0--patch-63
   Correct the "arbitary" typo in apt-ftparchive

 * bubulle@debian.org--2005/apt--main--0--patch-64
   Italian translation update

 * bubulle@debian.org--2005/apt--main--0--patch-65
   Italian translation update

1 files changed, 74 insertions, 82 deletions

diff --git a/po/nn.po b/po/nn.po
index 231c162f7..8419e51c1 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-05 12:06+0100\n"
+"POT-Creation-Date: 2005-03-05 22:10+0100\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -31,23 +31,23 @@ msgid "Unable to locate package %s"
 msgstr "Finn ikkje pakken %s"
 
 #: cmdline/apt-cache.cc:232
-msgid "Total Package Names : "
+msgid "Total package names : "
 msgstr "Tal på pakkenamn: "
 
 #: cmdline/apt-cache.cc:272
-msgid "  Normal Packages: "
+msgid "  Normal packages: "
 msgstr "  Vanlege pakkar: "
 
 #: cmdline/apt-cache.cc:273
-msgid "  Pure Virtual Packages: "
+msgid "  Pure virtual packages: "
 msgstr "  Reine virtuelle pakkar: "
 
 #: cmdline/apt-cache.cc:274
-msgid "  Single Virtual Packages: "
+msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakkar: "
 
 #: cmdline/apt-cache.cc:275
-msgid "  Mixed Virtual Packages: "
+msgid "  Mixed virtual packages: "
 msgstr "  Samansette virtuelle pakkar: "
 
 #: cmdline/apt-cache.cc:276
@@ -55,35 +55,35 @@ msgid "  Missing: "
 msgstr "  Manglar: "
 
 #: cmdline/apt-cache.cc:278
-msgid "Total Distinct Versions: "
+msgid "Total distinct versions: "
 msgstr "Tal på einskildversjonar: "
 
 #: cmdline/apt-cache.cc:280
-msgid "Total Dependencies: "
+msgid "Total dependencies: "
 msgstr "Tal på krav: "
 
 #: cmdline/apt-cache.cc:283
-msgid "Total Ver/File relations: "
+msgid "Total ver/file relations: "
 msgstr "Tal på ver./fil-forhold: "
 
 #: cmdline/apt-cache.cc:285
-msgid "Total Provides Mappings: "
+msgid "Total Provides mappings: "
 msgstr "Tal på tilbyr-forhold: "
 
 #: cmdline/apt-cache.cc:297
-msgid "Total Globbed Strings: "
+msgid "Total globbed strings: "
 msgstr "Tal på strengar med jokerteikn: "
 
 #: cmdline/apt-cache.cc:311
-msgid "Total Dependency Version space: "
+msgid "Total dependency version space: "
 msgstr "Storleik på kravs- og versjonsrom: "
 
 #: cmdline/apt-cache.cc:316
-msgid "Total Slack space: "
+msgid "Total slack space: "
 msgstr "Slingringsmon: "
 
 #: cmdline/apt-cache.cc:324
-msgid "Total Space Accounted for: "
+msgid "Total space accounted for: "
 msgstr "Brukt plass i alt: "
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
@@ -100,7 +100,7 @@ msgid "No packages found"
 msgstr "Fann ingen pakkar"
 
 #: cmdline/apt-cache.cc:1462
-msgid "Package Files:"
+msgid "Package files:"
 msgstr "Pakkefiler:"
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
@@ -114,7 +114,7 @@ msgstr "%4i %s\n"
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1482
-msgid "Pinned Packages:"
+msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 
 #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
@@ -136,12 +136,12 @@ msgid "  Candidate: "
 msgstr "  Kandidat: "
 
 #: cmdline/apt-cache.cc:1532
-msgid "  Package Pin: "
+msgid "  Package pin: "
 msgstr "  Pakke spikra til: "
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541
-msgid "  Version Table:"
+msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
 #: cmdline/apt-cache.cc:1556
@@ -308,7 +308,7 @@ msgstr "Lista over pakkeutvidingar er for lang"
 #: 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 "Feil ved lesing av katalogen %s"
 
 #: ftparchive/apt-ftparchive.cc:250
@@ -321,7 +321,7 @@ msgstr "Feil ved skriving av topptekst til innhaldsfila"
 
 #: ftparchive/apt-ftparchive.cc:397
 #, c-format
-msgid "Error Processing Contents %s"
+msgid "Error processing contents %s"
 msgstr "Feil ved lesing av %s"
 
 #: ftparchive/apt-ftparchive.cc:551
@@ -523,7 +523,7 @@ msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
 
 #: ftparchive/contents.cc:317
 #, c-format
-msgid "Internal Error, could not locate member %s"
+msgid "Internal error, could not locate member %s"
 msgstr "Intern feil, fann ikkje medlemmen %s"
 
 #: ftparchive/contents.cc:353 ftparchive/contents.cc:384
@@ -557,7 +557,7 @@ msgstr "Klarte ikkje lesa overstyringsfila %s"
 
 #: ftparchive/multicompress.cc:75
 #, c-format
-msgid "Unknown Compresison Algorithm '%s'"
+msgid "Unknown compression algorithm '%s'"
 msgstr "Ukjend komprimeringsalgoritme %s"
 
 #: ftparchive/multicompress.cc:105
@@ -578,12 +578,12 @@ msgid "Failed to fork"
 msgstr "Klarte ikkje gafla"
 
 #: ftparchive/multicompress.cc:215
-msgid "Compress Child"
+msgid "Compress child"
 msgstr "Komprimer barn"
 
 #: ftparchive/multicompress.cc:238
 #, c-format
-msgid "Internal Error, Failed to create %s"
+msgid "Internal error, failed to create %s"
 msgstr "Intern feil, klarte ikkje oppretta %s"
 
 #: ftparchive/multicompress.cc:289
@@ -755,8 +755,8 @@ msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane."
 
 #: cmdline/apt-get.cc:698
-msgid "Install these packages without verification? [y/N] "
-msgstr "Installer desse pakkane utan verifikasjon? [j/N] "
+msgid "Install these packages without verification [y/N]? "
+msgstr "Installer desse pakkane utan verifikasjon [j/N]? "
 
 #: cmdline/apt-get.cc:700
 msgid "Some packages could not be authenticated"
@@ -767,7 +767,7 @@ msgid "There are problems and -y was used without --force-yes"
 msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»"
 
 #: 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 "Nokre pakkar må fjernast, men fjerning er slått av."
 
 #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
@@ -829,8 +829,8 @@ msgid "Abort."
 msgstr "Avbryt."
 
 #: cmdline/apt-get.cc:886
-msgid "Do you want to continue? [Y/n] "
-msgstr "Vil du halda fram? [J/n] "
+msgid "Do you want to continue [Y/n]? "
+msgstr "Vil du halda fram [J/n]? "
 
 #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
 #, c-format
@@ -862,7 +862,7 @@ msgid "Unable to correct missing packages."
 msgstr "Klarte ikkje retta opp manglande pakkar."
 
 #: cmdline/apt-get.cc:993
-msgid "Aborting Install."
+msgid "Aborting install."
 msgstr "Avbryt installasjon."
 
 #: cmdline/apt-get.cc:1026
@@ -957,7 +957,7 @@ msgstr ""
 "filer er brukte i staden."
 
 #: cmdline/apt-get.cc:1372
-msgid "Internal Error, AllUpgrade broke stuff"
+msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
 #: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
@@ -1026,7 +1026,7 @@ msgid "Recommended packages:"
 msgstr "Tilrådde pakkar"
 
 #: cmdline/apt-get.cc:1664
-msgid "Calculating Upgrade... "
+msgid "Calculating upgrade... "
 msgstr "Reknar ut oppgradering ... "
 
 #: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
@@ -1063,7 +1063,7 @@ msgstr "Må henta %sB med kjeldekodearkiv.\n"
 
 #: cmdline/apt-get.cc:1933
 #, c-format
-msgid "Fetch Source %s\n"
+msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
 #: cmdline/apt-get.cc:1964
@@ -1140,7 +1140,7 @@ msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
 #: cmdline/apt-get.cc:2318
-msgid "Supported Modules:"
+msgid "Supported modules:"
 msgstr "Støtta modular:"
 
 #: cmdline/apt-get.cc:2359
@@ -1253,7 +1253,7 @@ msgstr " [Arbeider]"
 #: 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 ""
@@ -1316,7 +1316,7 @@ msgid ""
 msgstr "er viktige. Rett opp dei feila og [i]nstaller på nytt."
 
 #: dselect/update:30
-msgid "Merging Available information"
+msgid "Merging available information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
 #: apt-inst/contrib/extracttar.cc:117
@@ -1332,7 +1332,7 @@ msgid "Corrupted archive"
 msgstr "Øydelagt arkiv"
 
 #: apt-inst/contrib/extracttar.cc:195
-msgid "Tar Checksum failed, archive corrupted"
+msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-sjekksummen mislukkast, arkivet er øydelagt"
 
 #: apt-inst/contrib/extracttar.cc:298
@@ -1373,7 +1373,7 @@ msgid "Failed to allocate diversion"
 msgstr "Klarte ikkje tildela avleiing"
 
 #: apt-inst/filelist.cc:468
-msgid "Internal Error in AddDiversion"
+msgid "Internal error in AddDiversion"
 msgstr "Intern feil i AddDiversion"
 
 #: apt-inst/filelist.cc:481
@@ -1483,7 +1483,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 "Les pakkelister"
 
 #: apt-inst/deb/dpkgdb.cc:180
@@ -1493,11 +1493,11 @@ msgstr "Klarte ikkje byta til adminkatalogen %sinfo"
 
 #: 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 "Intern feil ved henting av pakkenamn"
 
 #: apt-inst/deb/dpkgdb.cc:205
-msgid "Reading File Listing"
+msgid "Reading file listing"
 msgstr "Les filliste"
 
 #: apt-inst/deb/dpkgdb.cc:216
@@ -1517,7 +1517,7 @@ msgid "Failed reading the list file %sinfo/%s"
 msgstr "Klarte ikkje lesa listefila %sinfo/%s"
 
 #: apt-inst/deb/dpkgdb.cc:266
-msgid "Internal Error getting a Node"
+msgid "Internal error getting a node"
 msgstr "Intern feil ved henting av node"
 
 #: apt-inst/deb/dpkgdb.cc:309
@@ -1536,7 +1536,7 @@ msgid "Invalid line in the diversion file: %s"
 msgstr "Ugyldig linje i avleiingsfila: %s"
 
 #: apt-inst/deb/dpkgdb.cc:362
-msgid "Internal Error adding a diversion"
+msgid "Internal error adding a diversion"
 msgstr "Intern feil ved tilleggjing av avleiing"
 
 #: apt-inst/deb/dpkgdb.cc:383
@@ -1544,12 +1544,12 @@ msgid "The pkg cache must be initialize first"
 msgstr "Pakkelageret må først klargjerast"
 
 #: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading File List"
+msgid "Reading file list"
 msgstr "Les filliste"
 
 #: 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 "Fann ikkje «Package:»-linja, offset %lu"
 
 #: apt-inst/deb/dpkgdb.cc:465
@@ -1579,7 +1579,7 @@ msgid "Couldn't change to %s"
 msgstr "Klarte ikkje byta til %s"
 
 #: apt-inst/deb/debfile.cc:138
-msgid "Internal Error, could not locate member"
+msgid "Internal error, could not locate member"
 msgstr "Intern feil, fann ikkje medlem"
 
 #: apt-inst/deb/debfile.cc:171
@@ -1587,7 +1587,7 @@ msgid "Failed to locate a valid control file"
 msgstr "Fann ikkje noka gyldig kontrollfil"
 
 #: apt-inst/deb/debfile.cc:256
-msgid "Unparsible control file"
+msgid "Unparsable control file"
 msgstr "Kontrollfila kan ikkje tolkast"
 
 #: methods/cdrom.cc:113
@@ -1597,14 +1597,14 @@ msgstr "Klarte ikkje lesa CD-ROM-databasen %s"
 
 #: 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 ""
 "Bruk «apt-cdrom» for å gjera denne CD-plata tilgjengeleg for APT. Du kan "
 "ikkje bruka «apt-get update» til å leggja til nye CD-plater."
 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD"
+msgid "Wrong CD-ROM"
 msgstr "Feil CD-plate"
 
 #: methods/cdrom.cc:163
@@ -1613,9 +1613,9 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "Klarte ikkje montera CD-plata i %s. Det kan henda plata framleis er i bruk."
 
-#: 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 "Fann ikkje fil"
+msgstr "Fann ikkje fila"
 
 #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142
 msgid "Failed to stat"
@@ -1644,7 +1644,7 @@ msgstr "Klarte ikkje avgjera det lokale namnet"
 
 #: 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 "Tenaren nekta oss å kopla til, og sa: %s"
 
 #: methods/ftp.cc:210
@@ -1695,8 +1695,8 @@ msgstr "Eit svar flaumde over bufferen."
 msgid "Protocol corruption"
 msgstr "Protokolløydeleggjing"
 
-#: 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 "Skrivefeil"
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
@@ -1857,19 +1857,19 @@ msgid "Bad header line"
 msgstr "Øydelagd hovudlinje"
 
 #: 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 "HTTP-tenaren sende eit ugyldig svarhovud"
 
 #: 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 "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud"
 
 #: 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 "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud"
 
 #: methods/http.cc:570
-msgid "This http server has broken range support"
+msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tenaren har øydelagd støtte for område"
 
 #: methods/http.cc:594
@@ -1897,7 +1897,7 @@ msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
 #: methods/http.cc:832
-msgid "Error reading from server Remote end closed connection"
+msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
 
 #: methods/http.cc:834
@@ -1905,7 +1905,7 @@ msgid "Error reading from server"
 msgstr "Feil ved lesing frå tenaren"
 
 #: methods/http.cc:1065
-msgid "Bad header Data"
+msgid "Bad header data"
 msgstr "Øydelagde hovuddata"
 
 #: methods/http.cc:1082
@@ -1916,10 +1916,6 @@ msgstr "Sambandet mislukkast"
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Fann ikkje fila"
-
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Sambandet vart uventa stengd"
@@ -1960,7 +1956,7 @@ msgstr "Syntaksfeil %s:%u: Blokka startar utan namn."
 
 #: apt-pkg/contrib/configuration.cc:586
 #, c-format
-msgid "Syntax error %s:%u: Malformed Tag"
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaksfeil %s:%u: Misforma tagg"
 
 #: apt-pkg/contrib/configuration.cc:603
@@ -2085,7 +2081,7 @@ msgstr "Klarte ikkje låsa %s"
 
 #: 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 "Venta på %s, men den fanst ikkje"
 
 #: apt-pkg/contrib/fileutl.cc:369
@@ -2113,10 +2109,6 @@ msgstr "Klarte ikkje opna fila %s"
 msgid "read, still have %lu to read but none left"
 msgstr "lese, har framleis %lu att å lesa, men ingen att"
 
-#: apt-pkg/contrib/fileutl.cc:492
-msgid "Write error"
-msgstr "Skrivefeil"
-
 #: apt-pkg/contrib/fileutl.cc:504
 #, c-format
 msgid "write, still have %lu to write but couldn't"
@@ -2148,7 +2140,7 @@ msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
 
 #: 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 støttar ikkje versjonssystemet «%s»"
 
 #: apt-pkg/pkgcache.cc:147
@@ -2204,15 +2196,15 @@ msgid "extra"
 msgstr "tillegg"
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-msgid "Building Dependency Tree"
+msgid "Building dependency tree"
 msgstr "Byggjer kravtre"
 
 #: apt-pkg/depcache.cc:61
-msgid "Candidate Versions"
+msgid "Candidate versions"
 msgstr "Kandidatversjonar"
 
 #: apt-pkg/depcache.cc:90
-msgid "Dependency Generation"
+msgid "Dependency generation"
 msgstr "Genererer kravforhold"
 
 #: apt-pkg/tagfile.cc:73
@@ -2242,7 +2234,7 @@ msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
 
 #: 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 "Misforma linje %lu i kjeldelista %s (absolutt dist)"
 
 #: apt-pkg/sourcelist.cc:105
@@ -2507,7 +2499,7 @@ msgstr "Identifiserer ... "
 
 #: apt-pkg/cdrom.cc:538
 #, c-format
-msgid "Stored Label: %s \n"
+msgid "Stored label: %s \n"
 msgstr "Lagra etikett: %s \n"
 
 #: apt-pkg/cdrom.cc:558
@@ -2529,7 +2521,7 @@ msgid "Mounting CD-ROM...\n"
 msgstr "Monterer CD-ROM ...\n"
 
 #: apt-pkg/cdrom.cc:606
-msgid "Scanning Disc for index files..\n"
+msgid "Scanning disc for index files..\n"
 msgstr "Leitar etter indeksfiler på disken ...\n"
 
 #: apt-pkg/cdrom.cc:644
@@ -2544,7 +2536,7 @@ msgstr "Det er ikkje eit gyldig namn, prøv igjen.\n"
 #: apt-pkg/cdrom.cc:717
 #, c-format
 msgid ""
-"This Disc is called: \n"
+"This disc is called: \n"
 "'%s'\n"
 msgstr ""
 "Disken vert kalla: \n"
@@ -2559,7 +2551,7 @@ msgid "Writing new source list\n"
 msgstr "Skriv ny kjeldeliste\n"
 
 #: apt-pkg/cdrom.cc:754
-msgid "Source List entries for this Disc are:\n"
+msgid "Source list entries for this disc are:\n"
 msgstr "Kjeldelisteoppføringar for denne disken er:\n"
 
 #: apt-pkg/cdrom.cc:788
@@ -2578,12 +2570,12 @@ msgstr "Skreiv %i postar med %i manglande filer.\n"
 
 #: apt-pkg/indexcopy.cc:266
 #, c-format
-msgid "Wrote %i records with %i mismachted files\n"
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
 
 #: apt-pkg/indexcopy.cc:269
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
 
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"