footer: Update src url to salsa git repo; refresh po files

Here are the commands I used:

cd ./english/po/;
make pot;
cd ../../;
for i in albanian/po/ arabic/po/ armenian/po/ bulgarian/po/ catalan/po/ chinese/po/ croatian/po/ czech/po/ danish/po/ dutch/po/ esperanto/po/ finnish/po/ french/po/ galician/po/ german/po/ greek/po/ hebrew/po/ hungarian/po/ indonesian/po/ italian/po/ japanese/po/ korean/po/ lithuanian/po/ norwegian/po/ persian/po/ polish/po/ portuguese/po/ romanian/po/ russian/po/ slovak/po/ slovene/po/ spanish/po/ swedish/po/ tamil/po/ turkish/po/ ukrainian/po/ vietnamese/po/ ; do (cd $i; make update-po ; ) ; done

13 files changed, 1051 insertions, 1008 deletions

diff --git a/norwegian/po/blends.nb.po b/norwegian/po/blends.nb.po
index 64b8c15bf29..b00934651af 100644
--- a/norwegian/po/blends.nb.po
+++ b/norwegian/po/blends.nb.po
@@ -17,35 +17,43 @@ msgstr ""
 
 #: ../../english/blends/released.data:15
 msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
 "The goal of DebiChem is to make Debian a good platform for chemists in their "
 "day-to-day work."
 msgstr ""
 
-#: ../../english/blends/released.data:23
+#: ../../english/blends/released.data:31
 msgid ""
 "The goal of Debian Games is to provide games in Debian from arcade and "
 "adventure to simulation and strategy."
 msgstr ""
 
-#: ../../english/blends/released.data:31
+#: ../../english/blends/released.data:39
 msgid ""
 "The goal of Debian Edu is to provide a Debian OS system suitable for "
 "educational use and in schools."
 msgstr ""
 
-#: ../../english/blends/released.data:39
+#: ../../english/blends/released.data:47
 msgid ""
 "The goal of Debian GIS is to develop Debian into the best distribution for "
 "Geographical Information System applications and users."
 msgstr ""
 
-#: ../../english/blends/released.data:49
+#: ../../english/blends/released.data:57
 msgid ""
 "The goal of Debian Junior is to make Debian an OS that children will enjoy "
 "using."
 msgstr ""
 
-#: ../../english/blends/released.data:57
+#: ../../english/blends/released.data:65
 msgid ""
 "The goal of Debian Med is a complete free and open system for all tasks in "
 "medical care and research. To achieve this goal Debian Med integrates "
@@ -53,13 +61,13 @@ msgid ""
 "clinic IT infrastructure, and others within the Debian OS."
 msgstr ""
 
-#: ../../english/blends/released.data:65
+#: ../../english/blends/released.data:73
 msgid ""
 "The goal of Debian Multimedia is to make Debian a good platform for audio "
 "and multimedia work."
 msgstr ""
 
-#: ../../english/blends/released.data:73
+#: ../../english/blends/released.data:81
 msgid ""
 "The goal of Debian Science is to provide a better experience when using "
 "Debian to researchers and scientists."
@@ -74,19 +82,11 @@ msgstr ""
 
 #: ../../english/blends/unreleased.data:23
 msgid ""
-"The goal of Debian Astro is to develop a Debian based operating system that "
-"fits the requirements of both professional and hobby astronomers. It "
-"integrates a large number of software packages covering telescope control, "
-"data reduction, presentation and other fields."
-msgstr ""
-
-#: ../../english/blends/unreleased.data:31
-msgid ""
 "The goal of Debian Design is to provide applications for designers. This "
 "includes graphic design, web design and multimedia design."
 msgstr ""
 
-#: ../../english/blends/unreleased.data:38
+#: ../../english/blends/unreleased.data:30
 msgid ""
 "The goal of Debian EzGo is to provide culture-based open and free technology "
 "with native language support and appropriate user friendly, lightweight and "
@@ -95,7 +95,7 @@ msgid ""
 "like Africa, Afghanistan, Indonesia, Vietnam  using Debian."
 msgstr ""
 
-#: ../../english/blends/unreleased.data:46
+#: ../../english/blends/unreleased.data:38
 msgid ""
 "The goal of FreedomBox is to develop, design and promote personal servers "
 "running free software for private, personal communications. Applications "
@@ -104,13 +104,13 @@ msgid ""
 "the users."
 msgstr ""
 
-#: ../../english/blends/unreleased.data:54
+#: ../../english/blends/unreleased.data:46
 msgid ""
 "The goal of Debian Hamradio is to support the needs of radio amateurs in "
 "Debian by providing logging, data mode and packet mode applications and more."
 msgstr ""
 
-#: ../../english/blends/unreleased.data:63
+#: ../../english/blends/unreleased.data:55
 msgid ""
 "The goal of DebianParl is to provide applications to support the needs of "
 "parliamentarians, politicians and their staffers all around the world."
diff --git a/norwegian/po/bugs.nb.po b/norwegian/po/bugs.nb.po
index 55a69bcc1b0..11ef3e9bfd3 100644
--- a/norwegian/po/bugs.nb.po
+++ b/norwegian/po/bugs.nb.po
@@ -155,114 +155,114 @@ msgstr "Arkivert"
 msgid "Archived and Unarchived"
 msgstr "Arkivert og ikke arkivert"
 
-#~ msgid "Flags:"
-#~ msgstr "Flagg:"
+#~ msgid "Exclude tag:"
+#~ msgstr "Ekskludér merkelapp:"
 
-#~ msgid "active bugs"
-#~ msgstr "aktive feil"
+#~ msgid "Include tag:"
+#~ msgstr "Inkludér merkelapp:"
 
-#~ 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"
 
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "vis ikke inneholdsfortegnelse i sidehode"
+#~ msgid "wontfix"
+#~ msgstr "fikser-ikke"
 
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "vis ikke statistikk i sidefot"
+#~ msgid "upstream"
+#~ msgstr "oppstrøms"
 
-#~ msgid "bugs"
-#~ msgstr "feil"
+# Sjekkes!
+#~ msgid "unreproducible"
+#~ msgstr "ikkereproduserbart"
 
-#~ msgid "open"
-#~ msgstr "åpen"
+#~ msgid "security"
+#~ msgstr "sikkerhet"
 
-#~ msgid "forwarded"
-#~ msgstr "videresendt"
+#~ msgid "patch"
+#~ msgstr "patch"
 
-#~ msgid "pending"
-#~ msgstr "på gang"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo"
 
-#~ msgid "fixed"
-#~ msgstr "rettet"
+#~ msgid "l10n"
+#~ msgstr "l10n"
 
-#~ msgid "done"
-#~ msgstr "ferdigt"
+#~ msgid "help"
+#~ msgstr "hjelp"
 
-#~ msgid "Include status:"
-#~ msgstr "Inkludér status:"
+#~ msgid "fixed-upstream"
+#~ msgstr "rettet-oppstrøms"
 
-#~ msgid "Exclude status:"
-#~ msgstr "Ekskludér status:"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "rettet-i-experimental"
 
-#~ msgid "critical"
-#~ msgstr "kritisk"
+#~ msgid "confirmed"
+#~ msgstr "bekreftet"
 
-#~ msgid "grave"
-#~ msgstr "graverende"
+#~ msgid "Exclude severity:"
+#~ msgstr "Ekskludér alvorlighetsgrad:"
 
-#~ msgid "serious"
-#~ msgstr "alvorlig"
+#~ msgid "Include severity:"
+#~ msgstr "Inkludér alvorlighetsgrad:"
 
-#~ msgid "important"
-#~ msgstr "viktig"
+#~ msgid "wishlist"
+#~ msgstr "ønske"
 
 #~ msgid "minor"
 #~ msgstr "liten"
 
-#~ msgid "wishlist"
-#~ msgstr "ønske"
+#~ msgid "important"
+#~ msgstr "viktig"
 
-#~ msgid "Include severity:"
-#~ msgstr "Inkludér alvorlighetsgrad:"
+#~ msgid "serious"
+#~ msgstr "alvorlig"
 
-#~ msgid "Exclude severity:"
-#~ msgstr "Ekskludér alvorlighetsgrad:"
+#~ msgid "grave"
+#~ msgstr "graverende"
 
-#~ msgid "confirmed"
-#~ msgstr "bekreftet"
+#~ msgid "critical"
+#~ msgstr "kritisk"
 
-#~ msgid "fixed-in-experimental"
-#~ msgstr "rettet-i-experimental"
+#~ msgid "Exclude status:"
+#~ msgstr "Ekskludér status:"
 
-#~ msgid "fixed-upstream"
-#~ msgstr "rettet-oppstrøms"
+#~ msgid "Include status:"
+#~ msgstr "Inkludér status:"
 
-#~ msgid "help"
-#~ msgstr "hjelp"
+#~ msgid "done"
+#~ msgstr "ferdigt"
 
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "fixed"
+#~ msgstr "rettet"
 
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo"
+#~ msgid "pending"
+#~ msgstr "på gang"
 
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "forwarded"
+#~ msgstr "videresendt"
 
-#~ msgid "security"
-#~ msgstr "sikkerhet"
+#~ msgid "open"
+#~ msgstr "åpen"
 
-# Sjekkes!
-#~ msgid "unreproducible"
-#~ msgstr "ikkereproduserbart"
+#~ msgid "bugs"
+#~ msgstr "feil"
 
-#~ msgid "upstream"
-#~ msgstr "oppstrøms"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "vis ikke statistikk i sidefot"
 
-#~ msgid "wontfix"
-#~ msgstr "fikser-ikke"
+#~ 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"
+#~ 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 "Flagg:"
diff --git a/norwegian/po/countries.nb.po b/norwegian/po/countries.nb.po
index 8fcf0c1a168..c136642c26e 100644
--- a/norwegian/po/countries.nb.po
+++ b/norwegian/po/countries.nb.po
@@ -425,8 +425,8 @@ msgstr "Sørafrika"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#~ msgid "Yugoslavia"
-#~ msgstr "Jugoslavia"
-
 #~ msgid "Great Britain"
 #~ msgstr "Storbritania"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Jugoslavia"
