(nb) Update PO files

CVS version numbers norwegian/po/bugs.nb.po: 1.2 -> 1.3 norwegian/po/cdimage.nb.po: 1.4 -> 1.5 norwegian/po/consultants.nb.po: 1.2 -> 1.3 norwegian/po/countries.nb.po: 1.5 -> 1.6 norwegian/po/date.nb.po: 1.3 -> 1.4 norwegian/po/distrib.nb.po: 1.4 -> 1.5 norwegian/po/doc.nb.po: 1.3 -> 1.4 norwegian/po/l10n.nb.po: 1.3 -> 1.4 norwegian/po/langs.nb.po: 1.3 -> 1.4 norwegian/po/legal.nb.po: 1.1 -> 1.2 norwegian/po/mailinglists.nb.po: 1.2 -> 1.3 norwegian/po/newsevents.nb.po: 1.3 -> 1.4 norwegian/po/organization.nb.po: 1.4 -> 1.5 norwegian/po/others.nb.po: 1.5 -> 1.6 norwegian/po/ports.nb.po: 1.2 -> 1.3 norwegian/po/security.nb.po: 1.3 -> 1.4 norwegian/po/stats.nb.po: 1.3 -> 1.4 norwegian/po/templates.nb.po: 1.5 -> 1.6 norwegian/po/vendors.nb.po: 1.2 -> 1.3 norwegian/po/vote.nb.po: 1.2 -> 1.3 norwegian/po/wnpp.nb.po: 1.1 -> 1.2
author: David Prévot <taffit> 2013-12-25 19:56:15 +0000
committer: David Prévot <taffit> 2013-12-25 19:56:15 +0000
commit: eda6671342e7b94ebb66e74848ebdec42d8d2200 (patch)
tree: bdf411053f23c47923566233457b761fb14d6810 /norwegian/po
parent: 0a66b674faec2859557a867c96ade0cbafde8ed9 (diff)
21 files changed, 1783 insertions, 1051 deletions
diff --git a/norwegian/po/bugs.nb.po b/norwegian/po/bugs.nb.po
index 0b29ce1334c..6c102e831e2 100644
--- a/norwegian/po/bugs.nb.po
+++ b/norwegian/po/bugs.nb.po
@@ -4,265 +4,291 @@ msgstr ""
 "PO-Revision-Date: 2008-08-29 00:19+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/Bugs/pkgreport-opts.inc:16
+#: ../../english/Bugs/pkgreport-opts.inc:17
 msgid "in package"
 msgstr "i pakke"
 
-#: ../../english/Bugs/pkgreport-opts.inc:19
-#: ../../english/Bugs/pkgreport-opts.inc:59
-#: ../../english/Bugs/pkgreport-opts.inc:93
+#: ../../english/Bugs/pkgreport-opts.inc:20
+#: ../../english/Bugs/pkgreport-opts.inc:60
+#: ../../english/Bugs/pkgreport-opts.inc:94
 msgid "tagged"
 msgstr "merket"
 
-#: ../../english/Bugs/pkgreport-opts.inc:22
-#: ../../english/Bugs/pkgreport-opts.inc:62
-#: ../../english/Bugs/pkgreport-opts.inc:96
+#: ../../english/Bugs/pkgreport-opts.inc:23
+#: ../../english/Bugs/pkgreport-opts.inc:63
+#: ../../english/Bugs/pkgreport-opts.inc:97
 msgid "with severity"
 msgstr "meg alvorlighetsgrad"
 
-#: ../../english/Bugs/pkgreport-opts.inc:25
+#: ../../english/Bugs/pkgreport-opts.inc:26
 msgid "in source package"
 msgstr "i kildepakke"
 
-#: ../../english/Bugs/pkgreport-opts.inc:28
+#: ../../english/Bugs/pkgreport-opts.inc:29
 msgid "in packages maintained by"
 msgstr "i pakker vedlikeholdt av"
 
-#: ../../english/Bugs/pkgreport-opts.inc:31
+#: ../../english/Bugs/pkgreport-opts.inc:32
 msgid "submitted by"
 msgstr "sendt inn av"
 
-#: ../../english/Bugs/pkgreport-opts.inc:34
+#: ../../english/Bugs/pkgreport-opts.inc:35
 msgid "owned by"
 msgstr "eid av"
 
-#: ../../english/Bugs/pkgreport-opts.inc:37
+#: ../../english/Bugs/pkgreport-opts.inc:38
 msgid "with status"
 msgstr "med status"
 
-#: ../../english/Bugs/pkgreport-opts.inc:40
+#: ../../english/Bugs/pkgreport-opts.inc:41
 msgid "with mail from"
 msgstr "med e-post fra"
 
-#: ../../english/Bugs/pkgreport-opts.inc:43
+#: ../../english/Bugs/pkgreport-opts.inc:44
 msgid "newest bugs"
 msgstr "nyeste feil"
 
-#: ../../english/Bugs/pkgreport-opts.inc:56
-#: ../../english/Bugs/pkgreport-opts.inc:90
+#: ../../english/Bugs/pkgreport-opts.inc:57
+#: ../../english/Bugs/pkgreport-opts.inc:91
 msgid "with subject containing"
 msgstr "med emne som inneholder"
 
-#: ../../english/Bugs/pkgreport-opts.inc:65
-#: ../../english/Bugs/pkgreport-opts.inc:99
+#: ../../english/Bugs/pkgreport-opts.inc:66
+#: ../../english/Bugs/pkgreport-opts.inc:100
 msgid "with pending state"
 msgstr "med ventende tilstand"
 
-#: ../../english/Bugs/pkgreport-opts.inc:68
-#: ../../english/Bugs/pkgreport-opts.inc:102
+#: ../../english/Bugs/pkgreport-opts.inc:69
+#: ../../english/Bugs/pkgreport-opts.inc:103
 msgid "with submitter containing"
 msgstr "med innsender som inneholder"
 
-#: ../../english/Bugs/pkgreport-opts.inc:71
-#: ../../english/Bugs/pkgreport-opts.inc:105
+#: ../../english/Bugs/pkgreport-opts.inc:72
+#: ../../english/Bugs/pkgreport-opts.inc:106
 msgid "with forwarded containing"
 msgstr "med videresendt som inneholder"
 
-#: ../../english/Bugs/pkgreport-opts.inc:74
-#: ../../english/Bugs/pkgreport-opts.inc:108
+#: ../../english/Bugs/pkgreport-opts.inc:75
+#: ../../english/Bugs/pkgreport-opts.inc:109
 msgid "with owner containing"
 msgstr "med eier som inneholder"
 
-#: ../../english/Bugs/pkgreport-opts.inc:77
-#: ../../english/Bugs/pkgreport-opts.inc:111
+#: ../../english/Bugs/pkgreport-opts.inc:78
+#: ../../english/Bugs/pkgreport-opts.inc:112
 msgid "with package"
 msgstr "med pakke"
 
-#: ../../english/Bugs/pkgreport-opts.inc:121
+#: ../../english/Bugs/pkgreport-opts.inc:122
 msgid "normal"
 msgstr "vanlig"
 
-#: ../../english/Bugs/pkgreport-opts.inc:124
+#: ../../english/Bugs/pkgreport-opts.inc:125
 msgid "oldview"
 msgstr "gammel visning"
 
-#: ../../english/Bugs/pkgreport-opts.inc:127
+#: ../../english/Bugs/pkgreport-opts.inc:128
 msgid "raw"
 msgstr "rå"
 
-#: ../../english/Bugs/pkgreport-opts.inc:130
+#: ../../english/Bugs/pkgreport-opts.inc:131
 msgid "age"
 msgstr "alder"
 
-#: ../../english/Bugs/pkgreport-opts.inc:135
+#: ../../english/Bugs/pkgreport-opts.inc:137
 msgid "Repeat Merged"
 msgstr "Gjenta kombinerte"
 
-#: ../../english/Bugs/pkgreport-opts.inc:136
+#: ../../english/Bugs/pkgreport-opts.inc:138
 msgid "Reverse Bugs"
 msgstr "Omvendt feil"
 
-#: ../../english/Bugs/pkgreport-opts.inc:137
+#: ../../english/Bugs/pkgreport-opts.inc:139
 msgid "Reverse Pending"
 msgstr "Omvendt ventende"
 
-#: ../../english/Bugs/pkgreport-opts.inc:138
+#: ../../english/Bugs/pkgreport-opts.inc:140
 msgid "Reverse Severity"
 msgstr "Omvendt alvorlighetsgrad"
 
 #: ../../english/Bugs/pkgreport-opts.inc:141
+msgid "No Bugs which affect packages"
+msgstr ""
+
+#: ../../english/Bugs/pkgreport-opts.inc:143
+msgid "None"
+msgstr ""
+
+#: ../../english/Bugs/pkgreport-opts.inc:144
+msgid "testing"
+msgstr ""
+
+#: ../../english/Bugs/pkgreport-opts.inc:145
+msgid "oldstable"
+msgstr ""
+
+#: ../../english/Bugs/pkgreport-opts.inc:146
+msgid "stable"
+msgstr ""
+
+#: ../../english/Bugs/pkgreport-opts.inc:147
+msgid "experimental"
+msgstr "experimental"
+
+#: ../../english/Bugs/pkgreport-opts.inc:148
+msgid "unstable"
+msgstr ""
+
+#: ../../english/Bugs/pkgreport-opts.inc:152
 msgid "Unarchived"
 msgstr "Ikke arkivert"
 
-#: ../../english/Bugs/pkgreport-opts.inc:144
+#: ../../english/Bugs/pkgreport-opts.inc:155
 msgid "Archived"
 msgstr "Arkivert"
 
-#: ../../english/Bugs/pkgreport-opts.inc:147
+#: ../../english/Bugs/pkgreport-opts.inc:158
 msgid "Archived and Unarchived"
 msgstr "Arkivert og ikke arkivert"
 
-#~ msgid "Flags:"
-#~ msgstr "Flagger:"
+#~ msgid "Exclude tag:"
+#~ msgstr "Ekskludér merkelapp:"
 
-#~ msgid "active bugs"
-#~ msgstr "aktive feil"
+#~ msgid "Include tag:"
+#~ msgstr "Inkludér merkelapp:"
 
-# Sjekkes!
-#~ msgid "display merged bugs only once"
-#~ msgstr "vis kombinerte feil kun én gang"
+#~ msgid "lfs"
+#~ msgstr "lfs"
 
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ingen sortering på status/alvorlighetsgrad"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
 
-# Sjekkes!
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "vis ikke inneholdsfortegnelse i sidehode"
+#~ msgid "wontfix"
+#~ msgstr "fikser-ikke"
 
-# Sjekkes!
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "vis ikke statistikk i sidefot"
+#~ msgid "upstream"
+#~ msgstr "oppstrøms"
 
-#~ msgid "experimental"
-#~ msgstr "experimental"
+# 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 "d-i"
+#~ msgstr "d-i"
 
-#~ msgid "critical"
-#~ msgstr "kritisk"
+#~ msgid "confirmed"
+#~ msgstr "bekreftet"
 
-#~ msgid "grave"
-#~ msgstr "graverende"
+#~ msgid "sid"
+#~ msgstr "sid"
 
-#~ msgid "serious"
-#~ msgstr "alvorlig"
+#, fuzzy
+#~ msgid "etch-ignore"
+#~ msgstr "sarge-ignore"
 
-#~ msgid "important"
-#~ msgstr "viktig"
+#, fuzzy
+#~ msgid "etch"
+#~ msgstr "patch"
 
-#~ msgid "minor"
-#~ msgstr "liten"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
 
-#~ msgid "wishlist"
-#~ msgstr "ønske"
+#~ msgid "woody"
+#~ msgstr "woody"
 
-#~ msgid "Include severity:"
-#~ msgstr "Inkludér alvorlighetsgrad:"
+#~ msgid "potato"
+#~ msgstr "potato"
 
 #~ msgid "Exclude severity:"
 #~ msgstr "Ekskludér alvorlighetsgrad:"
 
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Inkludér alvorlighetsgrad:"
 
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "ønske"
 
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "minor"
+#~ msgstr "liten"
 
-#, fuzzy
-#~ msgid "etch"
-#~ msgstr "patch"
+#~ msgid "important"
+#~ msgstr "viktig"
 
-#, fuzzy
-#~ msgid "etch-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "alvorlig"
 
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "grave"
+#~ msgstr "graverende"
 
-#~ msgid "confirmed"
-#~ msgstr "bekreftet"
+#~ msgid "critical"
+#~ msgstr "kritisk"
 
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ 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 "upstream"
-#~ msgstr "oppstrøms"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "vis ikke statistikk i sidefot"
 
-#~ msgid "wontfix"
-#~ msgstr "fikser-ikke"
+# Sjekkes!
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "vis ikke inneholdsfortegnelse i sidehode"
 
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ingen sortering på status/alvorlighetsgrad"
 
-#~ msgid "lfs"
-#~ msgstr "lfs"
+# Sjekkes!
+#~ msgid "display merged bugs only once"
+#~ msgstr "vis kombinerte feil kun én gang"
 
-#~ msgid "Include tag:"
-#~ msgstr "Inkludér merkelapp:"
+#~ msgid "active bugs"
+#~ msgstr "aktive feil"
 
-#~ msgid "Exclude tag:"
-#~ msgstr "Ekskludér merkelapp:"
+#~ msgid "Flags:"
+#~ msgstr "Flagger:"
diff --git a/norwegian/po/cdimage.nb.po b/norwegian/po/cdimage.nb.po
index 8811aa13a83..43cb09450e6 100644
--- a/norwegian/po/cdimage.nb.po
+++ b/norwegian/po/cdimage.nb.po
@@ -13,10 +13,18 @@ msgstr ""
 #: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:9
 #: ../../english/CD/CD-keys.data:14 ../../english/CD/CD-keys.data:19
 #: ../../english/CD/CD-keys.data:24 ../../english/CD/CD-keys.data:28
-#: ../../english/CD/CD-keys.data:33
+#: ../../english/CD/CD-keys.data:33 ../../english/CD/CD-keys.data:38
 msgid "      Key fingerprint"
 msgstr " Nøkkelfingeravtrykk"
 
+#: ../../english/devel/debian-installer/images.data:90
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:91
+msgid "Jigdo files"
+msgstr ""
+
 #. note: only change the sep(arator) if it's not good for your charset
 #: ../../english/template/debian/cdimage.wml:10
 msgid "&middot;"
diff --git a/norwegian/po/consultants.nb.po b/norwegian/po/consultants.nb.po
index fd3fb299968..9e2c1abad91 100644
--- a/norwegian/po/consultants.nb.po
+++ b/norwegian/po/consultants.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2006-08-12 17:51+0200\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,38 +22,42 @@ msgid "Address:"
 msgstr "Adresse:"
 
 #: ../../english/consultants/consultant.defs:15
+msgid "Contact:"
+msgstr ""
+
+#: ../../english/consultants/consultant.defs:19
 msgid "Phone:"
 msgstr "Telefon:"
 
-#: ../../english/consultants/consultant.defs:18
+#: ../../english/consultants/consultant.defs:22
 msgid "Fax:"
 msgstr "Faks:"
 
