Update Norwegian templates

CVS version numbers

norwegian/po/bugs.nb.po: 1.6 -> 1.7 
norwegian/po/countries.nb.po: 1.9 -> 1.10 
norwegian/po/distrib.nb.po: 1.7 -> 1.8 
norwegian/po/doc.nb.po: 1.6 -> 1.7 
norwegian/po/mailinglists.nb.po: 1.5 -> 1.6 
norwegian/po/organization.nb.po: 1.9 -> 1.10 
norwegian/po/others.nb.po: 1.10 -> 1.11 
norwegian/po/ports.nb.po: 1.5 -> 1.6 
norwegian/po/stats.nb.po: 1.7 -> 1.8 
norwegian/po/templates.nb.po: 1.11 -> 1.12 
norwegian/po/vendors.nb.po: 1.6 -> 1.7

11 files changed, 593 insertions, 577 deletions

diff --git a/norwegian/po/bugs.nb.po b/norwegian/po/bugs.nb.po
index 11ef3e9bfd3..55a69bcc1b0 100644
--- a/norwegian/po/bugs.nb.po
+++ b/norwegian/po/bugs.nb.po
@@ -155,114 +155,114 @@ msgstr "Arkivert"
 msgid "Archived and Unarchived"
 msgstr "Arkivert og ikke arkivert"
 
-#~ msgid "Exclude tag:"
-#~ msgstr "Ekskludér merkelapp:"
+#~ msgid "Flags:"
+#~ msgstr "Flagg:"
 
-#~ msgid "Include tag:"
-#~ msgstr "Inkludér merkelapp:"
+#~ msgid "active bugs"
+#~ msgstr "aktive feil"
 
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "display merged bugs only once"
+#~ msgstr "vis kombinerte feil kun én gang"
 
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ingen sortering på status/alvorlighetsgrad"
 
-#~ msgid "wontfix"
-#~ msgstr "fikser-ikke"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "vis ikke inneholdsfortegnelse i sidehode"
 
-#~ msgid "upstream"
-#~ msgstr "oppstrøms"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "vis ikke statistikk i sidefot"
 
-# Sjekkes!
-#~ msgid "unreproducible"
-#~ msgstr "ikkereproduserbart"
+#~ msgid "bugs"
+#~ msgstr "feil"
 
-#~ msgid "security"
-#~ msgstr "sikkerhet"
+#~ msgid "open"
+#~ msgstr "åpen"
 
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "forwarded"
+#~ msgstr "videresendt"
 
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo"
+#~ msgid "pending"
+#~ msgstr "på gang"
 
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "fixed"
+#~ msgstr "rettet"
 
-#~ msgid "help"
-#~ msgstr "hjelp"
+#~ msgid "done"
+#~ msgstr "ferdigt"
 
-#~ msgid "fixed-upstream"
-#~ msgstr "rettet-oppstrøms"
+#~ msgid "Include status:"
+#~ msgstr "Inkludér status:"
 
-#~ msgid "fixed-in-experimental"
-#~ msgstr "rettet-i-experimental"
+#~ msgid "Exclude status:"
+#~ msgstr "Ekskludér status:"
 
-#~ msgid "confirmed"
-#~ msgstr "bekreftet"
+#~ msgid "critical"
+#~ msgstr "kritisk"
 
-#~ msgid "Exclude severity:"
-#~ msgstr "Ekskludér alvorlighetsgrad:"
+#~ msgid "grave"
+#~ msgstr "graverende"
 
-#~ msgid "Include severity:"
-#~ msgstr "Inkludér alvorlighetsgrad:"
+#~ msgid "serious"
+#~ msgstr "alvorlig"
 
-#~ msgid "wishlist"
-#~ msgstr "ønske"
+#~ msgid "important"
+#~ msgstr "viktig"
 
 #~ msgid "minor"
 #~ msgstr "liten"
 
-#~ msgid "important"
-#~ msgstr "viktig"
+#~ msgid "wishlist"
+#~ msgstr "ønske"
 
-#~ msgid "serious"
-#~ msgstr "alvorlig"
+#~ msgid "Include severity:"
+#~ msgstr "Inkludér alvorlighetsgrad:"
 
-#~ msgid "grave"
-#~ msgstr "graverende"
+#~ msgid "Exclude severity:"
+#~ msgstr "Ekskludér alvorlighetsgrad:"
 
-#~ msgid "critical"
-#~ msgstr "kritisk"
+#~ msgid "confirmed"
+#~ msgstr "bekreftet"
 
-#~ msgid "Exclude status:"
-#~ msgstr "Ekskludér status:"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "rettet-i-experimental"
 
-#~ msgid "Include status:"
-#~ msgstr "Inkludér status:"
+#~ msgid "fixed-upstream"
+#~ msgstr "rettet-oppstrøms"
 