diff --git a/norwegian/po/distrib.nb.po b/norwegian/po/distrib.nb.po
index a28882ec06a..de087ee4b7c 100644
--- a/norwegian/po/distrib.nb.po
+++ b/norwegian/po/distrib.nb.po
@@ -206,24 +206,24 @@ msgstr ""
 msgid "SPARC"
 msgstr "SPARC"
 
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
 
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~| msgid "Intel x86"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
 
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
 
 #~ msgid "Intel IA-64"
 #~ msgstr "Intel IA-64"
 
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
 
-#~| msgid "Intel x86"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
 
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/norwegian/po/doc.nb.po b/norwegian/po/doc.nb.po
index 8f263716e0e..feeb09dafde 100644
--- a/norwegian/po/doc.nb.po
+++ b/norwegian/po/doc.nb.po
@@ -26,8 +26,8 @@ msgid ""
 "  Project."
 msgstr ""
 
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:185
-#: ../../english/doc/books.data:211
+#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
+#: ../../english/doc/books.data:216
 msgid ""
 "Written by two Debian developers, this free book\n"
 "  started as a translation of their French best-seller known as Cahier de\n"
@@ -51,31 +51,7 @@ msgid ""
 "  in the home, office, club, or school)."
 msgstr ""
 
-#: ../../english/doc/books.data:93
-msgid "Debian 2.2 ARM architecture"
-msgstr ""
-
-#: ../../english/doc/books.data:96
-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:123
+#: ../../english/doc/books.data:101
 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"
@@ -87,7 +63,7 @@ msgid ""
 "  administrator who wants to build a reliable network with Debian."
 msgstr ""
 
-#: ../../english/doc/books.data:142
+#: ../../english/doc/books.data:120
 msgid ""
 "The book covers topics ranging from concepts of package\n"
 "  management over the available tools and how they're used to concrete "
@@ -99,7 +75,7 @@ msgid ""
 "  PDF, ePub, Mobi), printed book planned.\n"
 msgstr ""
 
-#: ../../english/doc/books.data:162
+#: ../../english/doc/books.data:140
 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 "
@@ -107,6 +83,22 @@ msgid ""
 "for all users who want to learn more about Debian and its range of services."
 msgstr ""
 
+#: ../../english/doc/books.data:191
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+"  This book teaches you how to build and configure Debian 8.x server system\n"
+"  security hardening using Kali Linux and Debian simultaneously.\n"
+"  DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+"  From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+"  how to enhance Debian's security by applying the method of penetration\n"
+"  testing.\n"
+"  This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+"  MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+"  intrusion detection system."
+msgstr ""
+
 #: ../../english/doc/books.def:38
 msgid "Author:"
 msgstr "Forfatter:"
@@ -159,10 +151,10 @@ msgstr "(versjon <get-var version />)"
 msgid "plain text"
 msgstr "ren tekst"
 
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
 msgid ""
 "The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\"https://packages.debian.org/git\">Git</a> repository."
 msgstr ""
 
 #: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
@@ -187,12 +179,6 @@ msgid ""
 "\"https://packages.debian.org/subversion\">Subversion</a> repository."
 msgstr ""
 
-#: ../../english/doc/manuals.defs:178
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-
 #: ../../english/doc/manuals.defs:188
 msgid ""
 "CVS sources working copy: set <code>CVSROOT</code>\n"
@@ -223,12 +209,12 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
+#~ msgid "Language:"
+#~ msgstr "Språk:"
+
 #~ msgid ""
 #~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
 #~ "ddp_pkg_loc />."
 #~ msgstr ""
 #~ "Bruk <a href=\"cvs\">SVN</a> for å hente SGML-kildeteksten for <get-var "
 #~ "ddp_pkg_loc />."
-
-#~ msgid "Language:"
-#~ msgstr "Språk:"
diff --git a/norwegian/po/mailinglists.nb.po b/norwegian/po/mailinglists.nb.po
index a805517f8c1..5ad79fdd49f 100644
--- a/norwegian/po/mailinglists.nb.po
+++ b/norwegian/po/mailinglists.nb.po
@@ -122,8 +122,8 @@ msgstr "åpen"
 msgid "closed"
 msgstr "lukket"
 
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Velg listene du vil abonnere på:"
-
 #~ msgid "Please select which lists you want to unsubscribe from:"
 #~ msgstr "Velg listene du vil si opp abonnementet på:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Velg listene du vil abonnere på:"
diff --git a/norwegian/po/organization.nb.po b/norwegian/po/organization.nb.po
index f5d2fce4d6d..273507c1cf4 100644
--- a/norwegian/po/organization.nb.po
+++ b/norwegian/po/organization.nb.po
@@ -71,24 +71,24 @@ msgid "Officers"
 msgstr "Styremedlemmer"
 
 #: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:87
 msgid "Distribution"
 msgstr "Distribusjon"
 
 #: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:229
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:56
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:232
 #, fuzzy
 #| msgid "Publicity"
 msgid "Publicity team"
 msgstr "Publisitet"
 
 #: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:295
+#: ../../english/intro/organization.data:300
 msgid "Support and Infrastructure"
 msgstr "Støtte og infrastruktur"
 
@@ -105,211 +105,211 @@ msgstr "Leder"
 msgid "Technical Committee"
 msgstr "Teknisk komité"
 
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:82
 msgid "Secretary"
 msgstr "Sekretær"
 
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:90
 msgid "Development Projects"
 msgstr "Utviklingsprosjekter"
 
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:91
 msgid "FTP Archives"
 msgstr "FTP-arkiv"
 
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:93
 msgid "FTP Masters"
 msgstr "FTP-ansvarlige"
 
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:99
 msgid "FTP Assistants"
 msgstr "FTP-assistenter"
 
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:104
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:108
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:110
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:114
 msgid "Individual Packages"
 msgstr "Individuelle pakker"
 
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:115
 msgid "Release Management"
 msgstr "Utgavekoordinering"
 
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:117
 msgid "Release Team"
 msgstr "Utgiverlag"
 
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:130
 msgid "Quality Assurance"
 msgstr "Kvalitetskontroll"
 
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:131
 msgid "Installation System Team"
 msgstr "Installasjonsystems-gruppen"
 
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:132
 msgid "Release Notes"
 msgstr "Utgivelsesnotater"
 
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:134
 msgid "CD Images"
 msgstr "CD-avtrykk"
 
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:136
 msgid "Production"
 msgstr "Produksjon"
 
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:144
 msgid "Testing"
 msgstr "Testing"
 
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:146
 msgid "Autobuilding infrastructure"
 msgstr "Infrastruktur for automatisk bygging"
 
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:148
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:156
 msgid "Buildd administration"
 msgstr "Buildd-administrasjon"
 
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:175
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:180
 msgid "Work-Needing and Prospective Packages list"
 msgstr "List over pakker som trenger arbeid og mulige pakker"
 
-#: ../../english/intro/organization.data:178
-msgid "Live System Team"
-msgstr "Gruppen for «live»-system"
+#: ../../english/intro/organization.data:183
+msgid "Debian Live Team"
+msgstr ""
 
-#: ../../english/intro/organization.data:179
+#: ../../english/intro/organization.data:184
 msgid "Ports"
 msgstr "Porteringer"
 
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:219
 msgid "Special Configurations"
 msgstr "Spesielle systemer"
 
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:222
 msgid "Laptops"
 msgstr "Bærbare"
 
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:223
 msgid "Firewalls"
 msgstr "Brannvegger"
 
-#: ../../english/intro/organization.data:219
+#: ../../english/intro/organization.data:224
 msgid "Embedded systems"
 msgstr "Innebygde system"
 
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
 msgid "Press Contact"
 msgstr "Pressekontakt"
 
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:239
 msgid "Web Pages"
 msgstr "Nettsider"
 
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:249
 msgid "Planet Debian"
 msgstr "Planet Debian"
 
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:254
 msgid "Outreach"
 msgstr ""
 
-#: ../../english/intro/organization.data:253
+#: ../../english/intro/organization.data:258
 msgid "Debian Women Project"
 msgstr "Debian kvinneprosjekt"
 
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:266
 msgid "Anti-harassment"
 msgstr ""
 
-#: ../../english/intro/organization.data:267
+#: ../../english/intro/organization.data:272
 msgid "Events"
 msgstr "Begivenheter"
 
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:278
 #, fuzzy
 #| msgid "Technical Committee"
 msgid "DebConf Committee"
 msgstr "Teknisk komité"
 
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:285
 msgid "Partner Program"
 msgstr "Partnerprogram"
 
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:290
 msgid "Hardware Donations Coordination"
 msgstr "Koordinering av maskinvaredonasjon"
 
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:303
 msgid "User support"
 msgstr "Brukerstøtte"
 
-#: ../../english/intro/organization.data:365
+#: ../../english/intro/organization.data:370
 msgid "Bug Tracking System"
 msgstr "Feilrapportsystem"
 
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:375
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "Postlisteadministrasjon og -arkiv"
 
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:383
 msgid "New Members Front Desk"
 msgstr "Resepsjon for nye medlemmer"
 
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:389
 msgid "Debian Account Managers"
 msgstr "Debian kontoforvaltere"
 
-#: ../../english/intro/organization.data:389
+#: ../../english/intro/organization.data:393
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:394
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "Nøkkelring-koordinatore (PGP og GPG)"
 
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:397
 msgid "Security Team"
 msgstr "Sikkerhetsgruppen"
 
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:409
 msgid "Consultants Page"
 msgstr "Konsulentsiden"
 
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:414
 msgid "CD Vendors Page"
 msgstr "Side med CD-leverandører"
 
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:417
 msgid "Policy"
 msgstr "Retningslinjer"
 
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:422
 msgid "System Administration"
 msgstr "Systemadministrasjon"
 
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:423
 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."