-#: ../../english/consultants/consultant.defs:21
+#: ../../english/consultants/consultant.defs:25
 msgid "URL:"
 msgstr "URL:"
 
-#: ../../english/consultants/consultant.defs:25
+#: ../../english/consultants/consultant.defs:29
 msgid "or"
 msgstr "eller"
 
-#: ../../english/consultants/consultant.defs:30
+#: ../../english/consultants/consultant.defs:34
 msgid "Email:"
 msgstr "E-post:"
 
-#: ../../english/consultants/consultant.defs:48
+#: ../../english/consultants/consultant.defs:52
 msgid "Rates:"
 msgstr "Takst:"
 
-#: ../../english/consultants/consultant.defs:51
+#: ../../english/consultants/consultant.defs:55
 msgid "Additional Information"
 msgstr "Mer informasjon"
 
-#: ../../english/consultants/consultant.defs:54
+#: ../../english/consultants/consultant.defs:58
 msgid "Willing to Relocate"
 msgstr "Villig å flytte"
 
-#: ../../english/consultants/consultant.defs:57
+#: ../../english/consultants/consultant.defs:61
 msgid ""
 "<total_consultant> Debian consultants listed in <total_country> countries "
 "worldwide."
diff --git a/norwegian/po/countries.nb.po b/norwegian/po/countries.nb.po
index 8f4e3cb10e7..32326382a3b 100644
--- a/norwegian/po/countries.nb.po
+++ b/norwegian/po/countries.nb.po
@@ -421,8 +421,12 @@ msgstr "Vanuatu"
 msgid "South Africa"
 msgstr "Sørafrika"
 
-#~ msgid "Yugoslavia"
-#~ msgstr "Jugoslavia"
+#: ../../english/template/debian/countries.wml:417
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
 
 #~ msgid "Great Britain"
 #~ msgstr "Storbritania"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Jugoslavia"
diff --git a/norwegian/po/date.nb.po b/norwegian/po/date.nb.po
index d18905db70c..e70fcfacbaf 100644
--- a/norwegian/po/date.nb.po
+++ b/norwegian/po/date.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2011-02-07 09:36+0100\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -191,7 +192,6 @@ msgstr "q{[%]d. [%]s}, $mday, $mon_str"
 #. Percent signs are escaped because they are special during pass 2,
 #. replace all % by [%]
 #: ../../english/template/debian/ctime.wml:99
-#| msgid "q{[%]02d [%]s [%]d}, $mday, $mon_str, $year"
 msgid "q{[%]s [%]s}, $mon_str, $year"
 msgstr "q{[%]s [%]d}, $mon_str, $year"
 
diff --git a/norwegian/po/distrib.nb.po b/norwegian/po/distrib.nb.po
index 4b7815f2b0e..b2a5d35a065 100644
--- a/norwegian/po/distrib.nb.po
+++ b/norwegian/po/distrib.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2011-02-07 09:40+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -73,82 +74,12 @@ msgstr "oldstable"
 msgid "Architecture"
 msgstr "Arkitektur"
 
-#: ../../english/distrib/search_contents-form.inc:36
+#: ../../english/distrib/search_contents-form.inc:38
 #: ../../english/distrib/search_packages-form.inc:30
 #: ../../english/distrib/search_packages-form.inc:37
 msgid "any"
 msgstr "hva som helst"
 
-#: ../../english/distrib/search_contents-form.inc:37
-msgid "Intel x86"
-msgstr "Intel x86"
-
-#: ../../english/distrib/search_contents-form.inc:38
-#: ../../english/releases/arches.data:18
-msgid "Motorola 680x0"
-msgstr "Motorola 680x0"
-
-#: ../../english/distrib/search_contents-form.inc:39
-#: ../../english/releases/arches.data:8
-msgid "Alpha"
-msgstr "Alpha"
-
-#: ../../english/distrib/search_contents-form.inc:40
-msgid "AMD64"
-msgstr "AMD64"
-
-#: ../../english/distrib/search_contents-form.inc:41
-#: ../../english/releases/arches.data:23
-msgid "SPARC"
-msgstr "SPARC"
-
-#: ../../english/distrib/search_contents-form.inc:42
-#: ../../english/releases/arches.data:21
-msgid "PowerPC"
-msgstr "PowerPC"
-
-#: ../../english/distrib/search_contents-form.inc:43
-#: ../../english/releases/arches.data:10
-msgid "ARM"
-msgstr "ARM"
-
-#: ../../english/distrib/search_contents-form.inc:44
-msgid "HP PA/RISC"
-msgstr "HP PA/RISC"
-
-#: ../../english/distrib/search_contents-form.inc:45
-msgid "Intel IA-64"
-msgstr "Intel IA-64"
-
-#: ../../english/distrib/search_contents-form.inc:46
-#: ../../english/releases/arches.data:19
-msgid "MIPS (big endian)"
-msgstr "MIPS (big endian)"
-
-#: ../../english/distrib/search_contents-form.inc:47
-#: ../../english/releases/arches.data:20
-msgid "MIPS (little endian)"
-msgstr "MIPS (little endian)"
-
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/releases/arches.data:22
-msgid "IBM S/390"
-msgstr "IBM S/390"
-
-#: ../../english/distrib/search_contents-form.inc:49
-msgid "kFreeBSD (AMD64)"
-msgstr "kFreeBSD (AMD64)"
-
-#: ../../english/distrib/search_contents-form.inc:50
-#| msgid "Intel x86"
-msgid "kFreeBSD (Intel x86)"
-msgstr "kFreeBSD (Intel x86)"
-
-#. TODO: Hurd should be listed as a separate distribution
-#: ../../english/distrib/search_contents-form.inc:52
-msgid "Hurd (i386)"
-msgstr "Hurd (i386)"
-
 #: ../../english/distrib/search_packages-form.inc:12
 msgid "Search on"
 msgstr "Søk etter"
@@ -185,37 +116,96 @@ msgstr "Bidrag"
 msgid "non-free"
 msgstr "ikke-fri"
 
+#: ../../english/releases/arches.data:8
+msgid "Alpha"
+msgstr "Alpha"
+
 #: ../../english/releases/arches.data:9
 msgid "64-bit PC (amd64)"
 msgstr "64-bit PC (amd64)"
 
+#: ../../english/releases/arches.data:10
+msgid "ARM"
+msgstr "ARM"
+
 #: ../../english/releases/arches.data:11
 msgid "EABI ARM"
 msgstr "EABI ARM"
 
 #: ../../english/releases/arches.data:12
-#| msgid "HP PA/RISC"
+msgid "Hard Float ABI ARM"
+msgstr ""
+
+#: ../../english/releases/arches.data:13
 msgid "HP PA-RISC"
 msgstr "HP PA-RISC"
 
-#: ../../english/releases/arches.data:13
-#| msgid "Hurd (i386)"
+#: ../../english/releases/arches.data:14
 msgid "Hurd 32-bit PC (i386)"
 msgstr "Hurd 32-bit PC (i386)"
 
-#: ../../english/releases/arches.data:14
+#: ../../english/releases/arches.data:15
 msgid "32-bit PC (i386)"
 msgstr "32-bit PC (i386)"
 
-#: ../../english/releases/arches.data:15
-#| msgid "Intel IA-64"
+#: ../../english/releases/arches.data:16
 msgid "Intel Itanium IA-64"
 msgstr "Intel Itanium IA-64"
 
-#: ../../english/releases/arches.data:16
+#: ../../english/releases/arches.data:17
 msgid "kFreeBSD 32-bit PC (i386)"
 msgstr "kFreeBSD 32-bit PC (i386)"
 
-#: ../../english/releases/arches.data:17
+#: ../../english/releases/arches.data:18
 msgid "kFreeBSD 64-bit PC (amd64)"
 msgstr "kFreeBSD 64-bit PC (amd64)"
+
+#: ../../english/releases/arches.data:19
+msgid "Motorola 680x0"
+msgstr "Motorola 680x0"
+
+#: ../../english/releases/arches.data:20
+msgid "MIPS (big endian)"
+msgstr "MIPS (big endian)"
+
+#: ../../english/releases/arches.data:21
+msgid "MIPS (little endian)"
+msgstr "MIPS (little endian)"
+
+#: ../../english/releases/arches.data:22
+msgid "PowerPC"
+msgstr "PowerPC"
+
+#: ../../english/releases/arches.data:23
+msgid "IBM S/390"
+msgstr "IBM S/390"
+
+#: ../../english/releases/arches.data:24
+msgid "IBM System z"
+msgstr ""
+
+#: ../../english/releases/arches.data:25
+msgid "SPARC"
+msgstr "SPARC"
+
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
+
+#~| msgid "Intel x86"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
+
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
+
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
+
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
+
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
+
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/norwegian/po/doc.nb.po b/norwegian/po/doc.nb.po
index 9164f6c65cf..a9916364265 100644
--- a/norwegian/po/doc.nb.po
+++ b/norwegian/po/doc.nb.po
@@ -4,55 +4,341 @@ msgstr ""
 "PO-Revision-Date: 2011-02-07 09:41+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/doc/books.def:15
+#: ../../english/doc/books.data:30
+msgid ""
+"Written by two Debian developers, this free book\n"
+"  started as a translation of their French best-seller known as Cahier de\n"
+"  l'admin Debian (published by Eyrolles). Accessible to all, this book\n"
+"  teaches the essentials to anyone who wants to become an effective and\n"
+"  independent Debian GNU/Linux administrator.  \n"
+"  It covers all the topics that a competent Linux administrator should\n"
+"  master, from the installation and the update of the system, up to the\n"
+"  creation of packages and the compilation of the kernel, but also\n"
+"  monitoring, backup and migration, without forgetting advanced topics\n"
+"  like SELinux setup to secure services, automated installations, or\n"
+"  virtualization with Xen, KVM or LXC."
+msgstr ""
+
+#: ../../english/doc/books.data:50
+msgid ""
+"The aim of this freely available, up-to-date, book is to get you up to\n"
+"  speed with Debian (including both the current stable release and the\n"
+"  current unstable distribution). It is comprehensive with basic support\n"
+"  for the user who installs and maintains the system themselves (whether\n"
+"  in the home, office, club, or school)."
+msgstr ""
+
+#: ../../english/doc/books.data:61
+msgid "Sarge CD with installer and a selection of packages"
+msgstr ""
+
+#: ../../english/doc/books.data:62
+msgid "Live CD with Knoppix"
+msgstr ""
+
+#: ../../english/doc/books.data:65
+msgid ""
+"Beginners and advanced users alike will find this book to be a\n"
+"  comprehensive source of information on using Debian for desktops,\n"
+"  intranet and internet servers, and development.  It also contains\n"
+"  background information on the project and extensive coverage of\n"
+"  Debian's unique package management system."
+msgstr ""
+
+#: ../../english/doc/books.data:77 ../../english/doc/books.data:180
+#: ../../english/doc/books.data:229 ../../english/doc/books.data:274
+msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
+msgstr ""
+
+#: ../../english/doc/books.data:80 ../../english/doc/books.data:183
+#: ../../english/doc/books.data:232 ../../english/doc/books.data:277
+msgid ""
+"This book introduces the concepts and techniques of the Debian\n"
+"  operating system, explaining their usage and pitfalls, and\n"
+"  illustrating the thinking behind each of the approaches. The goal is\n"
+"  not to be a reference book, but to give the reader enough insight\n"
+"  into the workings of the project and operating system to learn and\n"
+"  embrace the sophisticated and elegant, sometimes at first slightly\n"
+"  non-intuitive solutions that have evolved as part of the Debian\n"
+"  system over the past decade. While targeted at the well-versed\n"
+"  UNIX/Linux administrator, the book can also serve as an excellent\n"
+"  resource alongside a standard Linux reference to bootstrap one's\n"
+"  Linux experience in Debian's bottom-up philosophy."
+msgstr ""
+
+#: ../../english/doc/books.data:100
+msgid ""
+"A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
+"  in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+"from\n"
+"  working with text, images, and sound to productivity and networking\n"
+"  issues. Like the software the book describes, the book is copylefted\n"
+"  and its source data is available."
+msgstr ""
+
+#: ../../english/doc/books.data:113
+msgid "Debian 2.2 ARM architecture"
+msgstr ""
+
+#: ../../english/doc/books.data:116
+msgid ""
+"This book is for developers working with GNU/Linux on ARM processors.\n"
+"  It covers some devices specifically for quick set-up (LART, Assabet, "
+"Psion5).\n"
+"  It also gives generic information, tools and techniques. The GNU\n"
+"  toolchain is covered in native and cross-compiler form, as are "
+"bootloaders,\n"
+"  kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+"also\n"
+"  includes extensive tutorial information on GNU/Linux basics for "
+"developers\n"
+"  coming from other platforms.\n"
+"  It is not specific to Debian, but the Aleph\n"
+"  ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+"you\n"
+"  will be working from this distribution and preferably have a Debian based\n"
+"  host machine too."
+msgstr ""
+
+#: ../../english/doc/books.data:136
+msgid ""
+"Learning Debian GNU/Linux guides the new user of Linux through the\n"
+"  installation and configuration of Debian GNU/Linux.\n"
+"  Windows users will gain a gentle introduction to this exciting\n"
+"  computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</q>."
+msgstr ""
+
+#: ../../english/doc/books.data:145
+msgid "Debian 2.1"
+msgstr ""
+
+#: ../../english/doc/books.data:148
+msgid ""
+"Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
+"  include Debian Linux, networking, programming tools, GUI, desktop\n"
+"  publishing, business, fun things, and multimedia. 30 days of free e-mail\n"
+"  support included."
+msgstr ""
+
+#: ../../english/doc/books.data:163
+msgid "DVD Debian Squeeze i386/amd64"
+msgstr ""
+
+#: ../../english/doc/books.data:166
+msgid ""
+"The first French book about Debian is already in its fifth edition. It\n"
+"  covers all aspects of the administration of Debian from the installation\n"
+"  to the configuration of network services.\n"
+"  Written by two Debian developers, this book can be of interest to many\n"
+"  people: the beginner wishing to discover Debian, the advanced user "
+"looking\n"
+"  for tips to enhance his mastership of the Debian tools and the\n"
+"  administrator who wants to build a reliable network with Debian."
+msgstr ""
+
+#: ../../english/doc/books.data:205
+msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+msgstr ""
+
+#: ../../english/doc/books.data:208
+msgid ""
+"An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+"mode=viewone&amp;titnr=254925022\">\n"
+"  publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+"29.95\n"
+"  euro (as of 2008)."
+msgstr ""
+
+#: ../../english/doc/books.data:218
+msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+msgstr ""
+
+#: ../../english/doc/books.data:221
+msgid ""
+"This book teaches you how to install and configure the system and also how "
+"to use Debian in a professional environment.  It shows the full potential of "
+"the distribution (in its current version 6.0) and provides a practical "
+"manual for all users who want to learn more about Debian and its range of "
+"services."
+msgstr ""
+
+#: ../../english/doc/books.data:249
+msgid ""
+"2 editions: One with no CD, the other with Official CD (i386, contrib and "
+"sources)"
+msgstr ""
+
+#: ../../english/doc/books.data:252
+msgid ""
+"The book covers all steps of planning and installing Debian GNU/Linux on\n"
+"  PC based hardware, including important applications like the X Window\n"
+"  System, window managers and desktop environments (KDE, GNOME) and a\n"
+"  selection of important system services. Unix/Linux basics and\n"
+"  concepts together with system usage and important components (bash,\n"
+"  system services and important commands) are introduced.\n"
+"  There is an explanation of Debian's package format and how to create\n"
+"  packages in this format. It also includes an overview of standard Linux\n"
+"  applications (networking, software development, LaTeX and office\n"
+"  suites). Strong emphasis is on networking and system\n"
+"  administration issues, like planing and building of a dial-in router or\n"
+"  a server for Windows based clients (Samba)."
+msgstr ""
+
+#: ../../english/doc/books.data:295
+msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+msgstr ""
+
+#: ../../english/doc/books.data:298
+msgid ""
+"This book is dictionary style and covers various tips for beginners\n"
+"  and intermediate skill users; installation via various ways,\n"
+"  desktop customize, troubleshooting, profitable knowhow and so on."
+msgstr ""
+
+#: ../../english/doc/books.data:311
+msgid ""
+"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+"     CD)"
+msgstr ""
+
+#: ../../english/doc/books.data:315
+msgid ""
+"This is the latest book for Sarge of the series that has been\n"
+"  supported as a standard bible of Debian in Japan.\n"
+"  This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+"  as installation, desktop environments, system administration, and\n"
+"  server configuration. Furthermore, this book also includes commercial\n"
+"  font package that decorates your desktop. This book might be useful\n"
+"  for all Debian users from beginners to advanced users."
+msgstr ""
+
+#: ../../english/doc/books.data:330
+msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+msgstr ""
+
+#: ../../english/doc/books.data:333
+msgid ""
+"This book covers general topics about Debian GNU/Linux:\n"
+"  installation, APT and dpkg, shell, X Window System, networking, system\n"
+"  administration, kernel setup, sharing with Windows, building servers\n"
+"  and so on.\n"
+"  You will be able to install and start to use Debian GNU/Linux Japanese\n"
+"  environment very easily with the customized CDs."
+msgstr ""
+
+#: ../../english/doc/books.data:349
+msgid "1 unofficial Woody, 3 Potato rev0"
+msgstr ""
+
+#: ../../english/doc/books.data:352
+msgid ""
+"This book gives a brief guide to installation of Debian\n"
+"  GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+"and\n"
+"  maintenance of system and networking,\n"
+"  X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+"  This book also includes a guide for maintainers, which stimulates\n"
+"  people in Korea to become official Debian maintainers."
+msgstr ""
+
+#: ../../english/doc/books.data:366
+msgid "Three official potato r3 CDs and an unofficial woody CD"
+msgstr ""
+
+#: ../../english/doc/books.data:369
+msgid ""
+"This book introduces readers to Debian GNU/Linux with many\n"
+"  hands-on tutorials and tips. Written in Korean, this book covers\n"
+"  comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+"  package installation, setting up X, connecting to Internet, network\n"
+"  maintenance, and more. This book provides a handful of tips on setting up\n"
+"  Debian for Korean language environment, and it is good for newcomers, too."
+msgstr ""
+
+#: ../../english/doc/books.data:391
+msgid "Debian GNU/Linux 3.1r0 CD1"
+msgstr ""
+
+#: ../../english/doc/books.data:394
+msgid ""
+"The first Persian book about Debian GNU/Linux. This book helps you\n"
+"  to install Debian GNU/Linux and set up network services like web,\n"
+"  database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+"  using GNU/Linux and Debian's powerful package management system."
+msgstr ""
+
+#: ../../english/doc/books.data:410
+msgid ""
+"This book is divided into four parts: Basic concepts, Management of\n"
+"  GNU/Linux, Administration of the system and Advanced operations. Each "
+"chapter\n"
+"  explains in depth the features of the operating system. The first\n"
+"  chapters explain the structure of GNU/Linux. These chapters will help\n"
+"  the reader to understand how the system uses basic resources such as\n"
+"  the processor and memory. A detailed analysis about filesystems such as\n"
+"  Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+"  for their needs. Many figures throughout the book show aspects about\n"
+"  the performance of the system. This book caters for college students\n"
+"  and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+"  Debian Sarge."
+msgstr ""
+
+#: ../../english/doc/books.data:433
+msgid ""
+"This is the right book for you to learn how to create basic and complex IT "
+"platforms using only Free Software. Inside it you will find a wide range of "
+"procedures reviewed and adjusted to fit into the best practices of "
+"technological infrastructure implementation. This easy to read and "
+"comprehensive guide will take you by the hand to achieve specific objectives "
+"with the Debian GNU/Linux operating system."
+msgstr ""
+
+#: ../../english/doc/books.def:38
 msgid "Author:"
 msgstr "Forfatter:"
 