-#~ msgid "done"
-#~ msgstr "ferdigt"
+#~ msgid "help"
+#~ msgstr "hjelp"
 
-#~ msgid "fixed"
-#~ msgstr "rettet"
+#~ msgid "l10n"
+#~ msgstr "l10n"
 
-#~ msgid "pending"
-#~ msgstr "på gang"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo"
 
-#~ msgid "forwarded"
-#~ msgstr "videresendt"
+#~ msgid "patch"
+#~ msgstr "patch"
 
-#~ msgid "open"
-#~ msgstr "åpen"
+#~ msgid "security"
+#~ msgstr "sikkerhet"
 
-#~ msgid "bugs"
-#~ msgstr "feil"
+# Sjekkes!
+#~ msgid "unreproducible"
+#~ msgstr "ikkereproduserbart"
 
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "vis ikke statistikk i sidefot"
+#~ msgid "upstream"
+#~ msgstr "oppstrøms"
 
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "vis ikke inneholdsfortegnelse i sidehode"
+#~ msgid "wontfix"
+#~ msgstr "fikser-ikke"
 
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ingen sortering på status/alvorlighetsgrad"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
 
-#~ msgid "display merged bugs only once"
-#~ msgstr "vis kombinerte feil kun én gang"
+#~ msgid "lfs"
+#~ msgstr "lfs"
 
-#~ msgid "active bugs"
-#~ msgstr "aktive feil"
+#~ msgid "Include tag:"
+#~ msgstr "Inkludér merkelapp:"
 
-#~ msgid "Flags:"
-#~ msgstr "Flagg:"
+#~ msgid "Exclude tag:"
+#~ msgstr "Ekskludér merkelapp:"
diff --git a/norwegian/po/countries.nb.po b/norwegian/po/countries.nb.po
index c136642c26e..8fcf0c1a168 100644
--- a/norwegian/po/countries.nb.po
+++ b/norwegian/po/countries.nb.po
@@ -425,8 +425,8 @@ msgstr "Sørafrika"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#~ msgid "Great Britain"
-#~ msgstr "Storbritania"
-
 #~ msgid "Yugoslavia"
 #~ msgstr "Jugoslavia"
+
+#~ msgid "Great Britain"
+#~ msgstr "Storbritania"
diff --git a/norwegian/po/distrib.nb.po b/norwegian/po/distrib.nb.po
index de087ee4b7c..a28882ec06a 100644
--- a/norwegian/po/distrib.nb.po
+++ b/norwegian/po/distrib.nb.po
@@ -206,24 +206,24 @@ msgstr ""
 msgid "SPARC"
 msgstr "SPARC"
 
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
 
-#~| msgid "Intel x86"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
 
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
 
 #~ msgid "Intel IA-64"
 #~ msgstr "Intel IA-64"
 
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
 
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~| msgid "Intel x86"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
 
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
diff --git a/norwegian/po/doc.nb.po b/norwegian/po/doc.nb.po
index 6ef795abd98..f9ccf517f0a 100644
--- a/norwegian/po/doc.nb.po
+++ b/norwegian/po/doc.nb.po
@@ -434,12 +434,12 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
+#~ msgid "Language:"
+#~ msgstr "Språk:"
+
 #~ msgid ""
 #~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
 #~ "ddp_pkg_loc />."
 #~ msgstr ""
 #~ "Bruk <a href=\"cvs\">SVN</a> for å hente SGML-kildeteksten for <get-var "
 #~ "ddp_pkg_loc />."
-
-#~ msgid "Language:"
-#~ msgstr "Språk:"
diff --git a/norwegian/po/mailinglists.nb.po b/norwegian/po/mailinglists.nb.po
index 5ad79fdd49f..a805517f8c1 100644
--- a/norwegian/po/mailinglists.nb.po
+++ b/norwegian/po/mailinglists.nb.po
@@ -122,8 +122,8 @@ msgstr "åpen"
 msgid "closed"
 msgstr "lukket"
 
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Velg listene du vil si opp abonnementet på:"
-
 #~ msgid "Please select which lists you want to subscribe to:"
 #~ msgstr "Velg listene du vil abonnere på:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Velg listene du vil si opp abonnementet på:"
diff --git a/norwegian/po/organization.nb.po b/norwegian/po/organization.nb.po
index 10491b598d3..6f871337651 100644
--- a/norwegian/po/organization.nb.po
+++ b/norwegian/po/organization.nb.po
@@ -380,38 +380,50 @@ msgstr "Debian for folk med funksjonshemning"
 msgid "Debian for science and related research"
 msgstr "Debian for naturvitenskap og relatert forskning"
 
-#~ msgid "Testing Security Team"
-#~ msgstr "Lag for sikkerhet testing"
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian utviklernøkkelringlag"
 