@@ -318,7 +318,7 @@ msgstr ""
 "maskiner, slik som passordproblemer eller behov for å ha en særskilt pakke "
 "installert."
 
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:432
 msgid ""
 "If you have hardware problems with Debian machines, please see <a href="
 "\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -328,106 +328,103 @@ msgstr ""
 "debian.org/machines.cgi\">Debians maskinside</a>. Denne skulle inneholde "
 "adminstrator-opplysninger for hver maskin."
 
-#: ../../english/intro/organization.data:431
+#: ../../english/intro/organization.data:433
 msgid "LDAP Developer Directory Administrator"
 msgstr "Administrator av LDAP-utviklerlisten"
 
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:434
 msgid "Mirrors"
 msgstr "Blåkopier"
 
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:441
 msgid "DNS Maintainer"
 msgstr "DNS-forvalter"
 
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:442
 msgid "Package Tracking System"
 msgstr "Pakkesporingssystem"
 
-#: ../../english/intro/organization.data:440
-msgid "Auditor"
-msgstr "Revisor"
+#: ../../english/intro/organization.data:444
+msgid "Treasurer"
+msgstr ""
 
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:450
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:453
+#, fuzzy
+#| msgid "Alioth administrators"
+msgid "Salsa administrators"
+msgstr "Alioth-administratorer"
+
+#: ../../english/intro/organization.data:457
 msgid "Alioth administrators"
 msgstr "Alioth-administratorer"
 
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:470
 msgid "Debian for children from 1 to 99"
 msgstr "Debian for barn mellom 1 og 99"
 
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:473
 msgid "Debian for medical practice and research"
 msgstr "Debian for medisinsk praksis og forskning"
 
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:476
 msgid "Debian for education"
 msgstr "Debian for utdanning"
 
-#: ../../english/intro/organization.data:473
+#: ../../english/intro/organization.data:481
 msgid "Debian in legal offices"
 msgstr "Debian på juridiske kontor"
 
-#: ../../english/intro/organization.data:477
+#: ../../english/intro/organization.data:485
 msgid "Debian for people with disabilities"
 msgstr "Debian for folk med funksjonshemning"
 
-#: ../../english/intro/organization.data:481
+#: ../../english/intro/organization.data:489
 msgid "Debian for science and related research"
 msgstr "Debian for naturvitenskap og relatert forskning"
 
-#~ msgid "Publicity"
-#~ msgstr "Publisitet"
-
+#: ../../english/intro/organization.data:492
 #, fuzzy
-#~| msgid "Debian Maintainer Keyring Team"
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Debian utviklernøkkelringlag"
-
-#, fuzzy
-#~| msgid "Release Team"
-#~ msgid "Volatile Team"
-#~ msgstr "Utgiverlag"
-
-#~ msgid "Vendors"
-#~ msgstr "Leverandører"
-
-#, fuzzy
-#~ msgid "Release Assistants"
-#~ msgstr "Utgavekoordinering"
+#| msgid "Debian for education"
+msgid "Debian for astronomy"
+msgstr "Debian for utdanning"
 
-#~ msgid "Mailing List Archives"
-#~ msgstr "Postliste-arkiver"
+#~ msgid "Testing Security Team"
+#~ msgstr "Lag for sikkerhet testing"
 
-#~ msgid "Mailing list"
-#~ msgstr "Postliste"
+#~ msgid "Security Audit Project"
+#~ msgstr "Sikkerhetsvurderingsprosjekt"
 
-#~ msgid "Installation"
-#~ msgstr "Installasjon"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "nåværende leder for Debian-prosjektet"
 
-#~ 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://"
@@ -439,35 +436,56 @@ msgstr "Debian for naturvitenskap og relatert forskning"
 #~ "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 "current Debian Project Leader"
-#~ msgstr "nåværende leder for Debian-prosjektet"
+#~ msgid "Installation"
+#~ msgstr "Installasjon"
 
-#~ msgid "Security Audit Project"
-#~ msgstr "Sikkerhetsvurderingsprosjekt"
+#~ msgid "Mailing list"
+#~ msgstr "Postliste"
 
-#~ msgid "Testing Security Team"
-#~ msgstr "Lag for sikkerhet testing"
+#~ 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"
+
+#, fuzzy
+#~| msgid "Debian Maintainer Keyring Team"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Debian utviklernøkkelringlag"
+
+#~ msgid "Publicity"
+#~ msgstr "Publisitet"
+
+#~ msgid "Auditor"
+#~ msgstr "Revisor"
+
+#~ msgid "Live System Team"
+#~ msgstr "Gruppen for «live»-system"
diff --git a/norwegian/po/others.nb.po b/norwegian/po/others.nb.po
index 2e3567f1689..b2b0257743b 100644
--- a/norwegian/po/others.nb.po
+++ b/norwegian/po/others.nb.po
@@ -321,131 +321,131 @@ msgstr "Versjon"
 msgid "URL"
 msgstr "Nettadresse"
 
-#~ msgid "p<get-var page />"
-#~ msgstr "s.<get-var page />"
+#~ msgid "Wanted:"
+#~ msgstr "Ønsket:"
 
-#~ msgid "developers only"
-#~ msgstr "kun for utviklere"
+#~ msgid "Who:"
+#~ msgstr "Hvem:"
 
-#~ msgid "deity developers only"
-#~ msgstr "kun for deity-utviklere"
+#~ msgid "Architecture:"
+#~ msgstr "Arkitektur:"
 
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "Kun for Debians tekniske komité"
+#~ msgid "Specifications:"
+#~ msgstr "Spesifikasjoner:"
 
-#~ msgid "closed"
-#~ msgstr "lukket"
+#~ msgid "Where:"
+#~ msgstr "Hvor:"
 
-#~ msgid "open"
-#~ msgstr "åpen"
+#~ msgid "Name:"
+#~ msgstr "Navn:"
 
-#~ msgid "Unsubscribe"
-#~ msgstr "Si opp"
+#~ msgid "Company:"
+#~ msgstr "Selskap:"
 
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Velg listene du vil si opp abonnementet på:"
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "or"
+#~ msgstr "eller"
+
+#~ msgid "Email:"
+#~ msgstr "E-post:"
+
+#~ msgid "Rates:"
+#~ msgstr "Takst:"
+
+#~ 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."
-
-#~ msgid "Willing to Relocate"
-#~ msgstr "Villig å flytte"
-
-#~ msgid "Rates:"
-#~ msgstr "Takst:"
-
-#~ msgid "Email:"
-#~ msgstr "E-post:"
-
-#~ msgid "or"
-#~ msgstr "eller"
+#~ "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 "URL:"
-#~ msgstr "URL:"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Velg listene du vil si opp abonnementet på:"
 
-#~ msgid "Company:"
-#~ msgstr "Selskap:"
+#~ msgid "Unsubscribe"
+#~ msgstr "Si opp"
 
-#~ msgid "Name:"
-#~ msgstr "Navn:"
+#~ msgid "open"
+#~ msgstr "åpen"
 
-#~ msgid "Where:"
-#~ msgstr "Hvor:"
+#~ msgid "closed"
+#~ msgstr "lukket"
 
-#~ msgid "Specifications:"
-#~ msgstr "Spesifikasjoner:"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "Kun for Debians tekniske komité"
 
-#~ msgid "Architecture:"
-#~ msgstr "Arkitektur:"
+#~ msgid "deity developers only"
+#~ msgstr "kun for deity-utviklere"
 
-#~ msgid "Who:"
-#~ msgstr "Hvem:"
+#~ msgid "developers only"
+#~ msgstr "kun for utviklere"
 
-#~ msgid "Wanted:"
-#~ msgstr "Ønsket:"
+#~ msgid "p<get-var page />"
+#~ msgstr "s.<get-var page />"
diff --git a/norwegian/po/partners.nb.po b/norwegian/po/partners.nb.po
index 4bf44c6617a..6d1e8018a15 100644
--- a/norwegian/po/partners.nb.po
+++ b/norwegian/po/partners.nb.po
@@ -4,163 +4,154 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../english/partners/partners.def:8
-msgid "Development Partners"
+msgid "Partner of the Month"
 msgstr ""
 
 #: ../../english/partners/partners.def:12
-msgid "Financial Partners"
+msgid "Alphabetical List of Partners"
 msgstr ""
 
 #: ../../english/partners/partners.def:16
-msgid "Service Partners"
+msgid "Development Partners"
 msgstr ""
 
 #: ../../english/partners/partners.def:20
-msgid ""
-"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-"partners that provide the infrastructure for the <a href=\"https://snapshot."
-"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
-"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
-"(TB) of capacity. In 2017 they renewed their support by provisioning two "
-"additional dedicated servers that expanded the storage at their location by "
-"50%, enough to accommodate anticipated growth for years to come."
+msgid "Financial Partners"
 msgstr ""
 
-#: ../../english/partners/partners.def:23
-msgid ""
-"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
-"customers on-demand, world-class hosting solutions, from dedicated servers "
-"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
-"\"https://www.leaseweb.com/\">website</a>."
+#: ../../english/partners/partners.def:24
+msgid "Service Partners"
 msgstr ""
 
-#: ../../english/partners/partners.def:27
+#: ../../english/partners/partners.def:30
 msgid ""
-"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
-"supporting the Debian project as a hosting partner for several years. In "
-"addition, the IT specialists also host the Debian Bug Squashing Parties in "
-"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
-"at conova."
+"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
+"several servers in their Karlsruhe high-performance datacenter."
 msgstr ""
 
-#: ../../english/partners/partners.def:30
+#: ../../english/partners/partners.def:33
 msgid ""
-"conova operates one of the most modern data centers in all of Europe in "
-"Salzburg, Austria. Their services: customized solutions for housing, "
-"hosting, managed &amp; cloud services, outsourcing as well as network and "
-"security. The company offers space for more than 10,000 servers at the "
-"highest level of supply and security on their 2,000 m² of technical area."
+"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
+"worldwide, with offices in Germany, France, Great Britain, Spain and the "
+"USA. Most of the over 5 million websites and other services managed by "
+"1&amp;1 are running on a Debian-based environment using several thousand "
+"servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:34
+#: ../../english/partners/partners.def:41
 msgid ""