-#: ../../english/doc/books.def:18
+#: ../../english/doc/books.def:41
 msgid "email:"
 msgstr "e-post:"
 
-#: ../../english/doc/books.def:22
+#: ../../english/doc/books.def:45
 msgid "Available at:"
 msgstr "Tilgjengelig hos:"
 
-#: ../../english/doc/books.def:25
-msgid "Language:"
-msgstr "Språk:"
-
-#: ../../english/doc/books.def:29
+#: ../../english/doc/books.def:48
 msgid "CD Included:"
 msgstr "Inkludert CD:"
 
-#: ../../english/doc/books.def:32
+#: ../../english/doc/books.def:51
 msgid "Publisher:"
 msgstr "Forlag:"
 
-#: ../../english/doc/manuals.defs:29
+#: ../../english/doc/manuals.defs:26
 msgid "Authors:"
 msgstr "Forfattere:"
 
-#: ../../english/doc/manuals.defs:36
+#: ../../english/doc/manuals.defs:33
 msgid "Editors:"
 msgstr "Redaktører:"
 
-#: ../../english/doc/manuals.defs:43
+#: ../../english/doc/manuals.defs:40
 msgid "Maintainer:"
 msgstr "Ansvarlig:"
 
-#: ../../english/doc/manuals.defs:50
+#: ../../english/doc/manuals.defs:47
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../english/doc/manuals.defs:57
+#: ../../english/doc/manuals.defs:54
 msgid "Availability:"
 msgstr "Tilgjengelighet:"
 
-#: ../../english/doc/manuals.defs:88
+#: ../../english/doc/manuals.defs:86
 msgid "Latest version:"
 msgstr "Siste versjon:"
 
@@ -60,13 +346,13 @@ msgstr "Siste versjon:"
 msgid "(version <get-var version />)"
 msgstr "(versjon <get-var version />)"
 
-#: ../../english/doc/manuals.defs:132
+#: ../../english/doc/manuals.defs:133 ../../english/releases/arches.data:34
 msgid "plain text"
 msgstr "ren tekst"
 
 #. The ddp_pkg_loc variable contains 
-#. <a href="http://svn.debian.org/wsvn/ddp/manuals/trunk/manuals.sgml/[package]/">[package]</a>
-#: ../../english/doc/manuals.defs:151
+#. <a href="http://anonscm.debian.org/viewvc/ddp/manuals/trunk/manuals.sgml/[package]/">[package]</a>
+#: ../../english/doc/manuals.defs:152
 msgid ""
 "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
 "ddp_pkg_loc />."
@@ -74,7 +360,7 @@ msgstr ""
 "Bruk <a href=\"cvs\">SVN</a> for å hente SGML-kildeteksten for <get-var "
 "ddp_pkg_loc />."
 
-#: ../../english/doc/manuals.defs:157
+#: ../../english/doc/manuals.defs:158
 msgid ""
 "CVS sources working copy: set <code>CVSROOT</code>\n"
 "  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -84,14 +370,25 @@ msgstr ""
 "  til <kbd>:ext:<var>brukerid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
 "  og hent ut modulen <kbd>boot-floppies/documentation</kbd>."
 
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:163
 msgid "CVS via web"
 msgstr "CVS via nettet"
 
-#: ../../english/doc/manuals.defs:166 ../../english/doc/manuals.defs:170
+#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
 msgid "Debian package"
 msgstr "Debianpakke"
 
-#: ../../english/doc/manuals.defs:176 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
 msgid "Debian package (archived)"
 msgstr "Debianpakke (arkivert)"
+
+#: ../../english/releases/arches.data:32
+msgid "HTML"
+msgstr ""
+
+#: ../../english/releases/arches.data:33
+msgid "PDF"
+msgstr ""
+
+#~ msgid "Language:"
+#~ msgstr "Språk:"
diff --git a/norwegian/po/l10n.nb.po b/norwegian/po/l10n.nb.po
index 1ff92aac1f0..93d4aa0af44 100644
--- a/norwegian/po/l10n.nb.po
+++ b/norwegian/po/l10n.nb.po
@@ -4,90 +4,91 @@ msgstr ""
 "PO-Revision-Date: 2008-10-01 19:47+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/international/l10n/dtc.def:11
+#: ../../english/international/l10n/dtc.def:10
 msgid "File"
 msgstr "Fil"
 
-#: ../../english/international/l10n/dtc.def:15
+#: ../../english/international/l10n/dtc.def:14
 msgid "Package"
 msgstr "Pakke"
 
-#: ../../english/international/l10n/dtc.def:19
+#: ../../english/international/l10n/dtc.def:18
 msgid "Score"
 msgstr "Poeng"
 
-#: ../../english/international/l10n/dtc.def:23
+#: ../../english/international/l10n/dtc.def:22
 msgid "Translator"
 msgstr "Oversetter"
 
-#: ../../english/international/l10n/dtc.def:27
+#: ../../english/international/l10n/dtc.def:26
 msgid "Team"
 msgstr "Lag"
 
-#: ../../english/international/l10n/dtc.def:31
+#: ../../english/international/l10n/dtc.def:30
 msgid "Date"
 msgstr "Dato"
 
-#: ../../english/international/l10n/dtc.def:35
+#: ../../english/international/l10n/dtc.def:34
 msgid "Status"
 msgstr "Status"
 
-#: ../../english/international/l10n/dtc.def:39
+#: ../../english/international/l10n/dtc.def:38
 msgid "Strings"
 msgstr "Strenger"
 
-#: ../../english/international/l10n/dtc.def:43
+#: ../../english/international/l10n/dtc.def:42
 msgid "Bug"
 msgstr "Feil"
 
-#: ../../english/international/l10n/dtc.def:50
+#: ../../english/international/l10n/dtc.def:49
 msgid "<get-var lang />, as spoken in <get-var country />"
 msgstr "<get-var lang />, som det snakkes i <get-var country />"
 
-#: ../../english/international/l10n/dtc.def:55
+#: ../../english/international/l10n/dtc.def:54
 msgid "Unknown language"
 msgstr "Ukjent språk"
 
-#: ../../english/international/l10n/dtc.def:65
+#: ../../english/international/l10n/dtc.def:64
 msgid "This page was generated with data collected on: <get-var date />."
 msgstr "Denne siden ble generert med data samlet: <get-var date />."
 
-#: ../../english/international/l10n/dtc.def:70
+#: ../../english/international/l10n/dtc.def:69
 msgid "Before working on these files, make sure they are up to date!"
 msgstr "Vær sikker på at disse filere er oppdatert før du jobber med dem."
 
-#: ../../english/international/l10n/dtc.def:80
+#: ../../english/international/l10n/dtc.def:79
 msgid "Section: <get-var name />"
 msgstr "Seksjon: <get-var name />"
 
-#: ../../english/international/l10n/menu.def:9
+#: ../../english/international/l10n/menu.def:10
 msgid "L10n"
 msgstr "L10n"
 
-#: ../../english/international/l10n/menu.def:13
+#: ../../english/international/l10n/menu.def:14
 msgid "Language list"
 msgstr "Liste over språk"
 
-#: ../../english/international/l10n/menu.def:17
+#: ../../english/international/l10n/menu.def:18
 msgid "Ranking"
 msgstr "Rangering"
 
-#: ../../english/international/l10n/menu.def:21
+#: ../../english/international/l10n/menu.def:22
 msgid "Hints"
 msgstr "Tips"
 
-#: ../../english/international/l10n/menu.def:25
+#: ../../english/international/l10n/menu.def:26
 msgid "Errors"
 msgstr "Feil"
 
-#: ../../english/international/l10n/menu.def:29
+#: ../../english/international/l10n/menu.def:30
 msgid "POT files"
 msgstr "POT-filer"
 
-#: ../../english/international/l10n/menu.def:33
+#: ../../english/international/l10n/menu.def:34
 msgid "Hints for translators"
 msgstr "Tips for oversettere"
diff --git a/norwegian/po/langs.nb.po b/norwegian/po/langs.nb.po
index 12130b365a0..a89bee23d07 100644
--- a/norwegian/po/langs.nb.po
+++ b/norwegian/po/langs.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2011-04-25 21:27+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,186 +42,186 @@ msgid "French"
 msgstr "fransk"
 
 #: ../../english/template/debian/language_names.wml:16
+msgid "Galician"
+msgstr "galisisk"
+
+#: ../../english/template/debian/language_names.wml:17
 msgid "German"
 msgstr "tysk"
 
-#: ../../english/template/debian/language_names.wml:17
+#: ../../english/template/debian/language_names.wml:18
 msgid "Italian"
 msgstr "italiensk"
 
-#: ../../english/template/debian/language_names.wml:18
+#: ../../english/template/debian/language_names.wml:19
 msgid "Japanese"
 msgstr "japansk"
 
-#: ../../english/template/debian/language_names.wml:19
+#: ../../english/template/debian/language_names.wml:20
 msgid "Korean"
 msgstr "koreansk"
 
-#: ../../english/template/debian/language_names.wml:20
+#: ../../english/template/debian/language_names.wml:21
 msgid "Spanish"
 msgstr "spansk"
 
-#: ../../english/template/debian/language_names.wml:21
+#: ../../english/template/debian/language_names.wml:22
 msgid "Portuguese"
 msgstr "portugisisk"
 
-#: ../../english/template/debian/language_names.wml:22
+#: ../../english/template/debian/language_names.wml:23
 msgid "Portuguese (Brazilian)"
 msgstr "portugisisk (Brasil)"
 
-#: ../../english/template/debian/language_names.wml:23
+#: ../../english/template/debian/language_names.wml:24
 msgid "Chinese"
 msgstr "kinesisk"
 
-#: ../../english/template/debian/language_names.wml:24
+#: ../../english/template/debian/language_names.wml:25
 msgid "Chinese (China)"
 msgstr "kinesisk (Kina)"
 
-#: ../../english/template/debian/language_names.wml:25
+#: ../../english/template/debian/language_names.wml:26
 msgid "Chinese (Hong Kong)"
 msgstr "kinesisk (Hong Kong)"
 
-#: ../../english/template/debian/language_names.wml:26
+#: ../../english/template/debian/language_names.wml:27
 msgid "Chinese (Taiwan)"
 msgstr "kinesisk (Taiwan)"
 
-#: ../../english/template/debian/language_names.wml:27
+#: ../../english/template/debian/language_names.wml:28
 msgid "Chinese (Traditional)"
 msgstr "kinesisk (tradisjonell)"
 
-#: ../../english/template/debian/language_names.wml:28
+#: ../../english/template/debian/language_names.wml:29
 msgid "Chinese (Simplified)"
 msgstr "kinesisk (forenklet)"
 