-#~ msgid "Security Audit Project"
-#~ msgstr "Sikkerhetsvurderingsprosjekt"
+#, fuzzy
+#~| msgid "Release Team"
+#~ msgid "Volatile Team"
+#~ msgstr "Utgiverlag"
 
-#~ msgid "current Debian Project Leader"
-#~ msgstr "nåværende leder for Debian-prosjektet"
+#~ msgid "Vendors"
+#~ msgstr "Leverandører"
 
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Tilpassede Debian distribusjoner"
+#, fuzzy
+#~ msgid "Release Assistants"
+#~ msgstr "Utgavekoordinering"
 
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Utgiverlag for den «stabile» utgaven"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Postliste-arkiver"
 
-#~ msgid "APT Team"
-#~ msgstr "APT-gruppen"
+#~ msgid "Mailing list"
+#~ msgstr "Postliste"
 
-#~ msgid "Handhelds"
-#~ msgstr "Håndholdte"
+#~ msgid "Installation"
+#~ msgstr "Installasjon"
 
-#~ msgid "Marketing Team"
-#~ msgstr "Markedsføringslag"
+#~ msgid "Delegates"
+#~ msgstr "Delegater"
 
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "Administratorene har ansvaret for at buildd for en spesiell arkitektur "
-#~ "(arch) kan nåes på <genericemail arch@buildd.debian.org>, for eksempel "
-#~ "<genericemail i386@buildd.debian.org>."
+#, fuzzy
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Installasjonsystems-gruppen"
+
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian for ikke-kommersielle organisasjoner"
+
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Det universelle operativsystemet som ditt skrivebord"
+
+#~ msgid "Accountant"
+#~ msgstr "Regnskapsfører"
+
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinering av nøkkelsignering"
 
 #~ msgid ""
 #~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -423,47 +435,35 @@ msgstr "Debian for naturvitenskap og relatert forskning"
 #~ "arkitektur og en distribusjon for å se tilgjengelig buildd-er og deres "
 #~ "administrator."
 
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinering av nøkkelsignering"
-
-#~ msgid "Accountant"
-#~ msgstr "Regnskapsfører"
-
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Det universelle operativsystemet som ditt skrivebord"
-
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian for ikke-kommersielle organisasjoner"
-
-#, fuzzy
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Installasjonsystems-gruppen"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "Administratorene har ansvaret for at buildd for en spesiell arkitektur "
+#~ "(arch) kan nåes på <genericemail arch@buildd.debian.org>, for eksempel "
+#~ "<genericemail i386@buildd.debian.org>."
 
-#~ msgid "Delegates"
-#~ msgstr "Delegater"
+#~ msgid "Marketing Team"
+#~ msgstr "Markedsføringslag"
 
-#~ msgid "Installation"
-#~ msgstr "Installasjon"
+#~ msgid "Handhelds"
+#~ msgstr "Håndholdte"
 
-#~ msgid "Mailing list"
-#~ msgstr "Postliste"
+#~ msgid "APT Team"
+#~ msgstr "APT-gruppen"
 
-#~ msgid "Mailing List Archives"
-#~ msgstr "Postliste-arkiver"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Utgiverlag for den «stabile» utgaven"
 
-#, fuzzy
-#~ msgid "Release Assistants"
-#~ msgstr "Utgavekoordinering"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Tilpassede Debian distribusjoner"
 
-#~ msgid "Vendors"
-#~ msgstr "Leverandører"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "nåværende leder for Debian-prosjektet"
 
-#, fuzzy
-#~| msgid "Release Team"
-#~ msgid "Volatile Team"
-#~ msgstr "Utgiverlag"
+#~ msgid "Security Audit Project"
+#~ msgstr "Sikkerhetsvurderingsprosjekt"
 
-#, fuzzy
-#~| msgid "Debian Maintainer Keyring Team"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian utviklernøkkelringlag"
+#~ msgid "Testing Security Team"
+#~ msgstr "Lag for sikkerhet testing"
diff --git a/norwegian/po/others.nb.po b/norwegian/po/others.nb.po
index 87e42798a57..2e3567f1689 100644
--- a/norwegian/po/others.nb.po
+++ b/norwegian/po/others.nb.po
@@ -224,10 +224,26 @@ msgstr ""
 msgid "Swiss army knives"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:61
+#: ../../english/misc/merchandise.def:60
 msgid "USB-Sticks"
 msgstr ""
 
+#: ../../english/misc/merchandise.def:75
+msgid "lanyards"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:78
+msgid "others"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:98
+msgid "Donates money to Debian"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:102
+msgid "Money is used to organize local free software events"
+msgstr ""
+
 #: ../../english/women/profiles/profiles.def:24
 msgid "How long have you been using Debian?"
 msgstr "Hvor lenge har du brukt Debian?"