-"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
-"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
-"Debian services (current HPE hardware donations are listed in the <a href="
-"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
+"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
+"by providing hosting services and sponsorship for the Debian Conference."
 msgstr ""
 
-#: ../../english/partners/partners.def:37
+#: ../../english/partners/partners.def:45
 msgid ""
-"HPE is one of the largest computer companies in the world, providing a wide "
-"range of products and services, such as servers, storage, networking, "
-"consulting and support, software, and financial services."
+"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
+"provide scalable, powerful and affordable hosting with lots of <q>geek "
+"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
+"within their network, and comes recommended as the <q>Distribution of "
+"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
+"are also well known for their expert and friendly support."
 msgstr ""
 
-#: ../../english/partners/partners.def:41
+#: ../../english/partners/partners.def:53
 msgid ""
-"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
-"port development, Debian mirrors, and other Debian services (current HP "
-"hardware donations are listed in the <a href=\"https://db.debian.org/"
-"machines.cgi\">Debian machines</a> page). For information about HP's "
-"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
-"com/products1/linux/\">HP Linux</a>."
+"<a href=\"https://www.conova.com\">conova communications GmbH</a> has been "
+"supporting the Debian project as a hosting partner for several years. In "
+"addition, the IT specialists also host the Debian Bug Squashing Parties in "
+"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
+"at conova."
 msgstr ""
 
-#: ../../english/partners/partners.def:44
+#: ../../english/partners/partners.def:56
 msgid ""
-"Hewlett-Packard is one of the largest computer companies in the world, "
-"providing a wide range of products and services, such as servers, PCs, "
-"printers, storage products, network equipment, software, cloud computing "
-"solutions, etc."
+"conova operates one of the most modern data centers in all of Europe in "
+"Salzburg, Austria. Their services: customized solutions for housing, "
+"hosting, managed &amp; cloud services, outsourcing as well as network and "
+"security. The company offers space for more than 10,000 servers at the "
+"highest level of supply and security on their 2,000 m² of technical area."
 msgstr ""
 
-#: ../../english/partners/partners.def:49
+#: ../../english/partners/partners.def:63
 msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
-"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
-"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
-"For information about Thomas Krenn's involvement in the Linux Open Source "
-"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
-"thomas-krenn.com/linux</a>."
+"credativ is an independent consulting and services company and since 1999 "
+"been offering comprehensive services and technical support for the "
+"implementation and operation of open source software in business "
+"applications. Our <q>Open Source Support Center</q> is always available, 365 "
+"days a year, around the clock."
 msgstr ""
 
-#: ../../english/partners/partners.def:52
+#: ../../english/partners/partners.def:66
 msgid ""
-"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
-"online shop for server systems and high-quality hosting. They offer rack-"
-"mountable servers, silent and low-noise servers, storage systems and "
-"virtualization solutions. Thomas Krenn is the only hardware shop who "
-"delivers individual configured servers within 24 hours across Europe. And of "
-"course they support Debian as operating system on their servers!"
+"From the very beginning credativ has actively supported the Debian project "
+"and will continue to do so in the future. Furthermore many of our "
+"consultants are also Debian developers and actively involved in contributing "
+"to free software projects worldwide. Further information can be found at "
+"<url \"http://www.credativ.com/\">."
 msgstr ""
 
-#: ../../english/partners/partners.def:56
+#: ../../english/partners/partners.def:72
 msgid ""
-"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
-"to work on the S/390 port of Debian and packages mainly related to Java. "
-"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
-"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
-"for LinuxTag 2001 in Stuttgart."
+"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
+"hardware and hosting services from their colocation sites via high-speed "
+"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
+"an IBM x360 server. "
 msgstr ""
 
-#: ../../english/partners/partners.def:59
+#: ../../english/partners/partners.def:76
 msgid ""
-"trustsec offers customer support, consulting and training for Debian on the "
-"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
-"network security and software development with Java. Please e-mail <a href="
-"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
+"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
+"on IT infrastructures, software development and hosting services. DG-i "
+"supports clients in analysing their IT environment, developing individual "
+"software solutions and in adjusting client's applications for a seamless "
+"transition into hosted services. The company designs and supports individual "
+"operational IT concepts that meet the high quality standards especially in E-"
+"Commerce and financial services. DG-i holds the necessary hosting "
+"infrastructure in their Munich and Dusseldorf data centers."
 msgstr ""
 
-#: ../../english/partners/partners.def:63
+#: ../../english/partners/partners.def:82
 msgid ""
-"credativ is a service oriented company focusing on open-source software "
-"since its foundation in 1999. World-wide Debian support is provided by "
-"credativ's <q>Open Source Support Centers</q> around the globe."
+"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
+"infrastructure from power issues, and employs a Debian Developer to work on "
+"UPS and Power Devices support through the <a href=\"http://www."
+"networkupstools.org/\">Network UPS Tools</a> and related packages."
 msgstr ""
 
-#: ../../english/partners/partners.def:66
+#: ../../english/partners/partners.def:85
 msgid ""
-"A large number of credativ staff are Debian developers, several of them very "
-"well know in the community. From the very beginning credativ has actively "
-"supported the Debian project. For more information please visit <url "
-"\"http://www.credativ.com/\">."
+"Eaton is a global technology leader in electrical components and systems for "
+"power quality, distribution and control; hydraulics components, systems and "
+"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
+"pneumatic systems for commercial and military use; and truck and automotive "
+"drivetrain and powertrain systems for performance, fuel economy and safety. "
+"Eaton has approximately 75,000 employees and sells products to customers in "
+"more than 150 countries, with 2008 sales of $15.4 billion."
 msgstr ""
 
-#: ../../english/partners/partners.def:70
+#: ../../english/partners/partners.def:92
 msgid ""
-"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
-"both the creation and testing of the new debian-installer and the "
-"localization of Debian."
+"<a href=\"https://www.fastly.com/\">Fastly</a> provides Debian with content "
+"delivery network (CDN) services and is helping us deliver packages to users "
+"through <a href=\"https://deb.debian.org/\">deb.debian.org</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:73
+#: ../../english/partners/partners.def:95
 msgid ""
-"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
-"universities. An easy 3-question installation results in a preconfigured "
-"system tailored for schools, requiring almost no Linux or networking "
-"knowledge. This includes 15 preconfigured services and a localized "
-"environment."
+"Fastly’s edge cloud platform provides advanced application delivery and "
+"cloud security for the world’s most popular online destinations. Fastly "
+"works with the best of the Internet, serving 14 trillion requests each "
+"month, more than 10 percent of all internet requests."
 msgstr ""
 
-#: ../../english/partners/partners.def:77
+#: ../../english/partners/partners.def:102
 msgid ""
 "Since 2002, Genesi has provided the hardware it designs and develops to the "
 "Debian community. Genesi also employs Debian developers to support their "
 "platforms."
 msgstr ""
 
-#: ../../english/partners/partners.def:80
+#: ../../english/partners/partners.def:105
 msgid ""
 "Genesi's <a href=\"http://www.genesi-usa.com/products\">Efika MX</a> ARM-"
 "based computers are designed to bring low cost, energy efficient computing "
@@ -169,45 +160,41 @@ msgid ""
 "powerdeveloper.org/\">www.PowerDeveloper.org.</a>"
 msgstr ""
 
-#: ../../english/partners/partners.def:84
+#: ../../english/partners/partners.def:112
 msgid ""
-"<a href=\"http://www.eaton.com/\">Eaton</a> helps Debian in protecting its "
-"infrastructure from power issues, and employs a Debian Developer to work on "
-"UPS and Power Devices support through the <a href=\"http://www."
-"networkupstools.org/\">Network UPS Tools</a> and related packages."
+"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
+"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
+"Debian services (current HPE hardware donations are listed in the <a href="
+"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
 msgstr ""
 
-#: ../../english/partners/partners.def:87
+#: ../../english/partners/partners.def:115
 msgid ""
-"Eaton is a global technology leader in electrical components and systems for "
-"power quality, distribution and control; hydraulics components, systems and "
-"services for industrial and mobile equipment; aerospace fuel, hydraulics and "
-"pneumatic systems for commercial and military use; and truck and automotive "
-"drivetrain and powertrain systems for performance, fuel economy and safety. "
-"Eaton has approximately 75,000 employees and sells products to customers in "
-"more than 150 countries, with 2008 sales of $15.4 billion."
+"HPE is one of the largest computer companies in the world, providing a wide "
+"range of products and services, such as servers, storage, networking, "
+"consulting and support, software, and financial services."
 msgstr ""
 
-#: ../../english/partners/partners.def:91
+#: ../../english/partners/partners.def:123
 msgid ""
-"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
-"machines which make up the bulk of the Debian ARM infrastructure. In "
-"addition Simtec employs several developers who contribute towards the Debian "
-"ARM port."
+"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
+"partners that provide the infrastructure for the <a href=\"https://snapshot."
+"debian.org\">Debian OS Snapshot Archive</a> since <a href=\"https://www."
+"debian.org/News/2014/20141014\">October 2014</a>, providing 80 Terabytes "
+"(TB) of capacity. In 2017 they renewed their support by provisioning two "
+"additional dedicated servers that expanded the storage at their location by "
+"50%, enough to accommodate anticipated growth for years to come."
 msgstr ""
 
-#: ../../english/partners/partners.def:94
+#: ../../english/partners/partners.def:126
 msgid ""
-"Simtec is a leading provider of ARM based computing products. We have a "
-"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
-"which serve a wide range of uses within the embedded market. We provide a "
-"complete range of products and solutions which can be tailored to suit the "
-"customers needs from off the shelf integrator solutions right through to "
-"fully custom designs. All of our products ship with open source tools and "
-"operating systems."
+"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
+"customers on-demand, world-class hosting solutions, from dedicated servers "
+"to cloud solutions. You can learn more about LeaseWeb visiting their <a href="
+"\"https://www.leaseweb.com/\">website</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:98
+#: ../../english/partners/partners.def:132
 msgid ""
 "<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
 "lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -216,7 +203,7 @@ msgid ""
 "Loongson</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:101
