From 17c78c79f45d8dbb2a4fc5b453569ffbd4373f2e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 26 Jun 2005 10:04:00 +0000 Subject: * merged apt--main and make sure that the po files come from apt--main (because they are more recent) --- po/nb.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'po/nb.po') diff --git a/po/nb.po b/po/nb.po index 9323f7974..ff8fce4a2 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-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -338,6 +338,7 @@ msgid "Error processing contents %s" msgstr "Det oppsto en feil ved lesing av %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -376,7 +377,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 [innstillinger] ordre\n" "Ordrer: packages binærsti [overstyringsfil [sti-prefiks]]\n" @@ -1556,7 +1557,7 @@ msgid "Internal error adding a diversion" msgstr "Det oppsto en intern feil når avledningen ble lagt til" #: 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å klargjøres først" #: apt-inst/deb/dpkgdb.cc:386 @@ -2386,37 +2387,37 @@ msgstr "Lageret har et uoverensstemmende versjonssystem" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil oppsto under 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 oppsto under 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 oppsto under 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 oppsto under 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 oppsto under 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 oppsto under 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 oppsto under behandling av %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2433,12 +2434,12 @@ msgstr "J #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil oppsto under 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 oppsto under behandling av %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 -- cgit v1.2.3