@@ -305,131 +321,131 @@ msgstr "Versjon"
 msgid "URL"
 msgstr "Nettadresse"
 
-#~ msgid "Wanted:"
-#~ msgstr "Ønsket:"
-
-#~ msgid "Who:"
-#~ msgstr "Hvem:"
-
-#~ msgid "Architecture:"
-#~ msgstr "Arkitektur:"
-
-#~ msgid "Specifications:"
-#~ msgstr "Spesifikasjoner:"
-
-#~ msgid "Where:"
-#~ msgstr "Hvor:"
+#~ msgid "p<get-var page />"
+#~ msgstr "s.<get-var page />"
 
-#~ msgid "Name:"
-#~ msgstr "Navn:"
+#~ msgid "developers only"
+#~ msgstr "kun for utviklere"
 
-#~ msgid "Company:"
-#~ msgstr "Selskap:"
+#~ msgid "deity developers only"
+#~ msgstr "kun for deity-utviklere"
 
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "Kun for Debians tekniske komité"
 
-#~ msgid "or"
-#~ msgstr "eller"
+#~ msgid "closed"
+#~ msgstr "lukket"
 
-#~ msgid "Email:"
-#~ msgstr "E-post:"
+#~ msgid "open"
+#~ msgstr "åpen"
 
-#~ msgid "Rates:"
-#~ msgstr "Takst:"
+#~ msgid "Unsubscribe"
+#~ msgstr "Si opp"
 
-#~ msgid "Willing to Relocate"
-#~ msgstr "Villig å flytte"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Velg listene du vil si opp abonnementet på:"
 
 #~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr "<total_consultant> Debian-konsulenter i <total_country> land vist."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
+#~ "web form</a> is also available, for subscribing to mailing lists. "
+#~ msgstr ""
+#~ "Se <a href=\"./#subunsub\">postlistesiden</a> for informasjon om hvordan "
+#~ "du sier opp via e-post. En <a href=\"unsubscribe\">abonnementside</a> er "
+#~ "også tilgjengelig, for å abonnere på postlister. "
 
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Postliste-abonnement"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Oppsigelse av postliste-abonnement"
 
 #~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
 #~ msgstr ""
-#~ "Se <a href=\"./#subunsub\">postlistesiden</a> for informasjon om hvordan "
-#~ "du abonnerer via e-post. En <a href=\"unsubscribe\">oppsigelsesnettside</"
-#~ "a> er også tilgjengelig, for å si opp postlisteabonnementer. "
+#~ "Vennligst respektér <a href=\"./#ads\">Debians retningslinjer for "
+#~ "postlisteannonsering</a>."
 
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Velg listene du vil abonnere på"
+#~ msgid "Clear"
+#~ msgstr "Nullstill"
 
-#~ msgid "No description given"
-#~ msgstr "Beskrivelse savnes"
+#~ msgid "Subscribe"
+#~ msgstr "Abonnér"
 
-#~ msgid "Moderated:"
-#~ msgstr "Ordstyrt:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "E-postadressen din:"
 
-# Sjekkes!
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Kun medlemmer kan sende meldinger."
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "er en oppsummert versjon som bare kan leses."
+
+#~ msgid "Subscription:"
+#~ msgstr "Abonnement:"
 
 # Sjekkes!
 #~ msgid ""
 #~ "Only messages signed by a Debian developer will be accepted by this list."
 #~ msgstr "Listen godtar kun meldinger signert av Debianutviklere."
 
-#~ msgid "Subscription:"
-#~ msgstr "Abonnement:"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "er en oppsummert versjon som bare kan leses."
+# Sjekkes!
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Kun medlemmer kan sende meldinger."
 
-#~ msgid "Your E-Mail address:"
-#~ msgstr "E-postadressen din:"
+#~ msgid "Moderated:"
+#~ msgstr "Ordstyrt:"
 
-#~ msgid "Subscribe"
-#~ msgstr "Abonnér"
+#~ msgid "No description given"
+#~ msgstr "Beskrivelse savnes"
 
-#~ msgid "Clear"
-#~ msgstr "Nullstill"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Velg listene du vil abonnere på"
 
 #~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
 #~ msgstr ""
-#~ "Vennligst respektér <a href=\"./#ads\">Debians retningslinjer for "
-#~ "postlisteannonsering</a>."
+#~ "Se <a href=\"./#subunsub\">postlistesiden</a> for informasjon om hvordan "
+#~ "du abonnerer via e-post. En <a href=\"unsubscribe\">oppsigelsesnettside</"
+#~ "a> er også tilgjengelig, for å si opp postlisteabonnementer. "
 
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Oppsigelse av postliste-abonnement"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Postliste-abonnement"
 
 #~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
