* apt-ftparchive might write corrupt Release files (LP: #46439)

* Apply --important option to apt-cache depends (LP: #16947) 
* apt-pkg/acquire-item.cc:
  - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz'
    available. (Closes: #409284)
* apt-pkg/algorithm.cc:
  - Strip username and password from source URL in error message.
    (Closes: #425150)
* Fix typos:
  - apt-pkg/depcache.cc
* Fix compilation warnings:
  - apt-pkg/acquire.cc
  - apt-pkg/versionmatch.cc
* Compilation fixes and portability improvement for compiling APT against non-GNU libc
  (thanks to Martin Koeppe, closes: #392063):
  - buildlib/apti18n.h.in:
    + textdomain() and bindtextdomain() must not be visible when --disable-nls
  - buildlib/inttypes.h.in: undefine standard int*_t types
  - Append INTLLIBS to SLIBS:
    + cmdline/makefile
    + ftparchive/makefile
    + methods/makefile
* doc/apt.conf.5.xml:
  - clarify whether configuration items of apt.conf are case-sensitive
    (thanks to Vincent McIntyre, closes: #345901)
* doc/apt-cache.8.xml:
  - search command uses POSIX regex, and searches for virtual packages too
    (closes: #277536)
* doc/offline.sgml: clarify remote and target hosts
  (thanks to Nikolaus Schulz, closes: #175940)
* Fix several typos in docs, translations and debian/changelog
  (thanks to timeless, Nicolas Bonifas and Josh Triplett,
  closes: #368665, #298821, #411532, #431636, #461458)
* Document apt-key finger and adv commands
  (thanks to Stefan Schmidt, closes: #350575)
* Better documentation for apt-get --option
  (thanks to Tomas Pospisek, closes: #386579)
* Retitle the apt-mark.8 manpage (thanks to Justin Pryzby, closes: #471276)
* Better documentation on using both APT::Default-Release and
  /etc/apt/preferences (thanks to Ingo Saitz, closes: #145575)

* doc/apt-cache.8.xml:
  - add missing citerefentry
* Upload to unstable
* apt-pkg/deb/dpkgpm.cc:
  - Store the trigger state descriptions in a way that does not break
    the ABI.  The approach taken makes the search for a string O(n) rather
    than O(lg(n)), but since n == 4, I do not consider this a major
    concern.  If it becomes a concern, we can sort the static array and
    use std::equal_range().  (Closes: #499322)
* apt-pkg/pkgcachegen.cc:
  - do not add multiple identical descriptions for the same 
    language (closes: #400768)
* Catalan updated. Closes: #499462
* Fix typo in cron.daily script. Closes: #486179
* Traditional Chinese updated. Closes: #488526
* German corrected and completed. Closes: #490532, #480002, #498018
* French completed
* Bulgarian updated. Closes: #492473
* Slovak updated. Closes: #492475
* Galician updated. Closes: #492794
* Japanese updated. Closes: #492975
* Fix missing space in Greek translation. Closes: #493922
* Greek updated.
* Brazilian Portuguese updated.
* Basque updated. Closes: #496754
* Romanian updated. Closes: #492773, #488361
* Portuguese updated. Closes: #491790
* Simplified Chinese updated. Closes: #489344
* Norwegian Bokmål updated. Closes: #480022
* Czech updated. Closes: #479628, #497277
* Korean updated. Closes: #464515
* Spanish updated. Closes: #457706
* Lithuanian added. Closes: #493328
* Swedish updated. Closes: #497496
* Vietnamese updated. Closes: #497893
* Portuguese updated. Closes: #498411
* Greek updated. Closes: #498687
* Polish updated.
* merge patch that enforces stricter https server certificate
  checking (thanks to Arnaud Ebalard, closes: #485960)
* allow per-mirror specific https settings
  (thanks to Arnaud Ebalard, closes: #485965)
* add doc/examples/apt-https-method-example.cof
  (thanks to Arnaud Ebalard, closes: #485964)
* apt-pkg/depcache.cc:
  - when checking for new important deps, skip critical ones
    (closes: #485943)
* improve apt progress reporting, display trigger actions
* add DPkg::NoTriggers option so that applications that call
  apt/aptitude (like the installer) defer trigger processing
  (thanks to Joey Hess)
* doc/makefile:
  - add examples/apt-https-method-example.conf

* Russian updated. Closes: #479777, #499029
* fix FTBFS by changing build-depends to
* ABI library name change because it's built against
* Package that contains all the new features
* Branch that contains all the new features:

1 files changed, 48 insertions, 37 deletions

diff --git a/po/nb.po b/po/nb.po
index 2b7552d5b..a28368f53 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,22 +1,20 @@
-# Norsk bokmalsoversettelse av meldinger i APT."
-# Copyright 2002, 2003 Lars Bahner, Axel Bojer, Hans Fredrik Nordhaug
-# Filen utgis under Gnu Public License version 2.
-# Lisensen er tilgjenglig fra http://www.gnu.org/licenses/gpl.txt
+# Norsk Bokmal translation of messages in APT.
+#
+# The file is available under Gnu Public License version 2.
+# Get the license from http://www.gnu.org/licenses/gpl.txt
+# Copyright:
 # Lars Bahner <bahner@debian.org>, 2002-2003.
-# Axel Bojer <axelb@start.no>, 2003.
-# Hans Fredrik Nordhaug <hans.fredrik@nordhaug.no>, 2003.
-# Klaus Ade Johnstad <klaus.johnstad@holmlia.gs.oslo.no>, 2004.
+# Axel Bojer <axelb@skolelinux.no>, 2003-2004.
 # Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
-# Axel Bojer <axelb@skolelinux.no>, 2004.
 # Bjorn Steensrud <bjornst@powertech.no>, 2004.
-# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2005-2007.
+# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-04 09:18+0200\n"
-"PO-Revision-Date: 2008-01-02 14:40+0100\n"
+"POT-Creation-Date: 2008-05-22 16:56+0200\n"
+"PO-Revision-Date: 2008-08-31 21:01+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
 "MIME-Version: 1.0\n"
@@ -217,7 +215,7 @@ msgstr ""
 "apt-cache er et lavnivå-verktøy, som brukes til å håndtere APT sine binære\n"
 "lagerfiler, og spørre dem om informasjon.\n"
 "\n"
-"Ordrer:\n"
+"Kommandoer:\n"
 "   add - Legg en fil til kildelageret\n"
 "   gencaches - Bygg lagrene for både pakke og kildekode\n"
 "   showpkg - Vis overordnet informasjon om en enkelt pakke\n"
@@ -281,7 +279,7 @@ msgstr ""
 "\n"
 "apt-config er et enkelt verktøy til å lese APTs innstillingsfil\n"
 "\n"
-"Ordrer:\n"
+"Kommandoer:\n"
 "   shell - Skallmodus\n"
 "   dump - Vis innstillingene\n"
 "\n"
@@ -394,8 +392,8 @@ msgid ""
 "  -c=?  Read this configuration file\n"
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
-"Bruk: apt-ftparchive [innstillinger] ordre\n"
-"Ordrer: packages binærsti [overstyringsfil [sti-prefiks]]\n"
+"Bruk: apt-ftparchive [innstillinger] kommando\n"
+"Kommandoer: packages binærsti [overstyringsfil [sti-prefiks]]\n"
 "          sources kildesti [overstyringsfil [sti-prefiks]]\n"
 "          contents sti\n"
 "          release sti\n"
@@ -1251,7 +1249,6 @@ msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
 #: cmdline/apt-get.cc:2617
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1298,14 +1295,14 @@ msgstr ""
 "      apt-get [innstillinger] install|remove pakke1 [pakke2 ...]\n"
 "      apt-get [innstillinger] source pakke1 [pakke2 ...]\n"
 "\n"
-"apt-get er et enkelt grensesnitt som kan brukes fra kommandolinja for å "
-"laste ned og\n"
-"installere pakker. De kommandoene som brukes mest er «update» og «install».\n"
+"apt-get er et enkelt grensesnitt som kan brukes fra kommandolinja\n"
+"for å laste ned og installere pakker. De mest brukte kommandoene \n"
+"er «update» og «install».\n"
 "\n"
-"Ordrer:\n"
+"Kommandoer:\n"
 "   update - Hent nye pakkelister\n"
 "   upgrade - Utfør en oppgradering\n"
-"   install - Installér nye pakker (Bruk pakkenavn - ikke filnavn (foo.deb))\n"
+"   install - Installér nye pakker (Pakke er «foo», ikke «foo.deb»)\n"
 "   remove - Fjern pakker\n"
 "   autoremove - Fjern alle automatisk ubrukte pakker\n"
 "   purge - Fjern og rydd opp etter pakker\n"
@@ -1331,7 +1328,7 @@ msgstr ""
 "  -V  Vis fullstendige versjonsnummere\n"
 "  -c=? Les denne innstillingsfila\n"
 "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-"Les manualsiden apt-get(8), sources.list(5) and apt.conf(5)\n"
+"Les manualsiden apt-get(8), sources.list(5) og apt.conf(5)\n"
 "for mer informasjon og flere innstillinger\n"
 "                       Denne APT har kraften til en Superku.\n"
 
@@ -1411,7 +1408,7 @@ msgstr "Trykk «Enter» og fortsett"
 
 #: dselect/install:91
 msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr ""
+msgstr "Vil du slettet alle tidligere nedlastede .deb-filer?"
 
 # Note to translators: The following four messages belong together. It doesn't
 # matter where sentences start, but it has to fit in just these four lines, and
@@ -2806,68 +2803,79 @@ msgstr "Skrev %i poster med %i feile filer.\n"
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
 
-#: apt-pkg/deb/dpkgpm.cc:452
+#: apt-pkg/deb/dpkgpm.cc:486
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappa «%s» mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:535
+#: apt-pkg/deb/dpkgpm.cc:569
 #, c-format
 msgid "Preparing %s"
 msgstr "Forbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:536
+#: apt-pkg/deb/dpkgpm.cc:570
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker ut %s"
 
-#: apt-pkg/deb/dpkgpm.cc:541
+#: apt-pkg/deb/dpkgpm.cc:575
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Forbereder oppsett av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:542
+#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605
 #, c-format
 msgid "Configuring %s"
 msgstr "Setter opp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545
+#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579
 #, c-format
 msgid "Processing triggers for %s"
 msgstr "Behandler utløsere for %s"
 
-#: apt-pkg/deb/dpkgpm.cc:547
+#: apt-pkg/deb/dpkgpm.cc:581
 #, c-format
 msgid "Installed %s"
 msgstr "Installerte %s"
 
-#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554
-#: apt-pkg/deb/dpkgpm.cc:555
+#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588
+#: apt-pkg/deb/dpkgpm.cc:589
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Forbereder fjerning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:558
+#: apt-pkg/deb/dpkgpm.cc:592
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:563
+#: apt-pkg/deb/dpkgpm.cc:597
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Forbereder å fullstendig slette %s"
 
-#: apt-pkg/deb/dpkgpm.cc:564
+#: apt-pkg/deb/dpkgpm.cc:598
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:716
+#. populate the "processing" map
+#: apt-pkg/deb/dpkgpm.cc:604
+#, c-format
+msgid "Installing %s"
+msgstr "Installerer %s"
+
+#: apt-pkg/deb/dpkgpm.cc:607
+#, fuzzy, c-format
+msgid "Triggering %s"
+msgstr "Forbereder %s"
+
+#: apt-pkg/deb/dpkgpm.cc:756
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
 
@@ -2879,6 +2887,9 @@ msgstr "Kunne ikke åpne fila %s"
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen ble uventet stengt"
 
+#~ msgid "Running post-installation trigger %s"
+#~ msgstr "Kjører etter-installasjonsutløser %s"
+
 #~ msgid "Line %d too long (max %lu)"
 #~ msgstr "Linje %d er for lang (maks %lu)"