* merged with apt--main and apt--fixes

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-80
   Merge michael.vogt@ubuntu.com--2005/apt--fixes--0

 * apt@packages.debian.org/apt--main--0--patch-81
   Open 0.6.37

 * apt@packages.debian.org/apt--main--0--patch-82
   merge bubulle@debian.org--2005/apt--main--0

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

 * apt@packages.debian.org/apt--main--0--patch-84
   Fix build of French man pages (now using XML, not SGML)

 * apt@packages.debian.org/apt--main--0--patch-85
   Merge patch from Philippe Batailler for French man page build

 * apt@packages.debian.org/apt--main--0--patch-86
   add Welsh translations from Dafydd Harries

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

 * apt@packages.debian.org/apt--main--0--patch-88
   Change debian/bugscript to use #!/bin/bash (Closes: #313402)

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-4
   Merge from mainline

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-5
   Merge from mainline

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-6
   Collapse both pkgAcquire::Run() methods into one, with a default value

 * bubulle@debian.org--2005/apt--main--0--patch-66
   Italian translation complete

 * bubulle@debian.org--2005/apt--main--0--patch-67
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-68
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-69
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-70
   Re-generate the POT and PO files from sources

 * bubulle@debian.org--2005/apt--main--0--patch-71
   Update French translation

 * bubulle@debian.org--2005/apt--main--0--patch-72
   Merge with Matt

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

 * bubulle@debian.org--2005/apt--main--0--patch-74
   Hebres translation update

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

 * bubulle@debian.org--2005/apt--main--0--patch-76
   Correct the Hebrew translation for #306658

 * bubulle@debian.org--2005/apt--main--0--patch-77
   Update French man pages translations

 * bubulle@debian.org--2005/apt--main--0--patch-78
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-79
   Correct syntax errors in Hebrew translation

 * bubulle@debian.org--2005/apt--main--0--patch-80
   Revert changes to debian/changelog and debian/apt.cron.daily

 * bubulle@debian.org--2005/apt--main--0--patch-81
   Portuguese translation update

 * daf@muse.19inch.net--2005/apt--main--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-85

 * daf@muse.19inch.net--2005/apt--main--0--patch-1
   add Welsh translation

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-79

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1
   * merged obvious fixes into the tree to make it easy for matt to merge

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2
   * more merges from otavio that looks good/uncritical

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3
   * merged Matts misc-abi-changes tree

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4
   * finalized the changelog for a ubuntu build

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-5
   * merged with apt--main--0

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6
   * build fix for apt--main--0

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-7
   * fixed incorrect man-page example

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-8
   * changelog udpate

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-9
   * we only need to check once for xmlto

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-26
   * fix the cache-control header generation 

 * otavio@debian.org--2005/apt--fixes--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-71

 * otavio@debian.org--2005/apt--fixes--0--patch-1
   Fix comments about the need of xmlto

 * otavio@debian.org--2005/apt--fixes--0--patch-2
   Fix a compile warning

 * otavio@debian.org--2005/apt--fixes--0--patch-3
   Sync with apt--main--0--patch-76

 * otavio@debian.org--2005/apt--fixes--0--patch-4
   Sync with apt--main--0--patch-78

 * otavio@debian.org--2005/apt--fixes--0--patch-5
   Add fixes that was wrongly included on DDTP changes.

 * otavio@debian.org--2005/apt--fixes--0--patch-8
   Add information about the other fixes include on this branch now.

 * otavio@debian.org--2005/apt--fixes--0--patch-9
   Merge last changes from apt--main--0.

 * otavio@debian.org--2005/apt--fixes--0--patch-10
   Fix warnings about min/max change in gcc-4.0

 * otavio@debian.org--2005/apt--fixes--0--patch-11
   Fix remaning warnings while compiling gcc-4.0

 * otavio@debian.org--2005/apt--fixes--0--patch-12
   Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler.

 * philippe.batailler@free.fr--2005/apt--mainBubulle--0.1--patch-1
   Passage sous arch

 * philippe.batailler@free.fr--2005/apt--mainMatt--0--patch-1
   fix xml error 

1 files changed, 13 insertions, 12 deletions

diff --git a/po/nn.po b/po/nn.po
index 8419e51c1..4284ac7cd 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 22:10+0100\n"
+"POT-Creation-Date: 2005-03-29 07:17+0200\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"
@@ -325,6 +325,7 @@ msgid "Error processing contents %s"
 msgstr "Feil ved lesing av %s"
 
 #: ftparchive/apt-ftparchive.cc:551
+#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -363,7 +364,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 ""
 "Bruk: apt-ftparchive [val] kommando\n"
 "Kommandoar: packages binærstig [overstyringsfil [stigprefiks]]\n"
@@ -1540,7 +1541,7 @@ msgid "Internal error adding a diversion"
 msgstr "Intern feil ved tilleggjing av avleiing"
 
 #: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"
 msgstr "Pakkelageret må først klargjerast"
 
 #: apt-inst/deb/dpkgdb.cc:386
@@ -2369,37 +2370,37 @@ msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Feil ved behandling av %s (NewPackage)"
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Feil ved behandling av %s (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Feil ved behandling av %s (UsePackage2)"
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Feil ved behandling av %s (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
 msgstr "Feil ved behandling av %s (NewVersion1)"
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Feil ved behandling av %s (UsePackage3)"
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "Feil ved behandling av %s (NewVersion2)"
 
 #: apt-pkg/pkgcachegen.cc:207
@@ -2416,12 +2417,12 @@ msgstr "Jøss, du har overgått talet på krav som APT kan handtera."
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Feil ved behandling av %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Feil ved behandling av %s (CollectFileProvides)"
 
 #: apt-pkg/pkgcachegen.cc:260