-#~ msgstr ""
-#~ "Se <a href=\"./#subunsub\">postlistesiden</a> for informasjon om hvordan "
-#~ "du sier opp via e-post. En <a href=\"unsubscribe\">abonnementside</a> er "
-#~ "også tilgjengelig, for å abonnere på postlister. "
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr "<total_consultant> Debian-konsulenter i <total_country> land vist."
 
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Velg listene du vil si opp abonnementet på:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Villig å flytte"
 
-#~ msgid "Unsubscribe"
-#~ msgstr "Si opp"
+#~ msgid "Rates:"
+#~ msgstr "Takst:"
 
-#~ msgid "open"
-#~ msgstr "åpen"
+#~ msgid "Email:"
+#~ msgstr "E-post:"
 
-#~ msgid "closed"
-#~ msgstr "lukket"
+#~ msgid "or"
+#~ msgstr "eller"
 
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "Kun for Debians tekniske komité"
+#~ msgid "URL:"
+#~ msgstr "URL:"
 
-#~ msgid "deity developers only"
-#~ msgstr "kun for deity-utviklere"
+#~ msgid "Company:"
+#~ msgstr "Selskap:"
 
-#~ msgid "developers only"
-#~ msgstr "kun for utviklere"
+#~ msgid "Name:"
+#~ msgstr "Navn:"
 
-#~ msgid "p<get-var page />"
-#~ msgstr "s.<get-var page />"
+#~ msgid "Where:"
+#~ msgstr "Hvor:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Spesifikasjoner:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Arkitektur:"
+
+#~ msgid "Who:"
+#~ msgstr "Hvem:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Ønsket:"
diff --git a/norwegian/po/ports.nb.po b/norwegian/po/ports.nb.po
index 7352a043293..bf64dcee7b2 100644
--- a/norwegian/po/ports.nb.po
+++ b/norwegian/po/ports.nb.po
@@ -113,32 +113,32 @@ msgstr "Debian for PowerPC"
 msgid "Debian for Sparc"
 msgstr "Debian for Sparc"
 
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian for Sparc64"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian for S/390"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian for bærbare"
 
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian for MIPS"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian for AMD64"
 
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian for Motorola 680x0"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian for ARM"
 
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian for Beowulf"
 
 #~ msgid "Main"
 #~ msgstr "Hoved"
 
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian for Beowulf"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
 
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian for ARM"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian for Motorola 680x0"
 
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian for AMD64"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian for MIPS"
 
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian for bærbare"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian for S/390"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian for Sparc64"
diff --git a/norwegian/po/stats.nb.po b/norwegian/po/stats.nb.po
index 7321920feba..2952ca3061a 100644
--- a/norwegian/po/stats.nb.po
+++ b/norwegian/po/stats.nb.po
@@ -233,8 +233,8 @@ msgstr "Oversatte nettsider (etter størrelse)"
 msgid "Translation Statistics by Page Size"
 msgstr "Oversettelsesstatistikk etter sidestørrelse"
 
-#~ msgid "Origin"
-#~ msgstr "Kilde"
-
 #~ msgid "Created with"
 #~ msgstr "Opprettet med"
+
+#~ msgid "Origin"
+#~ msgstr "Kilde"
diff --git a/norwegian/po/templates.nb.po b/norwegian/po/templates.nb.po
index 2d228a7270b..1822b232093 100644
--- a/norwegian/po/templates.nb.po
+++ b/norwegian/po/templates.nb.po
@@ -503,242 +503,139 @@ msgstr "Nettadresse"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "Tilbake til <a href=\"../\">Hvem bruker Debian? siden</a>."
 
-#~ msgid "List of Consultants"
-#~ msgstr "Konsulentliste"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Besøk sponsoren for disse sidene"
 
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Tilbake til <a href=\"./\">Debians konsulentliste</a>."
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Har du oppdaget et problem med nettstedets utforming?"
 
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~| msgid "Report"
+#~ msgid "Report it!"
+#~ msgstr "Rapporter det"
 
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "hent med jigdo"
+#~| msgid "Select a server near you"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Velg en tjener nær deg: &nbsp;"
 
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "hent via http/ftp"
+#~ msgid "More information:"
+#~ msgstr "Mer informasjon:"
 
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "Nettverksinstallasjon"
+#~ msgid "Taken by:"
+#~ msgstr "Tatt av:"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "OSS"
+#~ msgid "Nobody"
+#~ msgstr "Ingen"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "diverse"
+#~ msgid "Rating:"
+#~ msgstr "Vurdering:"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "OSS"
+#~ msgid "More information"
+#~ msgstr "Mer informasjon"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "diverse"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Kommende begivenheter"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "diverse"
+#~ msgid "link may no longer be valid"
+#~ msgstr "pekeren er muligvis gammel"
 