-#: ../../english/template/debian/language_names.wml:29
+#: ../../english/template/debian/language_names.wml:30
 msgid "Swedish"
 msgstr "svensk"
 
-#: ../../english/template/debian/language_names.wml:30
+#: ../../english/template/debian/language_names.wml:31
 msgid "Polish"
 msgstr "polsk"
 
-#: ../../english/template/debian/language_names.wml:31
+#: ../../english/template/debian/language_names.wml:32
 msgid "Norwegian"
 msgstr "norsk&nbsp;(bokm&aring;l)"
 
-#: ../../english/template/debian/language_names.wml:32
+#: ../../english/template/debian/language_names.wml:33
 msgid "Turkish"
 msgstr "tyrkisk"
 
-#: ../../english/template/debian/language_names.wml:33
+#: ../../english/template/debian/language_names.wml:34
 msgid "Russian"
 msgstr "russisk"
 
-#: ../../english/template/debian/language_names.wml:34
+#: ../../english/template/debian/language_names.wml:35
 msgid "Czech"
 msgstr "tsjekkisk"
 
-#: ../../english/template/debian/language_names.wml:35
+#: ../../english/template/debian/language_names.wml:36
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../../english/template/debian/language_names.wml:36
+#: ../../english/template/debian/language_names.wml:37
 msgid "Hungarian"
 msgstr "ungarsk"
 
-#: ../../english/template/debian/language_names.wml:37
+#: ../../english/template/debian/language_names.wml:38
 msgid "Romanian"
 msgstr "rumensk"
 
-#: ../../english/template/debian/language_names.wml:38
+#: ../../english/template/debian/language_names.wml:39
 msgid "Slovak"
 msgstr "slovakisk"
 
-#: ../../english/template/debian/language_names.wml:39
+#: ../../english/template/debian/language_names.wml:40
 msgid "Greek"
 msgstr "gresk"
 
-#: ../../english/template/debian/language_names.wml:40
+#: ../../english/template/debian/language_names.wml:41
 msgid "Catalan"
 msgstr "katalansk"
 
-#: ../../english/template/debian/language_names.wml:41
+#: ../../english/template/debian/language_names.wml:42
 msgid "Indonesian"
 msgstr "indonesisk"
 
-#: ../../english/template/debian/language_names.wml:42
+#: ../../english/template/debian/language_names.wml:43
 msgid "Lithuanian"
 msgstr "litauisk"
 
-#: ../../english/template/debian/language_names.wml:43
+#: ../../english/template/debian/language_names.wml:44
 msgid "Slovene"
 msgstr "slovensk"
 
-#: ../../english/template/debian/language_names.wml:44
+#: ../../english/template/debian/language_names.wml:45
 msgid "Bulgarian"
 msgstr "bulgarsk"
 
-#: ../../english/template/debian/language_names.wml:45
+#: ../../english/template/debian/language_names.wml:46
 msgid "Tamil"
 msgstr "tamil"
 
 #. for now, the following are only needed if you intend to translate intl/l10n
-#: ../../english/template/debian/language_names.wml:47
+#: ../../english/template/debian/language_names.wml:48
 msgid "Afrikaans"
 msgstr "afrikaans"
 
-#: ../../english/template/debian/language_names.wml:48
+#: ../../english/template/debian/language_names.wml:49
 msgid "Albanian"
 msgstr "albansk"
 
-#: ../../english/template/debian/language_names.wml:49
+#: ../../english/template/debian/language_names.wml:50
 msgid "Asturian"
 msgstr "asturisk"
 
-#: ../../english/template/debian/language_names.wml:50
+#: ../../english/template/debian/language_names.wml:51
 msgid "Amharic"
 msgstr "amharisk"
 
-#: ../../english/template/debian/language_names.wml:51
+#: ../../english/template/debian/language_names.wml:52
 msgid "Azerbaijani"
 msgstr "aserbajdsjansk"
 
-#: ../../english/template/debian/language_names.wml:52
+#: ../../english/template/debian/language_names.wml:53
 msgid "Basque"
 msgstr "baskisk"
 
-#: ../../english/template/debian/language_names.wml:53
+#: ../../english/template/debian/language_names.wml:54
 msgid "Belarusian"
 msgstr "hviterussisk"
 
-#: ../../english/template/debian/language_names.wml:54
+#: ../../english/template/debian/language_names.wml:55
 msgid "Bengali"
 msgstr "bengali"
 
-#: ../../english/template/debian/language_names.wml:55
+#: ../../english/template/debian/language_names.wml:56
 msgid "Bosnian"
 msgstr "bosnisk"
 
-#: ../../english/template/debian/language_names.wml:56
+#: ../../english/template/debian/language_names.wml:57
 msgid "Breton"
 msgstr "bretonsk"
 
-#: ../../english/template/debian/language_names.wml:57
+#: ../../english/template/debian/language_names.wml:58
 msgid "Cornish"
 msgstr "kornisk"
 
-#: ../../english/template/debian/language_names.wml:58
+#: ../../english/template/debian/language_names.wml:59
 msgid "Estonian"
 msgstr "estlandsk"
 
-#: ../../english/template/debian/language_names.wml:59
+#: ../../english/template/debian/language_names.wml:60
 msgid "Faeroese"
 msgstr "færøysk"
 
-#: ../../english/template/debian/language_names.wml:60
+#: ../../english/template/debian/language_names.wml:61
 msgid "Gaelic (Scots)"
 msgstr "skotsk-gælisk"
 
-#: ../../english/template/debian/language_names.wml:61
-msgid "Galician"
-msgstr "galisisk"
-
 #: ../../english/template/debian/language_names.wml:62
 msgid "Georgian"
 msgstr "georgisk"
diff --git a/norwegian/po/legal.nb.po b/norwegian/po/legal.nb.po
index 120b4f62644..3b68d1cc6b3 100644
--- a/norwegian/po/legal.nb.po
+++ b/norwegian/po/legal.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2006-08-12 17:51+0200\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/norwegian/po/mailinglists.nb.po b/norwegian/po/mailinglists.nb.po
index 12a05e7147a..5ad79fdd49f 100644
--- a/norwegian/po/mailinglists.nb.po
+++ b/norwegian/po/mailinglists.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2006-08-12 17:51+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,8 +36,11 @@ msgstr ""
 "om blir offentliggjort."
 
 #: ../../english/MailingLists/mklist.tags:15