+#: ../../english/partners/partners.def:135
 msgid ""
 "Loongson processors are a series of MIPS-compatible processors. They have "
 "been widely used in many areas, such as desktop, server, embedded "
@@ -224,187 +211,226 @@ msgid ""
 "<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:106
+#: ../../english/partners/partners.def:141
 msgid ""
-"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
-"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
-"Debian System</a>. For each book sold, the publisher and author together "
-"donate 1&euro; to the Debian Project."
+"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
+"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
+"by hosting several debian.org and debian.net servers as well as the buildd "
+"network for experimental and debconf.org machines."
 msgstr ""
 
-#: ../../english/partners/partners.def:109
+#: ../../english/partners/partners.def:145
 msgid ""
-"Open Source Press specialises on books around Linux and Open Source "
-"Software, written by authors with considerable experience in the fields, and "
-"produced in close cooperation with the respective communities. The Open "
-"Source Press publications are renowned for their quality and depth."
+"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
+"region connecting educational and research organisations to a high speed "
+"redundant network ring and providing internet access. The company is owned "
+"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
+"to operating MANDA it is also providing IT consulting and IT services to "
+"both universities."
 msgstr ""
 
-#: ../../english/partners/partners.def:113
+#: ../../english/partners/partners.def:153
 msgid ""
-"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
-"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
-"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
-"company is well known for publishing high-quality titles on a broad range of "
-"topics including alternative operating systems, networking, hacking, "
-"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
-"copy of The Debian System to the Debian Project."
+"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
+"a> provides hosting and administration services to the Debian project."
 msgstr ""
 
-#: ../../english/partners/partners.def:117
+#: ../../english/partners/partners.def:157
 msgid ""
-"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
-"Novare) provides several machines to Debian, as well as hosting and server "
-"administration services."
+"The Open Source Lab is a focal point for open source development at Oregon "
+"State University and beyond. The OSL provides development, hosting and "
+"assorted other services to the Open Source community."
 msgstr ""
 
-#: ../../english/partners/partners.def:120
+#: ../../english/partners/partners.def:163
 msgid ""
-"Brainfood is a technology solutions company whose goal is to work to produce "
-"an ideal result for a specific need, whether it's a website or an ongoing, "
-"distance-learning intranet application, or custom developed software. &nbsp; "
-"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
-"\">debian-contact@brainfood.com</A>."
+"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
+"both the creation and testing of the new debian-installer and the "
+"localization of Debian."
 msgstr ""
 
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:166
 msgid ""
-"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
-"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
-"promote Debian by getting the system right in the hands of potential and "
-"current users."
+"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
+"universities. An easy 3-question installation results in a preconfigured "
+"system tailored for schools, requiring almost no Linux or networking "
+"knowledge. This includes 15 preconfigured services and a localized "
+"environment."
 msgstr ""
 
-#: ../../english/partners/partners.def:128
+#: ../../english/partners/partners.def:172
 msgid ""
-"Linux Central sells all the latest releases of Linux products such as "
-"commercial software, books, hardware, and versions of major Linux "
-"distributions. On Linux Central's site you can also find news and basic "
-"information about Linux, or sign up for a newsletter to stay updated on all "
-"newly released products or daily specials. &nbsp; For more information, "
-"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
+"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
+"supporting the Debian community by donating hardware, rackspace and "
+"bandwidth for the Debian server hosting alioth, arch and svn."
 msgstr ""
 
-#: ../../english/partners/partners.def:132
+#: ../../english/partners/partners.def:175
 msgid ""
-"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
-"Networks) is a UK ISP specialising in dedicated hosting. It provides "
-"dedicated servers, managed servers solutions, colocation services and VPS "
-"virtual servers."
+"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
+"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
+"are highly motivated Debian users and some of them also Debian maintainers."
 msgstr ""
 
-#: ../../english/partners/partners.def:135
+#: ../../english/partners/partners.def:178
 msgid ""
-"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
-"machines.cgi?host=caballero\">caballero</a>."
+"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
+"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
+"the two biggest newspapers in The Netherlands."
 msgstr ""
 
-#: ../../english/partners/partners.def:139
+#: ../../english/partners/partners.def:184
 msgid ""
-"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
-"a> provides hosting and administration services to the Debian project."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
+"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
+"is a regular hardware sponsor for DebConf or the Debian booth at LinuxTag. "
+"For information about Thomas Krenn's involvement in the Linux Open Source "
+"community, see <a href=\"http://www.thomas-krenn.com/linux\">http://www."
+"thomas-krenn.com/linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:143
+#: ../../english/partners/partners.def:187
 msgid ""
-"The Open Source Lab is a focal point for open source development at Oregon "
-"State University and beyond. The OSL provides development, hosting and "
-"assorted other services to the Open Source community."
+"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
+"online shop for server systems and high-quality hosting. They offer rack-"
+"mountable servers, silent and low-noise servers, storage systems and "
+"virtualization solutions. Thomas Krenn is the only hardware shop who "
+"delivers individual configured servers within 24 hours across Europe. And of "
+"course they support Debian as operating system on their servers!"
 msgstr ""
 
-#: ../../english/partners/partners.def:147
+#: ../../english/partners/partners.def:193
 msgid ""
-"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
-"supporting the Debian community by donating hardware, rackspace and "
-"bandwidth for the Debian server hosting alioth, arch and svn."
+"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
+"to work on the S/390 port of Debian and packages mainly related to Java. "
+"They host the <a href=\"http://www.trustsec.de/deb390/\">web portal</a> for "
+"Debian on S/390 and zSeries. They've paid and worked on the free Debian CDs "
+"for LinuxTag 2001 in Stuttgart."
 msgstr ""
 
-#: ../../english/partners/partners.def:150
+#: ../../english/partners/partners.def:196
 msgid ""
-"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
-"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
-"are highly motivated Debian users and some of them also Debian maintainers."
+"trustsec offers customer support, consulting and training for Debian on the "
+"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
+"network security and software development with Java. Please e-mail <a href="
+"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
 msgstr ""
 
-#: ../../english/partners/partners.def:153
+#: ../../english/partners/partners.def:207
 msgid ""
-"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
-"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
-"the two biggest newspapers in The Netherlands."
+"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
+"Novare) provides several machines to Debian, as well as hosting and server "
+"administration services."
 msgstr ""
 
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:210
 msgid ""
-"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
-"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
-"by hosting several debian.org and debian.net servers as well as the buildd "
-"network for experimental and debconf.org machines."
+"Brainfood is a technology solutions company whose goal is to work to produce "
+"an ideal result for a specific need, whether it's a website or an ongoing, "
+"distance-learning intranet application, or custom developed software. &nbsp; "
+"For more information, contact <A HREF=\"mailto:debian-contact@brainfood.com"
+"\">debian-contact@brainfood.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:162
+#: ../../english/partners/partners.def:217
 msgid ""
-"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
-"region connecting educational and research organisations to a high speed "
-"redundant network ring and providing internet access. The company is owned "
-"by TU Darmstadt and University of Applied Sciences Darmstadt and in addition "
-"to operating MANDA it is also providing IT consulting and IT services to "
-"both universities."
+"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
+"port development, Debian mirrors, and other Debian services (current HP "
+"hardware donations are listed in the <a href=\"https://db.debian.org/"
+"machines.cgi\">Debian machines</a> page). For information about HP's "
+"involvement in the Linux Open Source community, see <a href=\"http://www.hp."
+"com/products1/linux/\">HP Linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:167
+#: ../../english/partners/partners.def:220
 msgid ""
-"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark Hosting</a> "
-"support us by providing hosting services and sponsorship for the Debian "
-"Conference."
+"Hewlett-Packard is one of the largest computer companies in the world, "
+"providing a wide range of products and services, such as servers, PCs, "
+"printers, storage products, network equipment, software, cloud computing "
+"solutions, etc."
 msgstr ""
 
-#: ../../english/partners/partners.def:171
+#: ../../english/partners/partners.def:227
 msgid ""
-"They are a leading Internet Service Provider (ISP) in the United Kingdom and "
-"provide scalable, powerful and affordable hosting with lots of <q>geek "
-"friendly</q> extras as standard. Debian GNU/Linux is deployed extensively "
-"within their network, and comes recommended as the <q>Distribution of "
-"Choice</q> to any new customer who's not 100% sure on what to pick."
+"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
+"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
+"promote Debian by getting the system right in the hands of potential and "
+"current users."
 msgstr ""
 
-#: ../../english/partners/partners.def:176
+#: ../../english/partners/partners.def:231
 msgid ""
-"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
-"several servers in their Karlsruhe high-performance datacenter."
+"Linux Central sells all the latest releases of Linux products such as "
+"commercial software, books, hardware, and versions of major Linux "
+"distributions. On Linux Central's site you can also find news and basic "
+"information about Linux, or sign up for a newsletter to stay updated on all "
+"newly released products or daily specials. &nbsp; For more information, "
+"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:179
+#: ../../english/partners/partners.def:238
 msgid ""
-"1&amp;1 is one of the biggest Domain Registrars and Web hosting companies "
-"worldwide, with offices in Germany, France, Great Britain, Spain and the "
-"USA. Most of the over 5 million websites and other services managed by "
-"1&amp;1 are running on a Debian-based environment using several thousand "
-"servers."
+"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
+"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
+"are a UK based web hosting, domain registration and co-location company."
 msgstr ""
 
-#: ../../english/partners/partners.def:183
+#: ../../english/partners/partners.def:245
 msgid ""
