* merged with apt--mvo, regenerated the po files

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-116
   Merge with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-117
   Merge with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-118
   Russian translation update by Yuri Kozlov

 * bubulle@debian.org--2005/apt--main--0--patch-119
   Merge with Michael and add update-po as a pre-req for binary

 * bubulle@debian.org--2005/apt--main--0--patch-120
   Re-generate all PO Files

 * bubulle@debian.org--2005/apt--main--0--patch-121
   Complete French translation

 * bubulle@debian.org--2005/apt--main--0--patch-122
   Correct typography in French translation

 * bubulle@debian.org--2005/apt--main--0--patch-123
   Spelling fix for consistency in French translation

 * bubulle@debian.org--2005/apt--main--0--patch-124
   Merge with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-125
   Fixed localization of y/n questions in German translation

 * bubulle@debian.org--2005/apt--main--0--patch-126
   Swedish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-127
   Complete Tagalog translation / Add Changelog

 * bubulle@debian.org--2005/apt--main--0--patch-128
   Danish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-129
   Basque translation update

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-82
   * merged with bubulle 

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-83
   * cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-84
   * added armeb to archtable

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-85
   * merged with bubulle, changelog updates

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-86
   * merged the NMU from Franz Pop, fixed armeb problem (#333599)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-87
   * removed double armeb entry in buildlib/sizetable

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88
   * finalized changelog

1 files changed, 68 insertions, 52 deletions

diff --git a/po/nb.po b/po/nb.po
index a0383d334..651ec6dee 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2005-10-20 11:08+0200\n"
 "PO-Revision-Date: 2005-02-09 10:45+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -162,7 +162,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s for %s %s kompilert på %s %s\n"
@@ -242,6 +242,22 @@ msgstr ""
 "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 "Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n"
 
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Bytte av media: sett inn CD-en som er merket\n"
+"  «%s»\n"
+"i «%s» og trykk «Enter»\n"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 msgstr "Ikke parvise argumenter"
@@ -528,12 +544,12 @@ msgstr "Klarte ikke å få statusen på %s"
 msgid "Archive had no package field"
 msgstr "Arkivet har ikke noe pakkefelt"
 
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har ingen overstyringsoppføring\n"
 
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " %s-vedlikeholderen er %s, ikke %s\n"
@@ -637,7 +653,7 @@ msgstr "Klarte ikke å endre navnet på %s til %s"
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Kompileringsfeil i regulært uttrykk - %s"
@@ -800,11 +816,11 @@ msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Det oppsto en intern feil når avledningen ble lagt til"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke å låse nedlastingsmappa"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "Kan ikke lese kildlista."
@@ -833,7 +849,7 @@ msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n"
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "Etter utpakking vil %sB diskplass bli ledig.\n"
 
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikke nok ledig plass i %s"
@@ -871,7 +887,7 @@ msgstr "Avbryter."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsette [Y/n]? "
 
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikke å skaffe %s  %s\n"
@@ -880,7 +896,7 @@ msgstr "Klarte ikke å skaffe %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Noen av filene kunne ikke lastes ned"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
 msgid "Download complete and in download only mode"
 msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
 
@@ -978,15 +994,15 @@ msgstr "Versjon «%s» av «%s» ble ikke funnet"
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Utvalgt versjon %s (%s) for %s\n"
 
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1311
 msgid "The update command takes no arguments"
 msgstr "Oppdaterings-kommandoen tar ingen argumenter"
 
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
 msgid "Unable to lock the list directory"
 msgstr "Kan ikke låse listemappa"
 
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1382
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -994,25 +1010,25 @@ msgstr ""
 "Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
 "ble brukt isteden. "
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1401
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil - «AllUpgrade» ødela noe"
 
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Klarte ikke å finne pakken %s"
 
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1523
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n"
 
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1553
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
 
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1556
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1020,7 +1036,7 @@ msgstr ""
 "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
 "angi en løsning)."
 
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1568
 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"
@@ -1032,7 +1048,7 @@ msgstr ""
 "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
 "distribusjonen."
 
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1576
 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"
@@ -1042,122 +1058,122 @@ msgstr ""
 "at pakken helt enkelt ikke kan installeres, og du bør fylle ut en "
 "feilmelding."
 
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1581
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
 
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1584
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1610
 msgid "The following extra packages will be installed:"
 msgstr "Følgende ekstra pakker vil bli installert."
 
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1681
 msgid "Suggested packages:"
 msgstr "Foreslåtte pakker:"
 
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1682
 msgid "Recommended packages:"
 msgstr "Anbefalte pakker"
 
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1702
 msgid "Calculating upgrade... "
 msgstr "Beregner oppgradering... "
 
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Mislyktes"
 
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1710
 msgid "Done"
 msgstr "Utført"
 
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil - «AllUpgrade» ødela noe"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1883
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du må angi minst en pakke du vil ha kildekoden til"
 
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Klarer ikke å finne en kildekodepakke for %s"
 
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1957
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1962
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
 
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1965
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
 
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1971
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Skaffer kildekode %s\n"
 
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2002
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke å skaffe alle arkivene."
 
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2030
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
 
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2042
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2043
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2079
 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2095
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
 
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2123
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
 
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2143
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2195
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2247
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1166,32 +1182,32 @@ msgstr ""
 "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
 "versjoner av pakken %s som oppfyller versjonskravene"
 
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2282
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken %"
 "s er for ny"
 
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2307
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2321
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2325
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke å behandle forutsetningene for bygging"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2357
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2398
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"