-#~ msgid "Debian CD team"
-#~ msgstr "Debians cd-gruppe"
+#~ msgid "When"
+#~ msgstr "Når"
 
-#~ msgid "debian_on_cd"
-#~ msgstr "Debian på CD"
+#~ msgid "Where"
+#~ msgstr "Hvor"
 
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "More Info"
+#~ msgstr "Mer informasjon"
 
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debians engasjement"
 
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "Main Coordinator"
+#~ msgstr "Hovedkoordinator"
 
-#~ msgid "buy"
-#~ msgstr "kjøp"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Prosjekt</th><th>Koordinator</th>"
 
-#~ msgid "net_install"
-#~ msgstr "nettinstall"
+#~ msgid "Related Links"
+#~ msgstr "Beslektede pekere"
 
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "diverse"
+#~ msgid "Latest News"
+#~ msgstr "Siste nytt"
 
+# Sjekkes!
 #~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
 #~ msgstr ""
-#~ "Engelskspråklige <a href=\"/MailingLists/disclaimer\">åpne postlister</a> "
-#~ "for CD'er/DVD'er:"
-
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Donasjoner"
-
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Debians cd-gruppe"
+#~ "Tilbake til: andre <a href=\"./\">Debiannyheter</a> || <a href=\"m4_HOME/"
+#~ "\">Debianprosjektets hjemmeside</a>."
 
-#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "foreslått"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (død peker)"
 
 #, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Under&nbsp;diskusjon"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Venter&nbsp;på&nbsp;sponsorer"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Under&nbsp;diskusjon"
-
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Avstemming&nbsp;pågår"
-
-#~ msgid "Decided"
-#~ msgstr "Besluttet"
-
-#~ msgid "Withdrawn"
-#~ msgstr "Tilbaketrukket"
-
-#~ msgid "Other"
-#~ msgstr "Annet"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Hjem&nbsp;Avstemmingssiden"
-
-#~ msgid "How&nbsp;To"
-#~ msgstr "Hvordan..."
-
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Send&nbsp;inn&nbsp;et&nbsp;forslag"
-
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Legg&nbsp;til&nbsp;et&nbsp;forslag"
-
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Følg&nbsp;et&nbsp;forslag"
-
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Les&nbsp;et&nbsp;resultat"
-
-#~ msgid "Vote"
-#~ msgstr "Stem"
-
-#~ msgid "discussed"
-#~ msgstr "diskutert"
-
-#~ msgid "network install"
-#~ msgstr "nettverksinstallasjon"
-
-#~ msgid "buy pre-made images"
-#~ msgstr "kjøp ferdige cd-avtrykk"
-
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for informasjon om "
-#~ "å komme i kontakt med oss."
-
-#~ msgid "download with pik"
-#~ msgstr "hent med pik"
-
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (død peker)"
-
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Sikkerhetsmelding fra Debian"
-
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Sikkerhetsmeldinger fra Debian"
-
-#~ msgid "Vulnerable"
-#~ msgstr "Sårbar"
-
-#~ msgid "Fixed in"
-#~ msgstr "Rettet i"
-
-#~ msgid "Source:"
-#~ msgstr "Kildekode:"
-
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Arkitekturuavhengig bestanddel:"
-
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
 #~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
 #~ msgstr ""
-#~ "MD5-kontrolsummer av disse filene er tilgjengelig i den <a href=\"<get-"
-#~ "var url />\">originale sikkerhetsmeldingen</a>."
+#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
 
-#~ msgid "No other external database security references currently available."
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
 #~ msgstr ""
-#~ "Ingen sikkerhetsreferanser er for tiden tilgjengelig i andre databaser."
-
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "CERT's notater om sårbarheter, sikkerhet, og observasjoner:"
-
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
-
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "I Mitre's CVE-ordbok:"
-
-#~ msgid "Security database references"
-#~ msgstr "Referanser i sikkerhetsdatabaser"
-
-#~ msgid "License Information"
-#~ msgstr "Lisensinformasjon"
+#~ "<a href=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
 
 #, fuzzy
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "diverse"
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
+#~ "a>."
 
 #, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
 #~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
+#, fuzzy
 #~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#, fuzzy
+#~ msgid "<void id=\"singular\" />It was translated by %s."
 #~ msgstr ""
 #~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
-
 #, fuzzy
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgid "<void id=\"plural\" />It was translated by %s."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
@@ -750,138 +647,241 @@ msgstr "Tilbake til <a href=\"../\">Hvem bruker Debian? siden</a>."
 #~ "a>."
 
 #, fuzzy
-#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
-#, fuzzy
-#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
+
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
-#, fuzzy
 #~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
 #, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
 #~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
 #, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "diverse"