-"<a href=\"http://www.dg-i.net/\">DG-i</a> provides the Debian project with "
-"hardware and hosting services from their colocation sites via high-speed "
-"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
-"an IBM x360 server. "
+"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
+"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
+"the book <a href=\"http://debiansystem.info/\">The Debian System</a>. The "
+"company is well known for publishing high-quality titles on a broad range of "
+"topics including alternative operating systems, networking, hacking, "
+"programming, and LEGO. No Starch Press donates US$1 from the sale of each "
+"copy of The Debian System to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:187
+#: ../../english/partners/partners.def:252
 msgid ""
-"Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) offers consulting services "
-"on IT infrastructures, software development and hosting services. DG-i "
-"supports clients in analysing their IT environment, developing individual "
-"software solutions and in adjusting client's applications for a seamless "
-"transition into hosted services. The company designs and supports individual "
-"operational IT concepts that meet the high quality standards especially in E-"
-"Commerce and financial services. DG-i holds the necessary hosting "
-"infrastructure in their Munich and Dusseldorf data centers."
+"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
+"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
+"Debian System</a>. For each book sold, the publisher and author together "
+"donate 1&euro; to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:192
+#: ../../english/partners/partners.def:255
 msgid ""
-"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
-"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
-"are a UK based web hosting, domain registration and co-location company."
+"Open Source Press specialises on books around Linux and Open Source "
+"Software, written by authors with considerable experience in the fields, and "
+"produced in close cooperation with the respective communities. The Open "
+"Source Press publications are renowned for their quality and depth."
+msgstr ""
+
+#: ../../english/partners/partners.def:263
+msgid ""
+"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
+"Networks) is a UK ISP specialising in dedicated hosting. It provides "
+"dedicated servers, managed servers solutions, colocation services and VPS "
+"virtual servers."
+msgstr ""
+
+#: ../../english/partners/partners.def:266
+msgid ""
+"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
+"machines.cgi?host=caballero\">caballero</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:274
+msgid ""
+"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
+"machines which make up the bulk of the Debian ARM infrastructure. In "
+"addition Simtec employs several developers who contribute towards the Debian "
+"ARM port."
+msgstr ""
+
+#: ../../english/partners/partners.def:277
+msgid ""
+"Simtec is a leading provider of ARM based computing products. We have a "
+"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
+"which serve a wide range of uses within the embedded market. We provide a "
+"complete range of products and solutions which can be tailored to suit the "
+"customers needs from off the shelf integrator solutions right through to "
+"fully custom designs. All of our products ship with open source tools and "
+"operating systems."
 msgstr ""
diff --git a/norwegian/po/ports.nb.po b/norwegian/po/ports.nb.po
index bf64dcee7b2..7352a043293 100644
--- a/norwegian/po/ports.nb.po
+++ b/norwegian/po/ports.nb.po
@@ -113,32 +113,32 @@ msgstr "Debian for PowerPC"
 msgid "Debian for Sparc"
 msgstr "Debian for Sparc"
 
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian for bærbare"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian for AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian for Sparc64"
 
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian for ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian for S/390"
 
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian for Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian for MIPS"
 
-#~ msgid "Main"
-#~ msgstr "Hoved"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian for Motorola 680x0"
 
 #~ msgid "Debian GNU/FreeBSD"
 #~ msgstr "Debian GNU/FreeBSD"
 
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian for Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Hoved"
 
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian for MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian for Beowulf"
 
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian for S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian for ARM"
 
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian for Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian for AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian for bærbare"
diff --git a/norwegian/po/stats.nb.po b/norwegian/po/stats.nb.po
index 2952ca3061a..9d74c2b3b8c 100644
--- a/norwegian/po/stats.nb.po
+++ b/norwegian/po/stats.nb.po
@@ -25,79 +25,88 @@ msgstr "Det er %d byte å oversette."
 msgid "There are %d strings to translate."
 msgstr "Det er %d strenger å oversette."
 
-#: ../../stattrans.pl:229 ../../stattrans.pl:233
-msgid "This translation is too out of date"
-msgstr "Denne oversettelsen for utdatert"
-
-#: ../../stattrans.pl:231 ../../stattrans.pl:427
+#: ../../stattrans.pl:282 ../../stattrans.pl:506
 msgid "Wrong translation version"
 msgstr "Feil oversettelsesversjon"
 
-#: ../../stattrans.pl:235
+#: ../../stattrans.pl:284
+msgid "This translation is too out of date"
+msgstr "Denne oversettelsen for utdatert"
+
+#: ../../stattrans.pl:286
 msgid "The original is newer than this translation"
 msgstr "Originalen er nyere enn denne oversettelsen"
 
-#: ../../stattrans.pl:238 ../../stattrans.pl:427
+#: ../../stattrans.pl:290 ../../stattrans.pl:506
 msgid "The original no longer exists"
 msgstr "Originalen fins ikke lenger"
 
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
 msgid "hit count N/A"
 msgstr "antall treff fins ikke"
 
-#: ../../stattrans.pl:403
+#: ../../stattrans.pl:482
 msgid "hits"
 msgstr "treff"
 
-#: ../../stattrans.pl:421 ../../stattrans.pl:422
+#: ../../stattrans.pl:500 ../../stattrans.pl:501
 msgid "Click to fetch diffstat data"
 msgstr ""
 
-#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:516 ../../stattrans.pl:679 ../../stattrans.pl:680
 msgid "Unified diff"
 msgstr ""
 
-#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
+#: ../../stattrans.pl:519 ../../stattrans.pl:679 ../../stattrans.pl:680
 msgid "Colored diff"
 msgstr ""
 
-#: ../../stattrans.pl:541 ../../stattrans.pl:683
+#: ../../stattrans.pl:524 ../../stattrans.pl:683
+msgid "Commit diff"
+msgstr ""
+
+#. FIXME - this is clearly wrong, but no idea what's meant to go here!
+#: ../../stattrans.pl:528 ../../stattrans.pl:683
+msgid "Git command line"
+msgstr ""
+
+#: ../../stattrans.pl:639 ../../stattrans.pl:785
 msgid "Created with <transstatslink>"
 msgstr ""
 
-#: ../../stattrans.pl:546
+#: ../../stattrans.pl:644
 msgid "Translation summary for"
 msgstr "Oversettelsessammendrag for"
 
-#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
-#: ../../stattrans.pl:796
+#: ../../stattrans.pl:647 ../../stattrans.pl:809 ../../stattrans.pl:855
+#: ../../stattrans.pl:898
 msgid "Not translated"
 msgstr "Ikke oversatt"
 
-#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
+#: ../../stattrans.pl:647 ../../stattrans.pl:808 ../../stattrans.pl:854
 msgid "Outdated"
 msgstr "Utdatert"
 
-#: ../../stattrans.pl:549
+#: ../../stattrans.pl:647
 msgid "Translated"
 msgstr "Oversatt"
 
-#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
-#: ../../stattrans.pl:751 ../../stattrans.pl:794
+#: ../../stattrans.pl:647 ../../stattrans.pl:733 ../../stattrans.pl:807
+#: ../../stattrans.pl:853 ../../stattrans.pl:896
 msgid "Up to date"
 msgstr "Oppdatert"
 
-#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
-#: ../../stattrans.pl:553
+#: ../../stattrans.pl:648 ../../stattrans.pl:649 ../../stattrans.pl:650
+#: ../../stattrans.pl:651
 msgid "files"
 msgstr "filer"
 
-#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
-#: ../../stattrans.pl:559
+#: ../../stattrans.pl:654 ../../stattrans.pl:655 ../../stattrans.pl:656
+#: ../../stattrans.pl:657
 msgid "bytes"
 msgstr "byte"
 
-#: ../../stattrans.pl:566
+#: ../../stattrans.pl:664
 msgid ""
 "Note: the lists of pages are sorted by popularity. Hover over the page name "
 "to see the number of hits."
@@ -105,136 +114,136 @@ msgstr ""
 "Merk: Lista med sider er sortert etter popularitet. Hold musepekeren over "
 "sidenavnet for å se antall treff."
 
-#: ../../stattrans.pl:572
+#: ../../stattrans.pl:670
 msgid "Outdated translations"
 msgstr "Utdaterte oversettelser"
 
-#: ../../stattrans.pl:574 ../../stattrans.pl:630
+#: ../../stattrans.pl:672 ../../stattrans.pl:732
 msgid "File"
 msgstr "Fil"
 
-#: ../../stattrans.pl:576 ../../stattrans.pl:582
+#: ../../stattrans.pl:674 ../../stattrans.pl:681
 msgid "Diff"
 msgstr ""
 
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:676
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:677
 msgid "Diffstat"
 msgstr ""
 
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:686
 msgid "Log"
 msgstr "Logg"
 
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:687
 msgid "Translation"
 msgstr "Oversettelse"
 
-#: ../../stattrans.pl:586
+#: ../../stattrans.pl:688
 msgid "Maintainer"
 msgstr "Vedlikeholder"
 
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:690
 msgid "Status"
 msgstr "Status"
 
-#: ../../stattrans.pl:589
+#: ../../stattrans.pl:691
 msgid "Translator"
 msgstr "Oversetter"
 
-#: ../../stattrans.pl:590
+#: ../../stattrans.pl:692
 msgid "Date"
 msgstr "Dato"
 
-#: ../../stattrans.pl:597
+#: ../../stattrans.pl:699
 msgid "General pages not translated"
 msgstr "Generelle sider som ikke er oversatt"
 
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:700
 msgid "Untranslated general pages"
 msgstr "Ikke-oversatte generelle sider"
 
-#: ../../stattrans.pl:603
+#: ../../stattrans.pl:705
 msgid "News items not translated"
 msgstr "Nyhetsoppføringer som ikke er oversatt"
 
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:706
 msgid "Untranslated news items"
 msgstr "Ikke-oversatte nyhetsoppføringer"
 
-#: ../../stattrans.pl:609
+#: ../../stattrans.pl:711
 msgid "Consultant/user pages not translated"
 msgstr "Konsulent/brukersider som ikke er oversatt"
 
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:712
 msgid "Untranslated consultant/user pages"
 msgstr "Ikke-oversatte konsulent/brukersider"
 