-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 subscribe to (the number of "
+"subscriptions is limited, if your request doesn't succeed, please use <a "
+"href=\"./#subunsub\">another method</a>):"
+msgstr ""
 
 #: ../../english/MailingLists/mklist.tags:18
 msgid "No description given"
@@ -100,8 +104,11 @@ msgstr ""
 "tilgjengelig, for å abonnere på postlister. "
 
 #: ../../english/MailingLists/mklist.tags:54
-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 unsubscribe from (the number of "
+"unsubscriptions is limited, if your request doesn't succeed, please use <a "
+"href=\"./#subunsub\">another method</a>):"
+msgstr ""
 
 #: ../../english/MailingLists/mklist.tags:57
 msgid "Unsubscribe"
@@ -114,3 +121,9 @@ msgstr "åpen"
 #: ../../english/MailingLists/mklist.tags:63
 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å:"
diff --git a/norwegian/po/newsevents.nb.po b/norwegian/po/newsevents.nb.po
index fb65be16966..684a0cff2a8 100644
--- a/norwegian/po/newsevents.nb.po
+++ b/norwegian/po/newsevents.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2011-02-10 20:38+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -13,7 +14,6 @@ msgid "Debian News"
 msgstr "Nyheter om Debian"
 
 #: ../../english/News/news.rdf.in:19
-#| msgid "Latest News"
 msgid "Debian Latest News"
 msgstr "Siste nytt om Debian"
 
@@ -21,6 +21,10 @@ msgstr "Siste nytt om Debian"
 msgid "p<get-var page />"
 msgstr "s.<get-var page />"
 
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr ""
+
 #: ../../english/events/speakers/speakers.defs:11
 msgid "Name:"
 msgstr "Navn:"
@@ -54,12 +58,10 @@ msgid "Author:"
 msgstr "Forfatter:"
 
 #: ../../english/events/talks.defs:15
-#| msgid "Languages:"
 msgid "Language:"
 msgstr "Språk:"
 
 #: ../../english/events/talks.defs:19
-#| msgid "Name:"
 msgid "Date:"
 msgstr "Dato:"
 
@@ -150,6 +152,187 @@ msgstr ""
 msgid "<get-var url /> (dead link)"
 msgstr "<get-var url /> (død peker)"
 
+#: ../../english/template/debian/projectnews/boilerplates.wml:35
+msgid ""
+"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
+"the Debian community. Topics covered in this issue include:"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:56
+#: ../../english/template/debian/projectnews/boilerplates.wml:77
+msgid ""
+"According to the <a href=\"http://udd.debian.org/bugs.cgi\">Bugs Search "
+"interface of the Ultimate Debian Database</a>, the upcoming release, Debian  "
+"<q><get-var release /></q>, is currently affected by <get-var testing /> "
+"Release-Critical bugs. Ignoring bugs which are easily solved or on the way "
+"to being solved, roughly speaking, about <get-var tobefixed /> Release-"
+"Critical bugs remain to be solved for the release to happen."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:57
+msgid ""
+"There are also some <a href=\"http://wiki.debian.org/ProjectNews/RC-Stats"
+"\">hints on how to interpret</a> these numbers."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:78
+msgid ""
+"There are also <a href=\"<get-var url />\">more detailed statistics</a> as "
+"well as some <a href=\"http://wiki.debian.org/ProjectNews/RC-Stats\">hints "
+"on how to interpret</a> these numbers."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:102
+msgid ""
+"<a href=\"<get-var link />\">Currently</a> <a href=\"m4_DEVEL/wnpp/orphaned"
+"\"><get-var orphaned /> packages are orphaned</a> and <a href=\"m4_DEVEL/"
+"wnpp/rfa\"><get-var rfa /> packages are up for adoption</a>: please visit "
+"the complete list of <a href=\"m4_DEVEL/wnpp/help_requested\">packages which "
+"need your help</a>."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:114
+msgid ""
+"Please help us create this newsletter. We still need more volunteer writers "
+"to watch the Debian community and report about what is going on. Please see "
+"the <a href=\"http://wiki.debian.org/ProjectNews/HowToContribute"
+"\">contributing page</a> to find out how to help. We're looking forward to "
+"receiving your mail at <a href=\"mailto:debian-publicity@lists.debian.org"
+"\">debian-publicity@lists.debian.org</a>."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:175
+msgid ""
+"Please note that these are a selection of the more important security "
+"advisories of the last weeks. If you need to be kept up to date about "
+"security advisories released by the Debian Security Team, please subscribe "
+"to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
+"\"<get-var url-stable-announce />\">stable updates list</a>) for "
+"announcements."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:176
+msgid ""
+"Please note that these are a selection of the more important security "
+"advisories of the last weeks. If you need to be kept up to date about "
+"security advisories released by the Debian Security Team, please subscribe "
+"to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
+"\"<get-var url-stable-announce />\">stable updates list</a> or <a href="
+"\"<get-var url-volatile-announce />\">volatile list</a>, for <q><get-var old-"
+"stable /></q>, the oldstable distribution) for announcements."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:185
+msgid ""
+"Debian's Stable Release Team released an update announcement for the "
+"package: "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:187
+#: ../../english/template/debian/projectnews/boilerplates.wml:200
+#: ../../english/template/debian/projectnews/boilerplates.wml:213
+#: ../../english/template/debian/projectnews/boilerplates.wml:344
+#: ../../english/template/debian/projectnews/boilerplates.wml:358
+msgid ", "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:188
+#: ../../english/template/debian/projectnews/boilerplates.wml:201
+#: ../../english/template/debian/projectnews/boilerplates.wml:214
+#: ../../english/template/debian/projectnews/boilerplates.wml:345
+#: ../../english/template/debian/projectnews/boilerplates.wml:359
+msgid " and "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:189
+#: ../../english/template/debian/projectnews/boilerplates.wml:202
+#: ../../english/template/debian/projectnews/boilerplates.wml:215
+msgid ". "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:189
+#: ../../english/template/debian/projectnews/boilerplates.wml:202
+#: ../../english/template/debian/projectnews/boilerplates.wml:215
+msgid "Please read them carefully and take the proper measures."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:198
+msgid "Debian's Backports Team released advisories for these packages: "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:211
+msgid ""
+"Debian's Security Team recently released advisories for these packages "
+"(among others): "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:240
+msgid ""
+"<get-var num-newpkg /> packages were added to the unstable Debian archive "
+"recently."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:242
+msgid " <a href=\"<get-var url-newpkg />\">Among many others</a> are:"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:269
+msgid "There are several upcoming Debian-related events:"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:275
+msgid ""
+"You can find more information about Debian-related events and talks on the "
+"<a href=\"<get-var events-section />\">events section</a> of the Debian web "
+"site, or subscribe to one of our events mailing lists for different regions: "
+"<a href=\"<get-var events-ml-eu />\">Europe</a>, <a href=\"<get-var events-"
+"ml-nl />\">Netherlands</a>, <a href=\"<get-var events-ml-ha />\">Hispanic "
+"America</a>, <a href=\"<get-var events-ml-na />\">North America</a>."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:300
+msgid ""
+"Do you want to organise a Debian booth or a Debian install party? Are you "
+"aware of other upcoming Debian-related events? Have you delivered a Debian "
+"talk that you want to link on our <a href=\"<get-var events-talks />\">talks "
+"page</a>? Send an email to the <a href=\"<get-var events-team />\">Debian "
+"Events Team</a>."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:322
+msgid ""
+"<get-var dd-num /> applicants have been <a href=\"<get-var dd-url />"
+"\">accepted</a> as Debian Developers"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:329
+msgid ""
+"<get-var dm-num /> applicants have been <a href=\"<get-var dm-url />"
+"\">accepted</a> as Debian Maintainers"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:336
+msgid ""
+"<get-var uploader-num /> people have <a href=\"<get-var uploader-url />"
+"\">started to maintain packages</a>"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:381
+msgid ""
+"<get-var eval-newcontributors-text-list /> since the previous issue of the "
+"Debian Project News. Please welcome <get-var eval-newcontributors-name-list /"
+"> into our project!"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:394
+msgid ""
+"The <get-var issue-devel-news /> issue of the <a href=\"<get-var url-devel-"
+"news />\">miscellaneous news for developers</a> has been released and covers "
+"the following topics:"
+msgstr ""
+
 #: ../../english/template/debian/projectnews/footer.wml:6
 msgid ""
 "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://lists."
diff --git a/norwegian/po/organization.nb.po b/norwegian/po/organization.nb.po
index bd86ddc4c82..ef0f4b75f21 100644
--- a/norwegian/po/organization.nb.po
+++ b/norwegian/po/organization.nb.po
@@ -4,271 +4,299 @@ msgstr ""
 "PO-Revision-Date: 2011-02-10 20:46+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/intro/organization.data:15
-#: ../../english/intro/organization.data:17
+#: ../../english/intro/organization.data:13
+msgid "delegation mail"
+msgstr ""
+
+#: ../../english/intro/organization.data:14
+msgid "appointment mail"
+msgstr ""
+
+#. One male delegate
+#: ../../english/intro/organization.data:16
+msgid "<void id=\"male\"/>delegate"
+msgstr ""
+
+#. One female delegate
+#: ../../english/intro/organization.data:18
+msgid "<void id=\"female\"/>delegate"
+msgstr ""
+
+#: ../../english/intro/organization.data:21
+#: ../../english/intro/organization.data:23
 msgid "current"
 msgstr "nåværende"
 
-#: ../../english/intro/organization.data:19
-#: ../../english/intro/organization.data:21
+#: ../../english/intro/organization.data:25
+#: ../../english/intro/organization.data:27
 msgid "member"
 msgstr "medlem"
 
-#: ../../english/intro/organization.data:24
+#: ../../english/intro/organization.data:30
 msgid "manager"
 msgstr "bestyrer"
 
-#: ../../english/intro/organization.data:26
+#: ../../english/intro/organization.data:32
 msgid "SRM"
 msgstr ""
 
-#: ../../english/intro/organization.data:26
+#: ../../english/intro/organization.data:32
 msgid "Stable Release Manager"
 msgstr "Koordinator for stabil utgave"
 
-#: ../../english/intro/organization.data:28
+#: ../../english/intro/organization.data:34
 msgid "wizard"
 msgstr "wizard"
 
-#: ../../english/intro/organization.data:31
+#: ../../english/intro/organization.data:37
 msgid "chairman"
 msgstr "styreformann"
 
-#: ../../english/intro/organization.data:34
+#: ../../english/intro/organization.data:40
 msgid "assistant"
 msgstr "assistent"
 
-#: ../../english/intro/organization.data:36
+#: ../../english/intro/organization.data:42
 msgid "secretary"
 msgstr "sekretær"
 
-#: ../../english/intro/organization.data:45
-#: ../../english/intro/organization.data:54
+#: ../../english/intro/organization.data:51
+#: ../../english/intro/organization.data:60
 msgid "Officers"
 msgstr "Styremedlemmer"
 
-#: ../../english/intro/organization.data:46
-#: ../../english/intro/organization.data:73
+#: ../../english/intro/organization.data:52
+#: ../../english/intro/organization.data:80
 msgid "Distribution"
 msgstr "Distribusjon"
 
-#: ../../english/intro/organization.data:47
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:53
+#: ../../english/intro/organization.data:220
 msgid "Publicity"
 msgstr "Publisitet"
 
-#: ../../english/intro/organization.data:48
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:54
+#: ../../english/intro/organization.data:246
 msgid "Support and Infrastructure"
 msgstr "Støtte og infrastruktur"
 
 #. formerly Custom Debian Distributions (CCDs); see http://blends.alioth.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:50
+#: ../../english/intro/organization.data:56
 msgid "Debian Pure Blends"
 msgstr ""
 
-#: ../../english/intro/organization.data:57
+#: ../../english/intro/organization.data:63
 msgid "Leader"
 msgstr "Leder"
 
-#: ../../english/intro/organization.data:59
+#: ../../english/intro/organization.data:65
 msgid "Technical Committee"
 msgstr "Teknisk komité"
 
-#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:74
 msgid "Secretary"
 msgstr "Sekretær"
 
-#: ../../english/intro/organization.data:76
+#: ../../english/intro/organization.data:83
 msgid "Development Projects"
 msgstr "Utviklingsprosjekter"
 
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:84
 msgid "FTP Archives"
 msgstr "FTP-arkiv"
 
-#: ../../english/intro/organization.data:79
-msgid "FTP Master"
+#: ../../english/intro/organization.data:86
+#, fuzzy
+#| msgid "FTP Master"
+msgid "FTP Masters"
 msgstr "FTP-ansvarlig"
 
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
 msgid "FTP Assistants"
 msgstr "FTP-assistenter"
 
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:97
+msgid "FTP Wizards"
+msgstr ""
+
+#: ../../english/intro/organization.data:101
+msgid "Backports"
+msgstr ""
+
+#: ../../english/intro/organization.data:103
+msgid "Backports Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:107
 msgid "Individual Packages"
 msgstr "Individuelle pakker"
 
-#: ../../english/intro/organization.data:91
+#: ../../english/intro/organization.data:108
 msgid "Release Management"
 msgstr "Utgavekoordinering"
 
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:110
 msgid "Release Team"
 msgstr "Utgiverlag"
 
-#: ../../english/intro/organization.data:106
-#, fuzzy
-#| msgid "Release Team"
-msgid "Volatile Team"
-msgstr "Utgiverlag"
-
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:122
 msgid "Quality Assurance"
 msgstr "Kvalitetskontroll"
 
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:123
 msgid "Installation System Team"
 msgstr "Installasjonsystems-gruppen"
 
-#: ../../english/intro/organization.data:114
+#: ../../english/intro/organization.data:124
 msgid "Release Notes"
 msgstr "Utgivelsesnotater"
 
-#: ../../english/intro/organization.data:116
+#: ../../english/intro/organization.data:126
 msgid "CD Images"
 msgstr "CD-avtrykk"
 
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:128
 msgid "Production"
 msgstr "Produksjon"
 
-#: ../../english/intro/organization.data:125
-msgid "Vendors"
-msgstr "Leverandører"
-
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:136
 msgid "Testing"
 msgstr "Testing"
 
-#: ../../english/intro/organization.data:129
-#| msgid "Support and Infrastructure"
+#: ../../english/intro/organization.data:138
 msgid "Autobuilding infrastructure"
 msgstr "Infrastruktur for automatisk bygging"
 
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:140
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:136
-#| msgid "Buildd Administration"
+#: ../../english/intro/organization.data:146
 msgid "Buildd administration"
 msgstr "Buildd-administrasjon"
 
-#: ../../english/intro/organization.data:155
+#: ../../english/intro/organization.data:165
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:170
 msgid "Work-Needing and Prospective Packages list"
 msgstr "List over pakker som trenger arbeid og mulige pakker"
 
-#: ../../english/intro/organization.data:163
-#| msgid "Installation System Team"
+#: ../../english/intro/organization.data:173
 msgid "Live System Team"
 msgstr "Gruppen for «live»-system"
 
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:174
 msgid "Ports"
 msgstr "Porteringer"
 
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:210
 msgid "Special Configurations"
 msgstr "Spesielle systemer"
 
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:213
 msgid "Laptops"
 msgstr "Bærbare"
 
-#: ../../english/intro/organization.data:220
+#: ../../english/intro/organization.data:214
 msgid "Firewalls"
 msgstr "Brannvegger"
 
-#: ../../english/intro/organization.data:221
+#: ../../english/intro/organization.data:215
 msgid "Embedded systems"
 msgstr "Innebygde system"
 
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:223
 msgid "Press Contact"
 msgstr "Pressekontakt"
 
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:229
 msgid "Partner Program"
 msgstr "Partnerprogram"
 
-#: ../../english/intro/organization.data:238
+#: ../../english/intro/organization.data:234
 msgid "Events"
 msgstr "Begivenheter"
 
-#: ../../english/intro/organization.data:248
+#: ../../english/intro/organization.data:240
+msgid "Bits from Debian"
+msgstr ""
+
+#: ../../english/intro/organization.data:249
 msgid "User support"
 msgstr "Brukerstøtte"
 
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:316
 msgid "Bug Tracking System"
 msgstr "Feilrapportsystem"
 
-#: ../../english/intro/organization.data:322
+#: ../../english/intro/organization.data:321
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "Postlisteadministrasjon og -arkiv"
 
-#: ../../english/intro/organization.data:330
-msgid "New Maintainers Front Desk"
+#: ../../english/intro/organization.data:329
+#, fuzzy
+#| msgid "New Maintainers Front Desk"
+msgid "New Members Front Desk"
 msgstr "Resepsjon for nye utviklere"
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:334
 msgid "Debian Account Managers"
 msgstr "Debian kontoforvaltere"
 
-#: ../../english/intro/organization.data:339
+#: ../../english/intro/organization.data:338
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "Nøkkelring-koordinatore (PGP og GPG)"
 
-#: ../../english/intro/organization.data:342
-msgid "Debian Maintainer Keyring Team"
+#: ../../english/intro/organization.data:341
+#, fuzzy
+#| msgid "Debian Maintainer Keyring Team"
+msgid "Debian Maintainer (DM) Keyring Maintainers"
 msgstr "Debian utviklernøkkelringlag"
 
-#: ../../english/intro/organization.data:350
+#: ../../english/intro/organization.data:345
 msgid "Security Team"
 msgstr "Sikkerhetsgruppen"
 
-#: ../../english/intro/organization.data:366
+#: ../../english/intro/organization.data:360
 msgid "Testing Security Team"
 msgstr "Lag for sikkerhet testing"
 
-#: ../../english/intro/organization.data:375
+#: ../../english/intro/organization.data:369
 msgid "Security Audit Project"
 msgstr "Sikkerhetsvurderingsprosjekt"
 
-#: ../../english/intro/organization.data:380
+#: ../../english/intro/organization.data:374
 msgid "Web Pages"
 msgstr "Nettsider"
 
-#: ../../english/intro/organization.data:386
+#: ../../english/intro/organization.data:382
 msgid "Consultants Page"
 msgstr "Konsulentsiden"
 
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:387
 msgid "CD Vendors Page"
 msgstr "Side med CD-leverandører"
 
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:390
 msgid "Planet Debian"
 msgstr "Planet Debian"
 
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:394
 msgid "Policy"
 msgstr "Retningslinjer"
 
-#: ../../english/intro/organization.data:403
+#: ../../english/intro/organization.data:400
 msgid "System Administration"
 msgstr "Systemadministrasjon"
 
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:401
 msgid ""
 "This is the address to use when encountering problems on one of Debian's "
 "machines, including password problems or you need a package installed."
@@ -277,7 +305,7 @@ msgstr ""
 "maskiner, slik som passordproblemer eller behov for å ha en særskilt pakke "
 "installert."
 
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:408
 msgid ""
 "If you have hardware problems with Debian machines, please see <a href="
 "\"http://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -287,11 +315,11 @@ msgstr ""
 "org/machines.cgi\">Debians maskinside</a>. Denne skulle inneholde "
 "adminstrator-opplysninger for hver maskin."
 
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:409
 msgid "LDAP Developer Directory Administrator"
 msgstr "Administrator av LDAP-utviklerlisten"
 
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:410
 msgid "Mirrors"
 msgstr "Blåkopier"
 
@@ -312,64 +340,78 @@ msgid "Auditor"
 msgstr "Revisor"
 
 #: ../../english/intro/organization.data:427
+msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgstr ""
+
+#: ../../english/intro/organization.data:428
+msgid "current Debian Project Leader"
+msgstr ""
+
+#: ../../english/intro/organization.data:430
 msgid "Alioth administrators"
 msgstr "Alioth-administratorer"
 
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:436
 msgid "Debian Women Project"
 msgstr "Debian kvinneprosjekt"
 
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:443
+msgid "DebConf chairs"
+msgstr ""
+
+#: ../../english/intro/organization.data:447
+msgid "Anti-harassment"
+msgstr ""
+
+#: ../../english/intro/organization.data:458
 msgid "Debian for children from 1 to 99"
 msgstr "Debian for barn mellom 1 og 99"
 
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:461
 msgid "Debian for medical practice and research"
 msgstr "Debian for medisinsk praksis og forskning"
 
-#: ../../english/intro/organization.data:452
+#: ../../english/intro/organization.data:464
 msgid "Debian for education"
 msgstr "Debian for utdanning"
 
-#: ../../english/intro/organization.data:459
+#: ../../english/intro/organization.data:471
 msgid "Debian in legal offices"
 msgstr "Debian på juridiske kontor"
 
-#: ../../english/intro/organization.data:463
+#: ../../english/intro/organization.data:475
 msgid "Debian for people with disabilities"
 msgstr "Debian for folk med funksjonshemning"
 
+#: ../../english/intro/organization.data:479
 #, fuzzy
-#~ msgid "Release Assistants"
-#~ msgstr "Utgavekoordinering"
-
-#~ msgid "Mailing List Archives"
-#~ msgstr "Postliste-arkiver"
-
-#~ msgid "Mailing list"
-#~ msgstr "Postliste"
-
-#~ msgid "Installation"
-#~ msgstr "Installasjon"
+#| msgid "Debian for medical practice and research"
+msgid "Debian for science and related research"
+msgstr "Debian for medisinsk praksis og forskning"
 
-#~ msgid "Delegates"
-#~ msgstr "Delegater"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Tilpassede Debian distribusjoner"
 
-#, fuzzy
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Installasjonsystems-gruppen"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Utgiverlag for den «stabile» utgaven"
 
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian for ikke-kommersielle organisasjoner"
+#~ msgid "APT Team"
+#~ msgstr "APT-gruppen"
 
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Det universelle operativsystemet som ditt skrivebord"
+#~ msgid "Handhelds"
+#~ msgstr "Håndholdte"
 
-#~ msgid "Accountant"
-#~ msgstr "Regnskapsfører"
+#~ msgid "Marketing Team"
+#~ msgstr "Markedsføringslag"
 
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinering av nøkkelsignering"
+#~ 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 ""
 #~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -381,26 +423,42 @@ msgstr "Debian for folk med funksjonshemning"
 #~ "arkitektur og en distribusjon for å se tilgjengelig buildd-er og deres "
 #~ "administrator."
 
-#~ 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 "Key Signing Coordination"
+#~ msgstr "Koordinering av nøkkelsignering"
 
-#~ msgid "Marketing Team"
-#~ msgstr "Markedsføringslag"
+#~ msgid "Accountant"
+#~ msgstr "Regnskapsfører"
 
-#~ msgid "Handhelds"
-#~ msgstr "Håndholdte"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Det universelle operativsystemet som ditt skrivebord"
 
-#~ msgid "APT Team"
-#~ msgstr "APT-gruppen"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian for ikke-kommersielle organisasjoner"
 
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Utgiverlag for den «stabile» utgaven"
+#, fuzzy
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Installasjonsystems-gruppen"
 
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Tilpassede Debian distribusjoner"
+#~ msgid "Delegates"
+#~ msgstr "Delegater"
+
+#~ msgid "Installation"
+#~ msgstr "Installasjon"
+
+#~ msgid "Mailing list"
+#~ msgstr "Postliste"
+
+#~ msgid "Mailing List Archives"
+#~ msgstr "Postliste-arkiver"
+
+#, fuzzy
+#~ msgid "Release Assistants"
+#~ msgstr "Utgavekoordinering"
+
+#~ msgid "Vendors"
+#~ msgstr "Leverandører"
+
+#, fuzzy
+#~| msgid "Release Team"
+#~ msgid "Volatile Team"
+#~ msgstr "Utgiverlag"
diff --git a/norwegian/po/others.nb.po b/norwegian/po/others.nb.po
index 5d8c2023a9e..93e349d653e 100644
--- a/norwegian/po/others.nb.po
+++ b/norwegian/po/others.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2011-04-15 18:31+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,7 +58,9 @@ msgid "Unavailable"
 msgstr "Utilgjengelig"
 
 #: ../../english/devel/join/nm-steps.inc:7
-msgid "New Maintainers' Corner"
+#, fuzzy
+#| msgid "New Maintainers' Corner"
+msgid "New Members Corner"
 msgstr "Hjørnet for nye vedlikeholdere"
 
 #: ../../english/devel/join/nm-steps.inc:10
@@ -92,35 +95,41 @@ msgstr "Steg 7"
 msgid "Applicants' checklist"
 msgstr "Sjekkliste for søkere"
 
-#: ../../english/devel/website/tc.data:13
+#: ../../english/devel/website/tc.data:11
 msgid ""
 "See <a href=\"m4_HOME/intl/french/\">http://www.debian.org/intl/french/</a> "
 "(only available in French) for more information."
 msgstr ""
 
+#: ../../english/devel/website/tc.data:12
 #: ../../english/devel/website/tc.data:14
+#: ../../english/devel/website/tc.data:15
 #: ../../english/devel/website/tc.data:16
-#: ../../english/devel/website/tc.data:17
-#: ../../english/devel/website/tc.data:18
 msgid "More information"
 msgstr "Mer informasjon"
 
-#: ../../english/devel/website/tc.data:15
+#: ../../english/devel/website/tc.data:13
 msgid ""
 "See <a href=\"m4_HOME/intl/spanish/\">http://www.debian.org/intl/spanish/</"
 "a> (only available in Spanish) for more information."
 msgstr ""
 
-#: ../../english/distrib/pre-installed.data:40
-msgid "Phone:"
+#: ../../english/distrib/pre-installed.defs:18
+#, fuzzy
+#| msgid "Phone:"
+msgid "Phone"
 msgstr "Telefon:"
 
-#: ../../english/distrib/pre-installed.data:43
-msgid "Fax:"
+#: ../../english/distrib/pre-installed.defs:19
+#, fuzzy
+#| msgid "Fax:"
+msgid "Fax"
 msgstr "Faks:"
 
-#: ../../english/distrib/pre-installed.data:49
-msgid "Address:"
+#: ../../english/distrib/pre-installed.defs:21
+#, fuzzy
+#| msgid "Address:"
+msgid "Address"
 msgstr "Adresse:"
 
 #: ../../english/logos/index.data:6
@@ -235,6 +244,37 @@ msgstr "paraplyer"
 msgid "pillowcases"
 msgstr "putevar"
 
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
 #: ../../english/y2k/l10n.data:6
 msgid "OK"
 msgstr "OK"
@@ -279,116 +319,116 @@ msgstr "Versjon"
 msgid "URL"
 msgstr "Nettadresse"
 
-#~ msgid "p<get-var page />"
-#~ msgstr "s.<get-var page />"
-
-#~ msgid "developers only"
-#~ msgstr "kun for utviklere"
+#~ msgid "Name:"
+#~ msgstr "Navn:"
 
-#~ msgid "deity developers only"
-#~ msgstr "kun for deity-utviklere"
+#~ msgid "Company:"
+#~ msgstr "Selskap:"
 
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "Kun for Debians tekniske komité"
+#~ msgid "URL:"
+#~ msgstr "URL:"
 
-#~ msgid "closed"
-#~ msgstr "lukket"
+#~ msgid "or"
+#~ msgstr "eller"
 
-#~ msgid "open"
-#~ msgstr "åpen"
+#~ msgid "Email:"
+#~ msgstr "E-post:"
 
-#~ msgid "Unsubscribe"
-#~ msgstr "Si opp"
+#~ msgid "Rates:"
+#~ msgstr "Takst:"
 
-#~ 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 ""
-#~ "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 "Mailing List Unsubscription"
-#~ msgstr "Oppsigelse av postliste-abonnement"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Postliste-abonnement"
 
 #~ 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>."
-
-#~ msgid "Clear"
-#~ msgstr "Nullstill"
+#~ "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 "Subscribe"
-#~ msgstr "Abonnér"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Velg listene du vil abonnere på"
 
-#~ msgid "Your E-Mail address:"
-#~ msgstr "E-postadressen din:"
+#~ msgid "No description given"
+#~ msgstr "Beskrivelse savnes"
 
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "er en oppsummert versjon som bare kan leses."
+#~ msgid "Moderated:"
+#~ msgstr "Ordstyrt:"
 
-#~ msgid "Subscription:"
-#~ msgstr "Abonnement:"
+# Sjekkes!
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Kun medlemmer kan sende meldinger."
 
 # Sjekkes!
 #~ msgid ""
 #~ "Only messages signed by a Debian developer will be accepted by this list."
 #~ msgstr "Listen godtar kun meldinger signert av Debianutviklere."
 
-# Sjekkes!
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Kun medlemmer kan sende meldinger."
+#~ msgid "Subscription:"
+#~ msgstr "Abonnement:"
 
-#~ msgid "Moderated:"
-#~ msgstr "Ordstyrt:"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "er en oppsummert versjon som bare kan leses."
 
-#~ msgid "No description given"
-#~ msgstr "Beskrivelse savnes"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "E-postadressen din:"
 
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Velg listene du vil abonnere på"
+#~ msgid "Subscribe"
+#~ msgstr "Abonnér"
+
+#~ msgid "Clear"
+#~ msgstr "Nullstill"
 
 #~ 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 "Mailing List Subscription"
-#~ msgstr "Postliste-abonnement"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Oppsigelse av postliste-abonnement"
 
 #~ 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 "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 "Rates:"
-#~ msgstr "Takst:"
+#~ msgid "Unsubscribe"
+#~ msgstr "Si opp"
 
-#~ msgid "Email:"
-#~ msgstr "E-post:"
+#~ msgid "open"
+#~ msgstr "åpen"
 
-#~ msgid "or"
-#~ msgstr "eller"
+#~ msgid "closed"
+#~ msgstr "lukket"
 
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "Kun for Debians tekniske komité"
 
-#~ msgid "Company:"
-#~ msgstr "Selskap:"
+#~ msgid "deity developers only"
+#~ msgstr "kun for deity-utviklere"
 
-#~ msgid "Name:"
-#~ msgstr "Navn:"
+#~ msgid "developers only"
+#~ msgstr "kun for utviklere"
+
+#~ msgid "p<get-var page />"
+#~ msgstr "s.<get-var page />"
diff --git a/norwegian/po/ports.nb.po b/norwegian/po/ports.nb.po
index 32d91bca094..7352a043293 100644
--- a/norwegian/po/ports.nb.po
+++ b/norwegian/po/ports.nb.po
@@ -4,35 +4,15 @@ msgstr ""
 "PO-Revision-Date: 2008-08-28 00:43+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/misc/laptops/menu.inc:8
-msgid "Debian for Laptops"
-msgstr "Debian for bærbare"
-
 #: ../../english/ports/alpha/menu.inc:6
 msgid "Debian for Alpha"
 msgstr "Debian for Alpha"
 
-#: ../../english/ports/amd64/menu.inc:6
-msgid "Debian for AMD64"
-msgstr "Debian for AMD64"
-
-#: ../../english/ports/arm/menu.inc:6
-msgid "Debian for ARM"
-msgstr "Debian for ARM"
-
-#: ../../english/ports/beowulf/menu.inc:6
-msgid "Debian for Beowulf"
-msgstr "Debian for Beowulf"
-
-#: ../../english/ports/freebsd/menu.inc:6
-#: ../../english/ports/kfreebsd-gnu/menu.inc:6
-msgid "Main"
-msgstr "Hoved"
-
 #: ../../english/ports/hppa/menu.inc:6
 msgid "Debian for PA-RISC"
 msgstr "Debian for PA-RISC"
@@ -45,14 +25,6 @@ msgstr "Hurd CD-er"
 msgid "Debian for IA-64"
 msgstr "Debian for IA-64"
 
-#: ../../english/ports/kfreebsd-gnu/menu.inc:9
-msgid "Debian GNU/FreeBSD"
-msgstr "Debian GNU/FreeBSD"
-
-#: ../../english/ports/m68k/menu.inc:6
-msgid "Debian for Motorola 680x0"
-msgstr "Debian for Motorola 680x0"
-
 #: ../../english/ports/menu.defs:11
 msgid "Contact"
 msgstr "Kontakt"
@@ -78,45 +50,45 @@ msgid "Installation"
 msgstr "Installasjon"
 
 #: ../../english/ports/menu.defs:35
+msgid "Configuration"
+msgstr ""
+
+#: ../../english/ports/menu.defs:39
 msgid "Links"
 msgstr "Pekere"
 
-#: ../../english/ports/menu.defs:39
+#: ../../english/ports/menu.defs:43
 msgid "News"
 msgstr "Nyheter"
 
-#: ../../english/ports/menu.defs:43
+#: ../../english/ports/menu.defs:47
 msgid "Porting"
 msgstr "Tilpasning"
 
-#: ../../english/ports/menu.defs:47
+#: ../../english/ports/menu.defs:51
 msgid "Ports"
 msgstr "Tilpasninger"
 
-#: ../../english/ports/menu.defs:51
+#: ../../english/ports/menu.defs:55
 msgid "Problems"
 msgstr "Problemer"
 
-#: ../../english/ports/menu.defs:55
+#: ../../english/ports/menu.defs:59
 msgid "Software Map"
 msgstr "Programvarekatalog"
 
-#: ../../english/ports/menu.defs:59
+#: ../../english/ports/menu.defs:63
 msgid "Status"
 msgstr "Status"
 
-#: ../../english/ports/menu.defs:63
+#: ../../english/ports/menu.defs:67
 msgid "Supply"
 msgstr "Tilgjengelighet"
 
-#: ../../english/ports/menu.defs:67
+#: ../../english/ports/menu.defs:71
 msgid "Systems"
 msgstr "Systemer"
 
-#: ../../english/ports/mips/menu.inc:6
-msgid "Debian for MIPS"
-msgstr "Debian for MIPS"
-
 #: ../../english/ports/netbsd/menu.inc:6
 msgid "Debian GNU/NetBSD for i386"
 msgstr "Debian GNU/NetBSD for i386"
@@ -137,14 +109,36 @@ msgstr "Folk"
 msgid "Debian for PowerPC"
 msgstr "Debian for PowerPC"
 
-#: ../../english/ports/s390/menu.inc:6
-msgid "Debian for S/390"
-msgstr "Debian for S/390"
-
 #: ../../english/ports/sparc/menu.inc:6
 msgid "Debian for Sparc"
 msgstr "Debian for Sparc"
 
-#: ../../english/ports/sparc64/menu.inc:6
-msgid "Debian for Sparc64"
-msgstr "Debian for Sparc64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian for Sparc64"
+
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian for S/390"
+
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian for MIPS"
+
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian for Motorola 680x0"
+
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
+
+#~ msgid "Main"
+#~ msgstr "Hoved"
+
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian for Beowulf"
+
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian for ARM"
+
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian for AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian for bærbare"
diff --git a/norwegian/po/security.nb.po b/norwegian/po/security.nb.po
index 2d96185c1f0..2d1d3c0c94a 100644
--- a/norwegian/po/security.nb.po
+++ b/norwegian/po/security.nb.po
@@ -25,22 +25,23 @@ msgstr "Q"
 msgid ""
 "<a href=\\\"undated/\\\">undated</a> security advisories, included for "
 "posterity"
-msgstr " <a href=\\\"undated/\\\">udaterte</a> sikkerhetsmeldinger "
-"bevart for ettertiden"
+msgstr ""
+" <a href=\\\"undated/\\\">udaterte</a> sikkerhetsmeldinger bevart for "
+"ettertiden"
 
-#: ../../english/security/make-ref-table.pl:61
+#: ../../english/security/make-ref-table.pl:81
 msgid "Mitre CVE dictionary"
 msgstr "Mitre CVE-ordbok"
 
-#: ../../english/security/make-ref-table.pl:64
+#: ../../english/security/make-ref-table.pl:84
 msgid "Securityfocus Bugtraq database"
 msgstr "Securityfocus Bugtraq database"
 
-#: ../../english/security/make-ref-table.pl:68
+#: ../../english/security/make-ref-table.pl:88
 msgid "CERT Advisories"
 msgstr "CERT sikkerhetsmeldinger"
 
-#: ../../english/security/make-ref-table.pl:72
+#: ../../english/security/make-ref-table.pl:92
 msgid "US-CERT vulnerabilities Notes"
 msgstr "US-CERT sårbarhetsnotater"
 
diff --git a/norwegian/po/stats.nb.po b/norwegian/po/stats.nb.po
index de4da84b97a..008656b65ed 100644
--- a/norwegian/po/stats.nb.po
+++ b/norwegian/po/stats.nb.po
@@ -9,75 +9,96 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../stattrans.pl:239 ../../stattrans.pl:243
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Statistikk for oversettelsen av Debian sitt nettsted"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Det er %d sider å oversette."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Det er %d byte å oversette."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Det er %d strenger å oversette."
+
+#. TRANSLATORS: The first string is hostname of the debian website mirror, second string is date and time.
+#: ../../english/template/debian/stats_tags.wml:23
+msgid "Hit data from %s, gathered %s."
+msgstr ""
+
+#: ../../stattrans.pl:240 ../../stattrans.pl:244
 msgid "This translation is too out of date"
 msgstr "Denne oversettelsen for utdatert"
 
-#: ../../stattrans.pl:241 ../../stattrans.pl:430
+#: ../../stattrans.pl:242 ../../stattrans.pl:461
 msgid "Wrong translation version"
 msgstr "Feil oversettelsesversjon"
 
-#: ../../stattrans.pl:245
+#: ../../stattrans.pl:246
 msgid "The original is newer than this translation"
 msgstr "Originalen er nyere enn denne oversettelsen"
 
-#: ../../stattrans.pl:248 ../../stattrans.pl:430
+#: ../../stattrans.pl:249 ../../stattrans.pl:461
 msgid "The original no longer exists"
 msgstr "Originalen fins ikke lenger"
 
-#: ../../stattrans.pl:406
-msgid "hits"
-msgstr "treff"
-
-#: ../../stattrans.pl:406
+#: ../../stattrans.pl:437
 msgid "hit count N/A"
 msgstr "antall treff fins ikke"
 
-#: ../../stattrans.pl:424 ../../stattrans.pl:425
+#: ../../stattrans.pl:437
+msgid "hits"
+msgstr "treff"
+
+#: ../../stattrans.pl:455 ../../stattrans.pl:456
 msgid "Click to fetch diffstat data"
 msgstr ""
 
-#: ../../stattrans.pl:439 ../../stattrans.pl:573 ../../stattrans.pl:574
+#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
 msgid "Unified diff"
 msgstr ""
 
-#: ../../stattrans.pl:441 ../../stattrans.pl:573 ../../stattrans.pl:574
+#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
 msgid "Colored diff"
 msgstr ""
 
-#: ../../stattrans.pl:540
+#: ../../stattrans.pl:575
 msgid "Translation summary for"
 msgstr "Oversettelsessammendrag for"
 
-#: ../../stattrans.pl:543
+#: ../../stattrans.pl:578 ../../stattrans.pl:737 ../../stattrans.pl:783
+#: ../../stattrans.pl:826
+msgid "Not translated"
+msgstr "Ikke oversatt"
+
+#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+msgid "Outdated"
+msgstr "Utdatert"
+
+#: ../../stattrans.pl:578
 msgid "Translated"
 msgstr "Oversatt"
 
-#: ../../stattrans.pl:543 ../../stattrans.pl:624 ../../stattrans.pl:693
-#: ../../stattrans.pl:739 ../../stattrans.pl:782
+#: ../../stattrans.pl:578 ../../stattrans.pl:663 ../../stattrans.pl:735
+#: ../../stattrans.pl:781 ../../stattrans.pl:824
 msgid "Up to date"
 msgstr "Oppdatert"
 
-#: ../../stattrans.pl:543 ../../stattrans.pl:694 ../../stattrans.pl:740
-msgid "Outdated"
-msgstr "Utdatert"
-
-#: ../../stattrans.pl:543 ../../stattrans.pl:695 ../../stattrans.pl:741
-#: ../../stattrans.pl:784
-msgid "Not translated"
-msgstr "Ikke oversatt"
-
-#: ../../stattrans.pl:544 ../../stattrans.pl:545 ../../stattrans.pl:546
-#: ../../stattrans.pl:547
+#: ../../stattrans.pl:579 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:582
 msgid "files"
 msgstr "filer"
 
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:585 ../../stattrans.pl:586 ../../stattrans.pl:587
+#: ../../stattrans.pl:588
 msgid "bytes"
 msgstr "byte"
 
-#: ../../stattrans.pl:560
+#: ../../stattrans.pl:595
 msgid ""
 "Note: the lists of pages are sorted by popularity. Hover over the page name "
 "to see the number of hits."
@@ -85,153 +106,137 @@ msgstr ""
 "Merk: Lista med sider er sortert etter popularitet. Hold musepekeren over "
 "sidenavnet for å se antall treff."
 
-#: ../../stattrans.pl:565
+#: ../../stattrans.pl:604
 msgid "Outdated translations"
 msgstr "Utdaterte oversettelser"
 
-#: ../../stattrans.pl:567 ../../stattrans.pl:623
+#: ../../stattrans.pl:606 ../../stattrans.pl:662
 msgid "File"
 msgstr "Fil"
 
-#: ../../stattrans.pl:569 ../../stattrans.pl:575
+#: ../../stattrans.pl:608 ../../stattrans.pl:614
 msgid "Diff"
 msgstr ""
 
-#: ../../stattrans.pl:571
+#: ../../stattrans.pl:610
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:611
 msgid "Diffstat"
 msgstr ""
 
-#: ../../stattrans.pl:577
+#: ../../stattrans.pl:616
 msgid "Log"
 msgstr "Logg"
 
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:617
 msgid "Translation"
 msgstr "Oversettelse"
 
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:618
 msgid "Maintainer"
 msgstr "Vedlikeholder"
 
-#: ../../stattrans.pl:581
+#: ../../stattrans.pl:620
 msgid "Status"
 msgstr "Status"
 
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:621
 msgid "Translator"
 msgstr "Oversetter"
 
-#: ../../stattrans.pl:583
+#: ../../stattrans.pl:622
 msgid "Date"
 msgstr "Dato"
 
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:629
 msgid "General pages not translated"
 msgstr "Generelle sider som ikke er oversatt"
 
-#: ../../stattrans.pl:591
+#: ../../stattrans.pl:630
 msgid "Untranslated general pages"
 msgstr "Ikke-oversatte generelle sider"
 
-#: ../../stattrans.pl:596
+#: ../../stattrans.pl:635
 msgid "News items not translated"
 msgstr "Nyhetsoppføringer som ikke er oversatt"
 
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:636
 msgid "Untranslated news items"
 msgstr "Ikke-oversatte nyhetsoppføringer"
 
-#: ../../stattrans.pl:602
+#: ../../stattrans.pl:641
 msgid "Consultant/user pages not translated"
 msgstr "Konsulent/brukersider som ikke er oversatt"
 
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:642
 msgid "Untranslated consultant/user pages"
 msgstr "Ikke-oversatte konsulent/brukersider"
 
-#: ../../stattrans.pl:608
+#: ../../stattrans.pl:647
 msgid "International pages not translated"
 msgstr "Internasjonale sider som ikke er oversatt"
 
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:648
 msgid "Untranslated international pages"
 msgstr "Ikke-oversatte internasjonale sider"
 
-#: ../../stattrans.pl:614
+#: ../../stattrans.pl:653
 msgid "Translated pages (up-to-date)"
 msgstr "Oversatte sider (oppdatert)"
 
-#: ../../stattrans.pl:621 ../../stattrans.pl:766
+#: ../../stattrans.pl:660 ../../stattrans.pl:808
 msgid "Translated templates (PO files)"
 msgstr "Oversatte maler (PO-filer)"
 
-#: ../../stattrans.pl:622 ../../stattrans.pl:769
+#: ../../stattrans.pl:661 ../../stattrans.pl:811
 msgid "PO Translation Statistics"
 msgstr "PO-oversettelsesstatistikk"
 
-#: ../../stattrans.pl:625 ../../stattrans.pl:783
+#: ../../stattrans.pl:664 ../../stattrans.pl:825
 msgid "Fuzzy"
 msgstr "Fuzzy"
 
-#: ../../stattrans.pl:626
+#: ../../stattrans.pl:665
 msgid "Untranslated"
 msgstr "Ikke oversatt"
 
-#: ../../stattrans.pl:627
+#: ../../stattrans.pl:666
 msgid "Total"
 msgstr "Totalt"
 
-#: ../../stattrans.pl:644
+#: ../../stattrans.pl:683
 msgid "Total:"
 msgstr "Totalt:"
 
-#: ../../stattrans.pl:656 ../../stattrans.pl:807
+#: ../../stattrans.pl:696 ../../stattrans.pl:850
 msgid "Created with"
 msgstr "Opprettet med"
 
-#: ../../stattrans.pl:673
+#: ../../stattrans.pl:715
 msgid "Translated web pages"
 msgstr "Oversatte nettsider"
 
-#: ../../stattrans.pl:676
+#: ../../stattrans.pl:718
 msgid "Translation Statistics by Page Count"
 msgstr "Oversettelsesstatistikk etter sideantall"
 
-#: ../../stattrans.pl:691 ../../stattrans.pl:737 ../../stattrans.pl:781
+#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
 msgid "Language"
 msgstr "Språk"
 
-#: ../../stattrans.pl:692 ../../stattrans.pl:738
+#: ../../stattrans.pl:734 ../../stattrans.pl:780
 msgid "Translations"
 msgstr "Oversettelser"
 
-#: ../../stattrans.pl:719
+#: ../../stattrans.pl:761
 msgid "Translated web pages (by size)"
 msgstr "Oversatte nettsider (etter størrelse)"
 
-#: ../../stattrans.pl:722
+#: ../../stattrans.pl:764
 msgid "Translation Statistics by Page Size"
 msgstr "Oversettelsesstatistikk etter sidestørrelse"
 
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Statistikk for oversettelsen av Debian sitt nettsted"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Det er %d sider å oversette."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Det er %d byte å oversette."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Det er %d strenger å oversette."
-
 #~ msgid "Origin"
 #~ msgstr "Kilde"
diff --git a/norwegian/po/templates.nb.po b/norwegian/po/templates.nb.po
index 3435689afe3..7a916aeb40b 100644
--- a/norwegian/po/templates.nb.po
+++ b/norwegian/po/templates.nb.po
@@ -4,11 +4,33 @@ msgstr ""
 "PO-Revision-Date: 2011-02-07 09:19+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#: ../../english/search.xml.in:7
+#, fuzzy
+#| msgid "Debian Security"
+msgid "Debian website"
+msgstr "Sikkerhet i Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
+#: ../../english/template/debian/basic.wml:19
+#: ../../english/template/debian/navbar.wml:11
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian"
+msgstr "Hjelp Debian"
+
+#: ../../english/template/debian/basic.wml:46
+msgid "Debian website search"
+msgstr ""
+
 #: ../../english/template/debian/common_translation.wml:4
 msgid "Yes"
 msgstr "Ja"
@@ -22,10 +44,15 @@ msgid "Debian Project"
 msgstr "Debianprosjektet"
 
 #: ../../english/template/debian/common_translation.wml:13
+#, fuzzy
+#| msgid ""
+#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
+#| "system. It is maintained and updated through the work of many users who "
+#| "volunteer their time and effort."
 msgid ""
-"Debian GNU/Linux is a free distribution of the GNU/Linux operating system. "
-"It is maintained and updated through the work of many users who volunteer "
-"their time and effort."
+"Debian is an operating system and a distribution of Free Software. It is "
+"maintained and updated through the work of many users who volunteer their "
+"time and effort."
 msgstr ""
 "Debian GNU/Linux er en fri distribusjon av operativsystemet GNU/Linux. Den "
 "vedlikeholdes og oppdateres av frivillige brukere som donerer tid og arbeid."
@@ -39,7 +66,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
 msgstr "Tilbake til <a href=\"m4_HOME/\">Debianprosjektets hjemmeside</a>."
 
 #: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:146
 msgid "Home"
 msgstr "Hjem"
 
@@ -117,10 +144,16 @@ msgid "Miscellaneous"
 msgstr "Diverse"
 
 #: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:101
 msgid "Getting Debian"
 msgstr "Få tak i Debian"
 
+#: ../../english/template/debian/common_translation.wml:82
+#, fuzzy
+#| msgid "Debian Books"
+msgid "The Debian Blog"
+msgstr "Debianbøker"
+
 #: ../../english/template/debian/ddp.wml:6
 msgid ""
 "Please send all comments, criticisms and suggestions about these web pages "
@@ -161,44 +194,47 @@ msgstr "i utgave 2.1"
 msgid "in release 2.2"
 msgstr "i utgave 2.2"
 
-#: ../../english/template/debian/footer.wml:14
-msgid "Have you found a problem with the site layout?"
-msgstr "Har du oppdaget et problem med nettstedets utforming?"
-
-#: ../../english/template/debian/footer.wml:18
-#| msgid "Report"
-msgid "Report it!"
-msgstr "Rapporter det"
-
 # Sjekkes!
 #. TRANSLATORS: Please make clear in the translation of the following
 #. item that mail sent to the debian-www list *must* be in English. Also,
 #. you can add some information of your own translation mailing list
 #. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
 #. your language.
-#: ../../english/template/debian/footer.wml:98
+#: ../../english/template/debian/footer.wml:96
+#, fuzzy
+#| msgid ""
+#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
+#| "www@lists.debian.org\">debian-www@lists.debian.org</a>.  For other "
+#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
+#| "page</a>."
 msgid ""
 "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
 "www@lists.debian.org\">debian-www@lists.debian.org</a>.  For other contact "
-"information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>."
+"information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>. "
+"Web site source code is <a href=\"m4_HOME/devel/website/using_cvs"
+"\">available</a>."
 msgstr ""
 "For å rapportere problemer med nettstedet, send e-post til <a href=\"mailto:"
 "debian-www@lists.debian.org\">debian-www@lists.debian.org</a>. For øvrig "
 "kontaktinformasjon, se Debians <a href=\"m4_HOME/contact\">kontaktside</a>."
 
-#: ../../english/template/debian/footer.wml:101
+#: ../../english/template/debian/footer.wml:99
 msgid "Last Modified"
 msgstr "Sist oppdatert"
 
-#: ../../english/template/debian/footer.wml:104
+#: ../../english/template/debian/footer.wml:102
 msgid "Copyright"
 msgstr "Opphavsrett"
 
-#: ../../english/template/debian/footer.wml:107
+#: ../../english/template/debian/footer.wml:105
+msgid "<a href=\"http://www.spi-inc.org/\">SPI</a> and others;"
+msgstr ""
+
+#: ../../english/template/debian/footer.wml:108
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr "Se <a href=\"m4_HOME/license\" rel=\"copyright\">lisensvilkårene</a>"
 
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:111
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -206,12 +242,12 @@ msgstr ""
 "Debian er et registrert <a href=\"m4_HOME/trademark\">varemerke</a> hos "
 "Software in the Public Interest, Inc."
 
-#: ../../english/template/debian/languages.wml:191
-#: ../../english/template/debian/languages.wml:220
+#: ../../english/template/debian/languages.wml:196
+#: ../../english/template/debian/languages.wml:232
 msgid "This page is also available in the following languages:"
 msgstr "Denne siden er også tilgjengelig på følgende språk:"
 
-#: ../../english/template/debian/languages.wml:244
+#: ../../english/template/debian/languages.wml:265
 msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
 msgstr "Slik velger du <a href=m4_HOME/intro/cn>standard språk</a>"
 
@@ -288,117 +324,124 @@ msgid "Developer Database"
 msgstr "Database av utviklere"
 
 #: ../../english/template/debian/links.tags.wml:61
+#, fuzzy
+#| msgid "Debian Books"
+msgid "Debian FAQ"
+msgstr "Debianbøker"
+
+#: ../../english/template/debian/links.tags.wml:64
 msgid "Debian Policy Manual"
 msgstr "Retningslinjehåndbok"
 
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:67
 msgid "Developers' Reference"
 msgstr "Utviklerhåndbok"
 
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:70
 msgid "New Maintainers' Guide"
 msgstr "Innledning for nye utviklere"
 
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:73
 msgid "Release Critical Bugs"
 msgstr "Utgavekritiske feil"
 
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:76
 msgid "Lintian Reports"
 msgstr "Lintian-rapporter"
 
-#: ../../english/template/debian/links.tags.wml:77
+#: ../../english/template/debian/links.tags.wml:80
 msgid "Archives for users' mailing lists"
 msgstr "Arkiv av brukerpostlister"
 
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:83
 msgid "Archives for developers' mailing lists"
 msgstr "Arkiv av utviklerpostlister"
 
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:86
 msgid "Archives for i18n/l10n mailing lists"
 msgstr "Arkiv av i18n-/l10n-postlister"
 
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:89
 msgid "Archives for ports' mailing lists"
 msgstr "Arkiv av porterings-postlister"
 
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:92
 msgid "Archives for mailing lists of the Bug tracking system"
 msgstr "Arkiv av postlister for feilrapportsystemet"
 
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:95
 msgid "Archives for miscellaneous mailing lists"
 msgstr "Arkiv av diverse postlister"
 
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:98
 msgid "Free Software"
 msgstr "Fri programvare"
 
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:104
 msgid "Development"
 msgstr "Utvikling"
 
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:107
 msgid "Help Debian"
 msgstr "Hjelp Debian"
 
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:110
 msgid "Bug reports"
 msgstr "Feilmeldinger"
 
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:113
 msgid "Ports/Architectures"
 msgstr "Arkitekturtilpasninger"
 
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:116
 msgid "Installation manual"
 msgstr "Installasjonshåndbok"
 
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:119
 msgid "CD vendors"
 msgstr "CD-leverandører"
 
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:122
 msgid "CD ISO images"
 msgstr "CD-ISO-avtrykk"
 
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:125
 msgid "Network install"
 msgstr "Nettverksinstallasjon"
 
 # Sjekkes!
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:128
 msgid "Pre-installed"
 msgstr "Ferdiginstallert"
 
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:131
 msgid "Debian-Edu project"
 msgstr "Debian-Edu-prosjektet"
 
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:134
 msgid "Alioth &ndash; Debian GForge"
 msgstr "Alioth &ndash; Debian GForge"
 
 # Sjekkes!
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:137
 msgid "Quality Assurance"
 msgstr "Kvalitetskontroll"
 
 # Sjekkes!
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:140
 msgid "Package Tracking System"
 msgstr "Pakkesporingssystemet"
 
 # Sjekkes!
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:143
 msgid "Debian Developer's Packages Overview"
 msgstr "Debianutviklernes pakkeoversikt"
 
-#: ../../english/template/debian/mirrors.wml:8
-#| msgid "Select a server near you"
-msgid "Select a server near you: &nbsp;"
-msgstr "Velg en tjener nær deg: &nbsp;"
+#: ../../english/template/debian/navbar.wml:10
+#, fuzzy
+#| msgid "Debian Project"
+msgid "Debian Home"
+msgstr "Debianprosjektet"
 
 #: ../../english/template/debian/recent_list.wml:7
 msgid "No items for this year."
@@ -436,7 +479,7 @@ msgstr "Tidligere begivenheter"
 msgid "(new revision)"
 msgstr "(ny versjon)"
 
-#: ../../english/template/debian/recent_list.wml:294
+#: ../../english/template/debian/recent_list.wml:301
 msgid "Report"
 msgstr "Rapport"
 
@@ -446,22 +489,6 @@ msgstr "Rapport"
 msgid "<void id=\"doc_for_arch\" />%s for %s"
 msgstr "<void id=\"doc_for_arch\" />%s for %s"
 
-#: ../../english/template/debian/todoitem.wml:4
-msgid "More information:"
-msgstr "Mer informasjon:"
-
-#: ../../english/template/debian/todoitem.wml:8
-msgid "Taken by:"
-msgstr "Tatt av:"
-
-#: ../../english/template/debian/todoitem.wml:12
-msgid "Nobody"
-msgstr "Ingen"
-
-#: ../../english/template/debian/todoitem.wml:16
-msgid "Rating:"
-msgstr "Vurdering:"
-
 #: ../../english/template/debian/translation-check.wml:37
 msgid ""
 "<em>Note:</em> The <a href=\"$link\">original document</a> is newer than "
@@ -490,137 +517,257 @@ 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 "More information"
-#~ msgstr "Mer informasjon"
+#~ msgid "List of Consultants"
+#~ msgstr "Konsulentliste"
 
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Kommende begivenheter"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Tilbake til <a href=\"./\">Debians konsulentliste</a>."
 
-#~ msgid "link may no longer be valid"
-#~ msgstr "pekeren er muligvis gammel"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
 
-#~ msgid "When"
-#~ msgstr "Når"
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "hent med jigdo"
 
-#~ msgid "Where"
-#~ msgstr "Hvor"
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "hent via http/ftp"
 
-#~ msgid "More Info"
-#~ msgstr "Mer informasjon"
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "Nettverksinstallasjon"
 
-#~ msgid "Debian Involvement"
-#~ msgstr "Debians engasjement"
+#, fuzzy
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "OSS"
 
-#~ msgid "Main Coordinator"
-#~ msgstr "Hovedkoordinator"
+#, fuzzy
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "diverse"
 
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Prosjekt</th><th>Koordinator</th>"
+#, fuzzy
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "OSS"
 
-#~ msgid "Related Links"
-#~ msgstr "Beslektede pekere"
+#, fuzzy
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "diverse"
 
-#~ msgid "Latest News"
-#~ msgstr "Siste nytt"
+#, fuzzy
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "diverse"
+
+#~ msgid "Debian CD team"
+#~ msgstr "Debians cd-gruppe"
+
+#~ msgid "debian_on_cd"
+#~ msgstr "Debian på CD"
+
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
+
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
+
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "buy"
+#~ msgstr "kjøp"
+
+#~ msgid "net_install"
+#~ msgstr "nettinstall"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "diverse"
 
-# 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 "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (død peker)"
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Donasjoner"
 
 #, 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 "Debate"
+#~ msgstr "Debians cd-gruppe"
+
+#, fuzzy
+#~ msgid "Proposer"
+#~ msgstr "foreslått"
+
+#, 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 ""
-#~ "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 "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "<a href=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
+#~ msgid "download with pik"
+#~ msgstr "hent med pik"
 
 #, 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>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
 #~ msgstr ""
-#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joey "
+#~ "Hess</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>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
 #~ msgstr ""
-#~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier og Martin 'Joey' Schulze</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>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
 #~ msgstr ""
-#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier og Martin 'Joey' Schulze</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>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
 #~ msgstr ""
-#~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary og Tollef Fog Heen</a>."
 
-#, fuzzy
-#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ 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 ""
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
 #~ msgstr ""
-#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ "MD5-kontrolsummer av disse filene er tilgjengelig i den <a href=\"<get-"
+#~ "var url />\">originale sikkerhetsmeldingen</a>."
+
+#~ msgid "No other external database security references currently 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"
 
 #, fuzzy
-#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "diverse"
+
+#, fuzzy
+#~ msgid ""
+#~ "<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=\"singularfemale\" />It was translated by %s."
+#~ msgid ""
+#~ "<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=\"pluralfemale\" />It was translated by %s."
+#~ msgid ""
+#~ "<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>."
 
 #~ 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 ""
@@ -628,254 +775,154 @@ msgstr "Tilbake til <a href=\"../\">Hvem bruker Debian? siden</a>."
 #~ "a>."
 
 #~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "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."
 #~ 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>."
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
 #~ 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 Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ 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>."
 
 #, fuzzy
-#~ 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 ""
-#~ "Ingen sikkerhetsreferanser er for tiden tilgjengelig i andre databaser."
-
-#~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
+#~ msgid "<void id=\"singular\" />It was translated by %s."
 #~ msgstr ""
-#~ "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 "Debian Security"
-#~ msgstr "Sikkerhet i Debian"
-
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (død peker)"
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
+#~ "a>."
 
+#, fuzzy
 #~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</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ør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary og Tollef Fog Heen</a>."
+#~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
+#~ "a>."
 
+#, fuzzy
 #~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</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\">Joe "
-#~ "'Zonker' Brockmeier og Martin 'Joey' Schulze</a>."
+#~ "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 ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "<void id=\"plural\" />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\">Joe "
-#~ "'Zonker' Brockmeier og Martin 'Joey' Schulze</a>."
+#~ "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 ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "<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\">Joey "
-#~ "Hess</a>."
-
-#~ msgid "download with pik"
-#~ msgstr "hent med pik"
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
+#~ "a>."
 
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
 #~ msgstr ""
-#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for informasjon om "
-#~ "å komme i kontakt med oss."
-
-#~ 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"
+#~ "<a href=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
 
 #, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Debians cd-gruppe"
+#~| 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>."
+#~ 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 "Nominations"
-#~ msgstr "Donasjoner"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (død peker)"
 
+# 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:"
-
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "diverse"
+#~ "Tilbake til: andre <a href=\"./\">Debiannyheter</a> || <a href=\"m4_HOME/"
+#~ "\">Debianprosjektets hjemmeside</a>."
 
-#~ msgid "net_install"
-#~ msgstr "nettinstall"
+#~ msgid "Latest News"
+#~ msgstr "Siste nytt"
 
-#~ msgid "buy"
-#~ msgstr "kjøp"
+#~ msgid "Related Links"
+#~ msgstr "Beslektede pekere"
 
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Prosjekt</th><th>Koordinator</th>"
 
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Main Coordinator"
+#~ msgstr "Hovedkoordinator"
 
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debians engasjement"
 
-#~ msgid "debian_on_cd"
-#~ msgstr "Debian på CD"
+#~ msgid "More Info"
+#~ msgstr "Mer informasjon"
 
-#~ msgid "Debian CD team"
-#~ msgstr "Debians cd-gruppe"
+#~ msgid "Where"
+#~ msgstr "Hvor"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "diverse"
+#~ msgid "When"
+#~ msgstr "Når"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "diverse"
+#~ msgid "link may no longer be valid"
+#~ msgstr "pekeren er muligvis gammel"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "OSS"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Kommende begivenheter"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "diverse"
+#~ msgid "More information"
+#~ msgstr "Mer informasjon"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "OSS"
+#~ msgid "Rating:"
+#~ msgstr "Vurdering:"
 
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "Nettverksinstallasjon"
+#~ msgid "Nobody"
+#~ msgstr "Ingen"
 
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "hent via http/ftp"
+#~ msgid "Taken by:"
+#~ msgstr "Tatt av:"
 
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "hent med jigdo"
+#~ msgid "More information:"
+#~ msgstr "Mer informasjon:"
 
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~| msgid "Select a server near you"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Velg en tjener nær deg: &nbsp;"
 
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Tilbake til <a href=\"./\">Debians konsulentliste</a>."
+#~| msgid "Report"
+#~ msgid "Report it!"
+#~ msgstr "Rapporter det"
 
-#~ msgid "List of Consultants"
-#~ msgstr "Konsulentliste"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Har du oppdaget et problem med nettstedets utforming?"
diff --git a/norwegian/po/vendors.nb.po b/norwegian/po/vendors.nb.po
index 5ad55eee4c5..7ef3da510be 100644
--- a/norwegian/po/vendors.nb.po
+++ b/norwegian/po/vendors.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2008-08-28 00:57+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,48 +99,48 @@ msgstr "kildekode"
 msgid "and"
 msgstr "og"
 
-#~ msgid "updated monthly"
-#~ msgstr "oppdateres månedlig"
+#~ msgid "Official CD"
+#~ msgstr "Offisiell CD"
 
-#~ msgid "updated twice weekly"
-#~ msgstr "oppdateres to ganger i uken"
+#, fuzzy
+#~ msgid "Official DVD"
+#~ msgstr "Offisiell CD"
 
-#~ msgid "updated weekly"
-#~ msgstr "oppdateres ukentlig"
+#~ msgid "Development Snapshot"
+#~ msgstr "Utviklingsversjon"
 
-#~ msgid "reseller"
-#~ msgstr "videreformidler"
+#~ msgid "Vendor Release"
+#~ msgstr "Leverandørutgave"
 
-#~ msgid "reseller of $var"
-#~ msgstr "videreformidler av $var"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Fler-distribusjon"
 
-#~ msgid "Custom Release"
-#~ msgstr "Bestillingsverk"
+#~ msgid "non-US included"
+#~ msgstr "non-US inkludert"
 
-#~ msgid "vendor additions"
-#~ msgstr "tillegg fra leverandør"
+#~ msgid "non-free included"
+#~ msgstr "non-free inkludert"
 
 #~ msgid "contrib included"
 #~ msgstr "contrib inkludert"
 
-#~ msgid "non-free included"
-#~ msgstr "non-free inkludert"
+#~ msgid "vendor additions"
+#~ msgstr "tillegg fra leverandør"
 
-#~ msgid "non-US included"
-#~ msgstr "non-US inkludert"
+#~ msgid "Custom Release"
+#~ msgstr "Bestillingsverk"
 
-#~ msgid "Multiple Distribution"
-#~ msgstr "Fler-distribusjon"
+#~ msgid "reseller of $var"
+#~ msgstr "videreformidler av $var"
 
-#~ msgid "Vendor Release"
-#~ msgstr "Leverandørutgave"
+#~ msgid "reseller"
+#~ msgstr "videreformidler"
 
-#~ msgid "Development Snapshot"
-#~ msgstr "Utviklingsversjon"
+#~ msgid "updated weekly"
+#~ msgstr "oppdateres ukentlig"
 
-#, fuzzy
-#~ msgid "Official DVD"
-#~ msgstr "Offisiell CD"
+#~ msgid "updated twice weekly"
+#~ msgstr "oppdateres to ganger i uken"
 
-#~ msgid "Official CD"
-#~ msgstr "Offisiell CD"
+#~ msgid "updated monthly"
+#~ msgstr "oppdateres månedlig"
diff --git a/norwegian/po/vote.nb.po b/norwegian/po/vote.nb.po
index 96c73a08055..5994330f900 100644
--- a/norwegian/po/vote.nb.po
+++ b/norwegian/po/vote.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2006-08-12 17:51+0200\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/norwegian/po/wnpp.nb.po b/norwegian/po/wnpp.nb.po
index f051018fed0..9a10f857291 100644
--- a/norwegian/po/wnpp.nb.po
+++ b/norwegian/po/wnpp.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2006-08-12 17:51+0200\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,32 +47,87 @@ msgstr ""
 msgid "%s days in adoption."
 msgstr ""
 
+#: ../../english/template/debian/wnpp.wml:46
+msgid "%s days in adoption, last activity today."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:50
+msgid "%s days in adoption, last activity yesterday."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:54
+msgid "%s days in adoption, last activity %s days ago."
+msgstr ""
+
 #. timespans for being_packaged (ITPs)
-#: ../../english/template/debian/wnpp.wml:47
+#: ../../english/template/debian/wnpp.wml:60
 msgid "in preparation since today."
 msgstr ""
 
-#: ../../english/template/debian/wnpp.wml:51
+#: ../../english/template/debian/wnpp.wml:64
 msgid "in preparation since yesterday."
 msgstr ""
 
-#: ../../english/template/debian/wnpp.wml:55
+#: ../../english/template/debian/wnpp.wml:68
 msgid "%s days in preparation."
 msgstr ""
 
+#: ../../english/template/debian/wnpp.wml:72
+msgid "%s days in preparation, last activity today."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:76
+msgid "%s days in preparation, last activity yesterday."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:80
+msgid "%s days in preparation, last activity %s days ago."
+msgstr ""
+
+#. timespans for request for adoption (RFAs)
+#: ../../english/template/debian/wnpp.wml:85
+msgid "adoption requested since today."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:89
+msgid "adoption requested since yesterday."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:93
+msgid "adoption requested since %s days."
+msgstr ""
+
+#. timespans for orphaned packages (Os)
+#: ../../english/template/debian/wnpp.wml:98
+msgid "orphaned since today."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:102
+msgid "orphaned since yesterday."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:106
+msgid "orphaned since %s days."
+msgstr ""
+
 #. time spans for requested (RFPs) and help requested (RFHs)
-#: ../../english/template/debian/wnpp.wml:60
+#: ../../english/template/debian/wnpp.wml:111
 msgid "requested today."
 msgstr ""
 
-#: ../../english/template/debian/wnpp.wml:64
+#: ../../english/template/debian/wnpp.wml:115
 msgid "requested yesterday."
 msgstr ""
 
-#: ../../english/template/debian/wnpp.wml:68
+#: ../../english/template/debian/wnpp.wml:119
 msgid "requested %s days ago."
 msgstr ""
 
-#: ../../english/template/debian/wnpp.wml:82
+#: ../../english/template/debian/wnpp.wml:133
 msgid "package info"
 msgstr ""
+
+#. popcon rank for RFH bugs
+#: ../../english/template/debian/wnpp.wml:139
+msgid "rank:"
+msgstr ""
author	David Prévot <taffit>	2013-12-25 19:56:15 +0000
committer	David Prévot <taffit>	2013-12-25 19:56:15 +0000
commit	eda6671342e7b94ebb66e74848ebdec42d8d2200 (patch)
tree	bdf411053f23c47923566233457b761fb14d6810 /norwegian/po
parent	0a66b674faec2859557a867c96ade0cbafde8ed9 (diff)