+
+#~ msgid "License Information"
+#~ msgstr "Lisensinformasjon"
+
+#~ msgid "Security database references"
+#~ msgstr "Referanser i sikkerhetsdatabaser"
+
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "I Mitre's CVE-ordbok:"
+
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
+
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "CERT's notater om sårbarheter, sikkerhet, og observasjoner:"
+
+#~ msgid "No other external database security references currently available."
 #~ msgstr ""
-#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ "Ingen sikkerhetsreferanser er for tiden tilgjengelig i andre databaser."
 
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgid ""
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
 #~ msgstr ""
-#~ "<a href=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
+#~ "MD5-kontrolsummer av disse filene er tilgjengelig i den <a href=\"<get-"
+#~ "var url />\">originale sikkerhetsmeldingen</a>."
+
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Arkitekturuavhengig bestanddel:"
+
+#~ msgid "Source:"
+#~ msgstr "Kildekode:"
+
+#~ msgid "Fixed in"
+#~ msgstr "Rettet i"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Sårbar"
+
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Sikkerhetsmeldinger fra Debian"
+
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Sikkerhetsmelding fra Debian"
+
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (død peker)"
+
+#~ msgid "download with pik"
+#~ msgstr "hent med pik"
 
-#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
 #~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
 #~ msgstr ""
-#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
+#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for informasjon om "
+#~ "å komme i kontakt med oss."
 
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (død peker)"
+#~ msgid "buy pre-made images"
+#~ msgstr "kjøp ferdige cd-avtrykk"
+
+#~ msgid "network install"
+#~ msgstr "nettverksinstallasjon"
+
+#~ msgid "discussed"
+#~ msgstr "diskutert"
+
+#~ msgid "Vote"
+#~ msgstr "Stem"
+
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Les&nbsp;et&nbsp;resultat"
+
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Følg&nbsp;et&nbsp;forslag"
+
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Legg&nbsp;til&nbsp;et&nbsp;forslag"
+
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Send&nbsp;inn&nbsp;et&nbsp;forslag"
+
+#~ msgid "How&nbsp;To"
+#~ msgstr "Hvordan..."
+
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Hjem&nbsp;Avstemmingssiden"
+
+#~ msgid "Other"
+#~ msgstr "Annet"
+
+#~ msgid "Withdrawn"
+#~ msgstr "Tilbaketrukket"
+
+#~ msgid "Decided"
+#~ msgstr "Besluttet"
+
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Avstemming&nbsp;pågår"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Under&nbsp;diskusjon"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Venter&nbsp;på&nbsp;sponsorer"
+
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "Under&nbsp;diskusjon"
+
+#, fuzzy
+#~ msgid "Proposer"
+#~ msgstr "foreslått"
+
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "Debians cd-gruppe"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Donasjoner"
 
-# Sjekkes!
 #~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
 #~ msgstr ""
-#~ "Tilbake til: andre <a href=\"./\">Debiannyheter</a> || <a href=\"m4_HOME/"
-#~ "\">Debianprosjektets hjemmeside</a>."
+#~ "Engelskspråklige <a href=\"/MailingLists/disclaimer\">åpne postlister</a> "
+#~ "for CD'er/DVD'er:"
 
-#~ msgid "Latest News"
-#~ msgstr "Siste nytt"
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "diverse"
 
-#~ msgid "Related Links"
-#~ msgstr "Beslektede pekere"
+#~ msgid "net_install"
+#~ msgstr "nettinstall"
 
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Prosjekt</th><th>Koordinator</th>"
+#~ msgid "buy"
+#~ msgstr "kjøp"
 
-#~ msgid "Main Coordinator"
-#~ msgstr "Hovedkoordinator"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
 
-#~ msgid "Debian Involvement"
-#~ msgstr "Debians engasjement"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
 
-#~ msgid "More Info"
-#~ msgstr "Mer informasjon"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
 
-#~ msgid "Where"
-#~ msgstr "Hvor"
+#~ msgid "debian_on_cd"
+#~ msgstr "Debian på CD"
 
-#~ msgid "When"
-#~ msgstr "Når"
+#~ msgid "Debian CD team"
+#~ msgstr "Debians cd-gruppe"
 
-#~ msgid "link may no longer be valid"
-#~ msgstr "pekeren er muligvis gammel"
+#, fuzzy
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "diverse"
 
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Kommende begivenheter"
+#, fuzzy
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "diverse"
 
-#~ msgid "More information"
-#~ msgstr "Mer informasjon"
+#, fuzzy
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "OSS"
 
-#~ msgid "Rating:"
-#~ msgstr "Vurdering:"
+#, fuzzy
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "diverse"
 
-#~ msgid "Nobody"
-#~ msgstr "Ingen"
+#, fuzzy
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "OSS"
 