-#: ../../stattrans.pl:615
+#: ../../stattrans.pl:717
 msgid "International pages not translated"
 msgstr "Internasjonale sider som ikke er oversatt"
 
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:718
 msgid "Untranslated international pages"
 msgstr "Ikke-oversatte internasjonale sider"
 
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:723
 msgid "Translated pages (up-to-date)"
 msgstr "Oversatte sider (oppdatert)"
 
-#: ../../stattrans.pl:628 ../../stattrans.pl:778
+#: ../../stattrans.pl:730 ../../stattrans.pl:880
 msgid "Translated templates (PO files)"
 msgstr "Oversatte maler (PO-filer)"
 
-#: ../../stattrans.pl:629 ../../stattrans.pl:781
+#: ../../stattrans.pl:731 ../../stattrans.pl:883
 msgid "PO Translation Statistics"
 msgstr "PO-oversettelsesstatistikk"
 
-#: ../../stattrans.pl:632 ../../stattrans.pl:795
+#: ../../stattrans.pl:734 ../../stattrans.pl:897
 msgid "Fuzzy"
 msgstr "Fuzzy"
 
-#: ../../stattrans.pl:633
+#: ../../stattrans.pl:735
 msgid "Untranslated"
 msgstr "Ikke oversatt"
 
-#: ../../stattrans.pl:634
+#: ../../stattrans.pl:736
 msgid "Total"
 msgstr "Totalt"
 
-#: ../../stattrans.pl:651
+#: ../../stattrans.pl:753
 msgid "Total:"
 msgstr "Totalt:"
 
-#: ../../stattrans.pl:685
+#: ../../stattrans.pl:787
 msgid "Translated web pages"
 msgstr "Oversatte nettsider"
 
-#: ../../stattrans.pl:688
+#: ../../stattrans.pl:790
 msgid "Translation Statistics by Page Count"
 msgstr "Oversettelsesstatistikk etter sideantall"
 
-#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
+#: ../../stattrans.pl:805 ../../stattrans.pl:851 ../../stattrans.pl:895
 msgid "Language"
 msgstr "Språk"
 
-#: ../../stattrans.pl:704 ../../stattrans.pl:750
+#: ../../stattrans.pl:806 ../../stattrans.pl:852
 msgid "Translations"
 msgstr "Oversettelser"
 
-#: ../../stattrans.pl:731
+#: ../../stattrans.pl:833
 msgid "Translated web pages (by size)"
 msgstr "Oversatte nettsider (etter størrelse)"
 
-#: ../../stattrans.pl:734
+#: ../../stattrans.pl:836
 msgid "Translation Statistics by Page Size"
 msgstr "Oversettelsesstatistikk etter sidestørrelse"
 
-#~ msgid "Created with"
-#~ msgstr "Opprettet med"
-
 #~ msgid "Origin"
 #~ msgstr "Kilde"
+
+#~ msgid "Created with"
+#~ msgstr "Opprettet med"
diff --git a/norwegian/po/templates.nb.po b/norwegian/po/templates.nb.po
index 7b4ceb330a7..4fce34988ec 100644
--- a/norwegian/po/templates.nb.po
+++ b/norwegian/po/templates.nb.po
@@ -202,11 +202,11 @@ msgstr "i utgave 2.2"
 #| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
 #| "using_cvs\">available</a>."
 msgid ""
-"To report a problem with the web site, e-mail our publicly archived mailing "
-"list <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>. Web site source code is <a href=\"m4_HOME/devel/"
-"website/using_cvs\">available</a>."
+"To report a problem with the web site, please e-mail our publicly archived "
+"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> in English.  For other contact information, see the Debian <a "
+"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
+"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
 msgstr ""
 "For å rapportere problemer med nettstedet, send e-post på engelsk til <a "
 "href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</a>. "
@@ -502,6 +502,10 @@ msgid ""
 "<em>Note:</em> The original document of this translation no longer exists."
 msgstr "<em>Merk:</em> Originalen til denne oversettelsen fins ikke lenger."
 
+#: ../../english/template/debian/translation-check.wml:56
+msgid "Wrong translation version!"
+msgstr ""
+
 #: ../../english/template/debian/url.wml:4
 msgid "URL"
 msgstr "Nettadresse"
@@ -510,242 +514,139 @@ msgstr "Nettadresse"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "Tilbake til <a href=\"../\">Hvem bruker Debian? siden</a>."
 
-#~ msgid "List of Consultants"
-#~ msgstr "Konsulentliste"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Besøk sponsoren for disse sidene"
 
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Tilbake til <a href=\"./\">Debians konsulentliste</a>."
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Har du oppdaget et problem med nettstedets utforming?"
 
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~| msgid "Report"
+#~ msgid "Report it!"
+#~ msgstr "Rapporter det"
 
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "hent med jigdo"
+#~| msgid "Select a server near you"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Velg en tjener nær deg: &nbsp;"
 
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "hent via http/ftp"
+#~ msgid "More information:"
+#~ msgstr "Mer informasjon:"
 
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "Nettverksinstallasjon"
+#~ msgid "Taken by:"
+#~ msgstr "Tatt av:"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "OSS"
+#~ msgid "Nobody"
+#~ msgstr "Ingen"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "diverse"
+#~ msgid "Rating:"
+#~ msgstr "Vurdering:"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "OSS"
+#~ msgid "More information"
+#~ msgstr "Mer informasjon"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "diverse"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Kommende begivenheter"
 
-#, fuzzy
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "diverse"
+#~ msgid "link may no longer be valid"
+#~ msgstr "pekeren er muligvis gammel"
 
-#~ msgid "Debian CD team"
-#~ msgstr "Debians cd-gruppe"
+#~ msgid "When"
+#~ msgstr "Når"
 
-#~ msgid "debian_on_cd"
-#~ msgstr "Debian på CD"
+#~ msgid "Where"
+#~ msgstr "Hvor"
 
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "More Info"
+#~ msgstr "Mer informasjon"
 
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debians engasjement"
 
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "Main Coordinator"
+#~ msgstr "Hovedkoordinator"
 
-#~ msgid "buy"
-#~ msgstr "kjøp"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Prosjekt</th><th>Koordinator</th>"
 
-#~ msgid "net_install"
-#~ msgstr "nettinstall"
+#~ msgid "Related Links"
+#~ msgstr "Beslektede pekere"
 
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "diverse"
+#~ msgid "Latest News"
+#~ msgstr "Siste nytt"
 
+# Sjekkes!
 #~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
 #~ msgstr ""
-#~ "Engelskspråklige <a href=\"/MailingLists/disclaimer\">åpne postlister</a> "
-#~ "for CD'er/DVD'er:"
-
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Donasjoner"
-
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Debians cd-gruppe"
+#~ "Tilbake til: andre <a href=\"./\">Debiannyheter</a> || <a href=\"m4_HOME/"
+#~ "\">Debianprosjektets hjemmeside</a>."
 
-#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "foreslått"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (død peker)"
 
 #, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Under&nbsp;diskusjon"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Venter&nbsp;på&nbsp;sponsorer"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Under&nbsp;diskusjon"
-
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Avstemming&nbsp;pågår"
-
-#~ msgid "Decided"
-#~ msgstr "Besluttet"
-
-#~ msgid "Withdrawn"
-#~ msgstr "Tilbaketrukket"
-
-#~ msgid "Other"
-#~ msgstr "Annet"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Hjem&nbsp;Avstemmingssiden"
-
-#~ msgid "How&nbsp;To"
-#~ msgstr "Hvordan..."
-
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Send&nbsp;inn&nbsp;et&nbsp;forslag"
-
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Legg&nbsp;til&nbsp;et&nbsp;forslag"
-
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Følg&nbsp;et&nbsp;forslag"
-
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Les&nbsp;et&nbsp;resultat"
-
-#~ msgid "Vote"
-#~ msgstr "Stem"
-
-#~ msgid "discussed"
-#~ msgstr "diskutert"
-
-#~ msgid "network install"
-#~ msgstr "nettverksinstallasjon"
-
-#~ msgid "buy pre-made images"
-#~ msgstr "kjøp ferdige cd-avtrykk"
-
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for informasjon om "
-#~ "å komme i kontakt med oss."
-
-#~ msgid "download with pik"
-#~ msgstr "hent med pik"
-
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (død peker)"
-
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Sikkerhetsmelding fra Debian"
-
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Sikkerhetsmeldinger fra Debian"
-
-#~ msgid "Vulnerable"
-#~ msgstr "Sårbar"
-
-#~ msgid "Fixed in"
-#~ msgstr "Rettet i"
-
-#~ msgid "Source:"
-#~ msgstr "Kildekode:"
-
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Arkitekturuavhengig bestanddel:"
-
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
 #~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
 #~ msgstr ""
-#~ "MD5-kontrolsummer av disse filene er tilgjengelig i den <a href=\"<get-"
-#~ "var url />\">originale sikkerhetsmeldingen</a>."
+#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
 
-#~ msgid "No other external database security references currently available."
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
 #~ msgstr ""
-#~ "Ingen sikkerhetsreferanser er for tiden tilgjengelig i andre databaser."
-
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "CERT's notater om sårbarheter, sikkerhet, og observasjoner:"
-
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
-
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "I Mitre's CVE-ordbok:"
-
-#~ msgid "Security database references"
-#~ msgstr "Referanser i sikkerhetsdatabaser"
-
-#~ msgid "License Information"
-#~ msgstr "Lisensinformasjon"
+#~ "<a href=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
 
 #, fuzzy
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "diverse"
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
+#~ "a>."
 
 #, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
 #~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
+#, fuzzy
 #~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#, fuzzy
+#~ msgid "<void id=\"singular\" />It was translated by %s."
 #~ msgstr ""
 #~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
-#~ msgstr ""
-#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
-
 #, fuzzy
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgid "<void id=\"plural\" />It was translated by %s."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
@@ -757,138 +658,241 @@ msgstr "Tilbake til <a href=\"../\">Hvem bruker Debian? siden</a>."
 #~ "a>."
 
 #, fuzzy