-#~ msgid "Taken by:"
-#~ msgstr "Tatt av:"
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "Nettverksinstallasjon"
 
-#~ msgid "More information:"
-#~ msgstr "Mer informasjon:"
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "hent via http/ftp"
 
-#~| msgid "Select a server near you"
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Velg en tjener nær deg: &nbsp;"
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "hent med jigdo"
 
-#~| msgid "Report"
-#~ msgid "Report it!"
-#~ msgstr "Rapporter det"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
 
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Har du oppdaget et problem med nettstedets utforming?"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Tilbake til <a href=\"./\">Debians konsulentliste</a>."
 
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Besøk sponsoren for disse sidene"
+#~ msgid "List of Consultants"
+#~ msgstr "Konsulentliste"
diff --git a/norwegian/po/vendors.nb.po b/norwegian/po/vendors.nb.po
index 60f597676ad..1a1e824998c 100644
--- a/norwegian/po/vendors.nb.po
+++ b/norwegian/po/vendors.nb.po
@@ -63,75 +63,75 @@ msgstr "kildekode"
 msgid "and"
 msgstr "og"
 
-#~ msgid "Vendor:"
-#~ msgstr "Leverandør:"
-
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL for Debiansiden:"
+#~ msgid "updated monthly"
+#~ msgstr "oppdateres månedlig"
 
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Tar imot bidrag til Debian:"
+#~ msgid "updated twice weekly"
+#~ msgstr "oppdateres to ganger i uken"
 
-#~ msgid "Country:"
-#~ msgstr "Land:"
+#~ msgid "updated weekly"
+#~ msgstr "oppdateres ukentlig"
 
-#~ msgid "Ship International:"
-#~ msgstr "Sender til utlandet:"
+#~ msgid "reseller"
+#~ msgstr "videreformidler"
 
-#~ msgid "email:"
-#~ msgstr "epost:"
+#~ msgid "reseller of $var"
+#~ msgstr "videreformidler av $var"
 
-#~ msgid "CD Type:"
-#~ msgstr "CD-type:"
+#~ msgid "Custom Release"
+#~ msgstr "Bestillingsverk"
 
-#~ msgid "DVD Type:"
-#~ msgstr "DVD-type:"
+#~ msgid "vendor additions"
+#~ msgstr "tillegg fra leverandør"
 
-#~ msgid "Architectures:"
-#~ msgstr "Arkitekturer:"
+#~ msgid "contrib included"
+#~ msgstr "contrib inkludert"
 
-#~ msgid "Official CD"
-#~ msgstr "Offisiell CD"
+#~ msgid "non-free included"
+#~ msgstr "non-free inkludert"
 
-#, fuzzy
-#~ msgid "Official DVD"
-#~ msgstr "Offisiell CD"
+#~ msgid "non-US included"
+#~ msgstr "non-US inkludert"
 
-#~ msgid "Development Snapshot"
-#~ msgstr "Utviklingsversjon"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Fler-distribusjon"
 
 #~ msgid "Vendor Release"
 #~ msgstr "Leverandørutgave"
 
-#~ msgid "Multiple Distribution"
-#~ msgstr "Fler-distribusjon"
+#~ msgid "Development Snapshot"
+#~ msgstr "Utviklingsversjon"
 
-#~ msgid "non-US included"
-#~ msgstr "non-US inkludert"
+#, fuzzy
+#~ msgid "Official DVD"
+#~ msgstr "Offisiell CD"
 
-#~ msgid "non-free included"
-#~ msgstr "non-free inkludert"
+#~ msgid "Official CD"
+#~ msgstr "Offisiell CD"
 
-#~ msgid "contrib included"
-#~ msgstr "contrib inkludert"
+#~ msgid "Architectures:"
+#~ msgstr "Arkitekturer:"
 
-#~ msgid "vendor additions"
-#~ msgstr "tillegg fra leverandør"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD-type:"
 
-#~ msgid "Custom Release"
-#~ msgstr "Bestillingsverk"
+#~ msgid "CD Type:"
+#~ msgstr "CD-type:"
 
-#~ msgid "reseller of $var"
-#~ msgstr "videreformidler av $var"
+#~ msgid "email:"
+#~ msgstr "epost:"
 
-#~ msgid "reseller"
-#~ msgstr "videreformidler"
+#~ msgid "Ship International:"
+#~ msgstr "Sender til utlandet:"
 
-#~ msgid "updated weekly"
-#~ msgstr "oppdateres ukentlig"
+#~ msgid "Country:"
+#~ msgstr "Land:"
 
-#~ msgid "updated twice weekly"
-#~ msgstr "oppdateres to ganger i uken"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Tar imot bidrag til Debian:"
 
-#~ msgid "updated monthly"
-#~ msgstr "oppdateres månedlig"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL for Debiansiden:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Leverandør:"