-#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
-#, fuzzy
-#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgid ""
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#~ msgstr ""
+#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
+
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
-#, fuzzy
 #~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
 #, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
 #~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
 #~ msgstr ""
 #~ "Redaktører av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
 #~ "a>."
 
 #, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "diverse"
+
+#~ msgid "License Information"
+#~ msgstr "Lisensinformasjon"
+
+#~ msgid "Security database references"
+#~ msgstr "Referanser i sikkerhetsdatabaser"
+
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "I Mitre's CVE-ordbok:"
+
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
+
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "CERT's notater om sårbarheter, sikkerhet, og observasjoner:"
+
+#~ msgid "No other external database security references currently available."
 #~ msgstr ""
-#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ "Ingen sikkerhetsreferanser er for tiden tilgjengelig i andre databaser."
 
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgid ""
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
 #~ msgstr ""
-#~ "<a href=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
+#~ "MD5-kontrolsummer av disse filene er tilgjengelig i den <a href=\"<get-"
+#~ "var url />\">originale sikkerhetsmeldingen</a>."
+
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Arkitekturuavhengig bestanddel:"
+
+#~ msgid "Source:"
+#~ msgstr "Kildekode:"
+
+#~ msgid "Fixed in"
+#~ msgstr "Rettet i"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Sårbar"
+
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Sikkerhetsmeldinger fra Debian"
+
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Sikkerhetsmelding fra Debian"
+
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (død peker)"
+
+#~ msgid "download with pik"
+#~ msgstr "hent med pik"
 
-#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"http://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
 #~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
 #~ msgstr ""
-#~ "For å få dette nyhetsbrevet per e-post hver uke, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
+#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for informasjon om "
+#~ "å komme i kontakt med oss."
 
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (død peker)"
+#~ msgid "buy pre-made images"
+#~ msgstr "kjøp ferdige cd-avtrykk"
+
+#~ msgid "network install"
+#~ msgstr "nettverksinstallasjon"
+
+#~ msgid "discussed"
+#~ msgstr "diskutert"
+
+#~ msgid "Vote"
+#~ msgstr "Stem"
+
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Les&nbsp;et&nbsp;resultat"
+
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Følg&nbsp;et&nbsp;forslag"
+
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Legg&nbsp;til&nbsp;et&nbsp;forslag"
+
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Send&nbsp;inn&nbsp;et&nbsp;forslag"
+
+#~ msgid "How&nbsp;To"
+#~ msgstr "Hvordan..."
+
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Hjem&nbsp;Avstemmingssiden"
+
+#~ msgid "Other"
+#~ msgstr "Annet"
+
+#~ msgid "Withdrawn"
+#~ msgstr "Tilbaketrukket"
+
+#~ msgid "Decided"
+#~ msgstr "Besluttet"
+
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Avstemming&nbsp;pågår"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Under&nbsp;diskusjon"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Venter&nbsp;på&nbsp;sponsorer"
+
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "Under&nbsp;diskusjon"
+
+#, fuzzy
+#~ msgid "Proposer"
+#~ msgstr "foreslått"
+
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "Debians cd-gruppe"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Donasjoner"
 
-# Sjekkes!
 #~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
 #~ msgstr ""
-#~ "Tilbake til: andre <a href=\"./\">Debiannyheter</a> || <a href=\"m4_HOME/"
-#~ "\">Debianprosjektets hjemmeside</a>."
+#~ "Engelskspråklige <a href=\"/MailingLists/disclaimer\">åpne postlister</a> "
+#~ "for CD'er/DVD'er:"
 
-#~ msgid "Latest News"
-#~ msgstr "Siste nytt"
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "diverse"
 
-#~ msgid "Related Links"
-#~ msgstr "Beslektede pekere"
+#~ msgid "net_install"
+#~ msgstr "nettinstall"
 
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Prosjekt</th><th>Koordinator</th>"
+#~ msgid "buy"
+#~ msgstr "kjøp"
 
-#~ msgid "Main Coordinator"
-#~ msgstr "Hovedkoordinator"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
 
-#~ msgid "Debian Involvement"
-#~ msgstr "Debians engasjement"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
 
-#~ msgid "More Info"
-#~ msgstr "Mer informasjon"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
 
-#~ msgid "Where"
-#~ msgstr "Hvor"
+#~ msgid "debian_on_cd"
+#~ msgstr "Debian på CD"
 
-#~ msgid "When"
-#~ msgstr "Når"
+#~ msgid "Debian CD team"
+#~ msgstr "Debians cd-gruppe"
 
-#~ msgid "link may no longer be valid"
-#~ msgstr "pekeren er muligvis gammel"
+#, fuzzy
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "diverse"
 
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Kommende begivenheter"
+#, fuzzy
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "diverse"
 
-#~ msgid "More information"
-#~ msgstr "Mer informasjon"
+#, fuzzy
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "OSS"
 
-#~ msgid "Rating:"
-#~ msgstr "Vurdering:"
+#, fuzzy
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "diverse"
 
-#~ msgid "Nobody"
-#~ msgstr "Ingen"
+#, fuzzy
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "OSS"
 
-#~ msgid "Taken by:"
-#~ msgstr "Tatt av:"
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "Nettverksinstallasjon"
 
-#~ msgid "More information:"
-#~ msgstr "Mer informasjon:"
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "hent via http/ftp"
 
-#~| msgid "Select a server near you"
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Velg en tjener nær deg: &nbsp;"
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "hent med jigdo"
 
-#~| msgid "Report"
-#~ msgid "Report it!"
-#~ msgstr "Rapporter det"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
 
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Har du oppdaget et problem med nettstedets utforming?"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Tilbake til <a href=\"./\">Debians konsulentliste</a>."
 
-#~ msgid "Visit the site sponsor"
-#~ msgstr "Besøk sponsoren for disse sidene"
+#~ msgid "List of Consultants"
+#~ msgstr "Konsulentliste"
diff --git a/norwegian/po/vendors.nb.po b/norwegian/po/vendors.nb.po
index 1a1e824998c..60f597676ad 100644
--- a/norwegian/po/vendors.nb.po
+++ b/norwegian/po/vendors.nb.po
@@ -63,75 +63,75 @@ msgstr "kildekode"
 msgid "and"
 msgstr "og"
 
-#~ msgid "updated monthly"
-#~ msgstr "oppdateres månedlig"
-
-#~ msgid "updated twice weekly"
-#~ msgstr "oppdateres to ganger i uken"
+#~ msgid "Vendor:"
+#~ msgstr "Leverandør:"
 
-#~ msgid "updated weekly"
-#~ msgstr "oppdateres ukentlig"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL for Debiansiden:"
 
-#~ msgid "reseller"
-#~ msgstr "videreformidler"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Tar imot bidrag til Debian:"
 
-#~ msgid "reseller of $var"
-#~ msgstr "videreformidler av $var"
+#~ msgid "Country:"
+#~ msgstr "Land:"
 
-#~ msgid "Custom Release"
-#~ msgstr "Bestillingsverk"
+#~ msgid "Ship International:"
+#~ msgstr "Sender til utlandet:"
 
-#~ msgid "vendor additions"
-#~ msgstr "tillegg fra leverandør"
+#~ msgid "email:"
+#~ msgstr "epost:"
 
-#~ msgid "contrib included"
-#~ msgstr "contrib inkludert"
+#~ msgid "CD Type:"
+#~ msgstr "CD-type:"
 
-#~ msgid "non-free included"
-#~ msgstr "non-free inkludert"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD-type:"
 
-#~ msgid "non-US included"
-#~ msgstr "non-US inkludert"
+#~ msgid "Architectures:"
+#~ msgstr "Arkitekturer:"
 
-#~ msgid "Multiple Distribution"
-#~ msgstr "Fler-distribusjon"
+#~ msgid "Official CD"
+#~ msgstr "Offisiell CD"
 
-#~ msgid "Vendor Release"
-#~ msgstr "Leverandørutgave"
+#, fuzzy
+#~ msgid "Official DVD"
+#~ msgstr "Offisiell CD"
 
 #~ msgid "Development Snapshot"
 #~ msgstr "Utviklingsversjon"
 
-#, fuzzy
-#~ msgid "Official DVD"
-#~ msgstr "Offisiell CD"
+#~ msgid "Vendor Release"
+#~ msgstr "Leverandørutgave"
 
-#~ msgid "Official CD"
-#~ msgstr "Offisiell CD"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Fler-distribusjon"
 
-#~ msgid "Architectures:"
-#~ msgstr "Arkitekturer:"
+#~ msgid "non-US included"
+#~ msgstr "non-US inkludert"
 
-#~ msgid "DVD Type:"
-#~ msgstr "DVD-type:"
+#~ msgid "non-free included"
+#~ msgstr "non-free inkludert"
 
-#~ msgid "CD Type:"
-#~ msgstr "CD-type:"
+#~ msgid "contrib included"
+#~ msgstr "contrib inkludert"
 
-#~ msgid "email:"
-#~ msgstr "epost:"
+#~ msgid "vendor additions"
+#~ msgstr "tillegg fra leverandør"
 
-#~ msgid "Ship International:"
-#~ msgstr "Sender til utlandet:"
+#~ msgid "Custom Release"
+#~ msgstr "Bestillingsverk"
 
-#~ msgid "Country:"
-#~ msgstr "Land:"
+#~ msgid "reseller of $var"
+#~ msgstr "videreformidler av $var"
 
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Tar imot bidrag til Debian:"
+#~ msgid "reseller"
+#~ msgstr "videreformidler"
 
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL for Debiansiden:"
+#~ msgid "updated weekly"
+#~ msgstr "oppdateres ukentlig"
 
-#~ msgid "Vendor:"
-#~ msgstr "Leverandør:"
+#~ msgid "updated twice weekly"
+#~ msgstr "oppdateres to ganger i uken"
+
+#~ msgid "updated monthly"
+#~ msgstr "oppdateres månedlig"