Update PO files from english POT files

CVS version numbers arabic/po/cdimage.ar.po: 1.4 -> 1.5 arabic/po/distrib.ar.po: 1.9 -> 1.10 arabic/po/doc.ar.po: 1.8 -> 1.9 arabic/po/newsevents.ar.po: 1.8 -> 1.9 arabic/po/organization.ar.po: 1.16 -> 1.17 arabic/po/others.ar.po: 1.20 -> 1.21 arabic/po/ports.ar.po: 1.12 -> 1.13 arabic/po/stats.ar.po: 1.3 -> 1.4 arabic/po/templates.ar.po: 1.29 -> 1.30 arabic/po/vendors.ar.po: 1.7 -> 1.8 arabic/po/vote.ar.po: 1.2 -> 1.3 armenian/po/cdimage.hy.po: 1.3 -> 1.4 armenian/po/distrib.hy.po: 1.4 -> 1.5 armenian/po/doc.hy.po: 1.4 -> 1.5 armenian/po/newsevents.hy.po: 1.5 -> 1.6 armenian/po/organization.hy.po: 1.5 -> 1.6 armenian/po/others.hy.po: 1.9 -> 1.10 armenian/po/templates.hy.po: 1.13 -> 1.14 armenian/po/vendors.hy.po: 1.4 -> 1.5 armenian/po/vote.hy.po: 1.2 -> 1.3 bulgarian/po/bugs.bg.po: 1.42 -> 1.43 bulgarian/po/cdimage.bg.po: 1.13 -> 1.14 bulgarian/po/distrib.bg.po: 1.34 -> 1.35 bulgarian/po/doc.bg.po: 1.26 -> 1.27 bulgarian/po/l10n.bg.po: 1.33 -> 1.34 bulgarian/po/mailinglists.bg.po: 1.19 -> 1.20 bulgarian/po/newsevents.bg.po: 1.21 -> 1.22 bulgarian/po/organization.bg.po: 1.57 -> 1.58 bulgarian/po/others.bg.po: 1.56 -> 1.57 bulgarian/po/ports.bg.po: 1.27 -> 1.28 bulgarian/po/stats.bg.po: 1.16 -> 1.17 bulgarian/po/templates.bg.po: 1.73 -> 1.74 bulgarian/po/vendors.bg.po: 1.12 -> 1.13 bulgarian/po/vote.bg.po: 1.4 -> 1.5 catalan/po/bugs.ca.po: 1.17 -> 1.18 catalan/po/cdimage.ca.po: 1.6 -> 1.7 catalan/po/distrib.ca.po: 1.24 -> 1.25 catalan/po/doc.ca.po: 1.15 -> 1.16 catalan/po/l10n.ca.po: 1.22 -> 1.23 catalan/po/mailinglists.ca.po: 1.4 -> 1.5 catalan/po/newsevents.ca.po: 1.9 -> 1.10 catalan/po/organization.ca.po: 1.37 -> 1.38 catalan/po/others.ca.po: 1.39 -> 1.40 catalan/po/ports.ca.po: 1.23 -> 1.24 catalan/po/templates.ca.po: 1.46 -> 1.47 catalan/po/vendors.ca.po: 1.14 -> 1.15 catalan/po/vote.ca.po: 1.4 -> 1.5 chinese/po/bugs.zh.po: 1.7 -> 1.8 chinese/po/cdimage.zh.po: 1.5 -> 1.6 chinese/po/countries.zh.po: 1.11 -> 1.12 chinese/po/distrib.zh.po: 1.6 -> 1.7 chinese/po/doc.zh.po: 1.6 -> 1.7 chinese/po/mailinglists.zh.po: 1.5 -> 1.6 chinese/po/newsevents.zh.po: 1.11 -> 1.12 chinese/po/organization.zh.po: 1.9 -> 1.10 chinese/po/others.zh.po: 1.19 -> 1.20 chinese/po/ports.zh.po: 1.6 -> 1.7 chinese/po/stats.zh.po: 1.4 -> 1.5 chinese/po/templates.zh.po: 1.29 -> 1.30 chinese/po/vendors.zh.po: 1.9 -> 1.10 chinese/po/vote.zh.po: 1.4 -> 1.5 croatian/po/cdimage.hr.po: 1.4 -> 1.5 croatian/po/distrib.hr.po: 1.11 -> 1.12 croatian/po/doc.hr.po: 1.18 -> 1.19 croatian/po/mailinglists.hr.po: 1.3 -> 1.4 croatian/po/newsevents.hr.po: 1.6 -> 1.7 croatian/po/organization.hr.po: 1.29 -> 1.30 croatian/po/others.hr.po: 1.30 -> 1.31 croatian/po/ports.hr.po: 1.15 -> 1.16 croatian/po/templates.hr.po: 1.41 -> 1.42 croatian/po/vendors.hr.po: 1.11 -> 1.12 croatian/po/vote.hr.po: 1.3 -> 1.4 czech/po/bugs.cs.po: 1.6 -> 1.7 czech/po/cdimage.cs.po: 1.6 -> 1.7 czech/po/distrib.cs.po: 1.11 -> 1.12 czech/po/doc.cs.po: 1.6 -> 1.7 czech/po/newsevents.cs.po: 1.7 -> 1.8 czech/po/organization.cs.po: 1.4 -> 1.5 czech/po/others.cs.po: 1.8 -> 1.9 czech/po/templates.cs.po: 1.29 -> 1.30 czech/po/vendors.cs.po: 1.3 -> 1.4 czech/po/vote.cs.po: 1.3 -> 1.4 danish/po/bugs.da.po: 1.24 -> 1.25 danish/po/cdimage.da.po: 1.9 -> 1.10 danish/po/countries.da.po: 1.37 -> 1.38 danish/po/distrib.da.po: 1.22 -> 1.23 danish/po/doc.da.po: 1.32 -> 1.33 danish/po/l10n.da.po: 1.13 -> 1.14 danish/po/mailinglists.da.po: 1.7 -> 1.8 danish/po/organization.da.po: 1.53 -> 1.54 danish/po/others.da.po: 1.50 -> 1.51 danish/po/ports.da.po: 1.16 -> 1.17 danish/po/stats.da.po: 1.9 -> 1.10 danish/po/templates.da.po: 1.66 -> 1.67 danish/po/vendors.da.po: 1.12 -> 1.13 dutch/po/bugs.nl.po: 1.21 -> 1.22 dutch/po/cdimage.nl.po: 1.8 -> 1.9 dutch/po/consultants.nl.po: 1.5 -> 1.6 dutch/po/distrib.nl.po: 1.21 -> 1.22 dutch/po/doc.nl.po: 1.21 -> 1.22 dutch/po/newsevents.nl.po: 1.11 -> 1.12 dutch/po/organization.nl.po: 1.43 -> 1.44 dutch/po/others.nl.po: 1.49 -> 1.50 dutch/po/ports.nl.po: 1.22 -> 1.23 dutch/po/stats.nl.po: 1.8 -> 1.9 dutch/po/templates.nl.po: 1.74 -> 1.75 dutch/po/vendors.nl.po: 1.17 -> 1.18 dutch/po/vote.nl.po: 1.3 -> 1.4 esperanto/po/cdimage.eo.po: 1.4 -> 1.5 esperanto/po/distrib.eo.po: 1.7 -> 1.8 esperanto/po/doc.eo.po: 1.8 -> 1.9 esperanto/po/newsevents.eo.po: 1.6 -> 1.7 esperanto/po/organization.eo.po: 1.9 -> 1.10 esperanto/po/others.eo.po: 1.15 -> 1.16 esperanto/po/templates.eo.po: 1.22 -> 1.23 esperanto/po/vendors.eo.po: 1.5 -> 1.6 esperanto/po/vote.eo.po: 1.3 -> 1.4 finnish/po/bugs.fi.po: 1.18 -> 1.19 finnish/po/cdimage.fi.po: 1.5 -> 1.6 finnish/po/countries.fi.po: 1.36 -> 1.37 finnish/po/distrib.fi.po: 1.17 -> 1.18 finnish/po/doc.fi.po: 1.17 -> 1.18 finnish/po/l10n.fi.po: 1.10 -> 1.11 finnish/po/mailinglists.fi.po: 1.3 -> 1.4 finnish/po/newsevents.fi.po: 1.9 -> 1.10 finnish/po/organization.fi.po: 1.33 -> 1.34 finnish/po/others.fi.po: 1.29 -> 1.30 finnish/po/ports.fi.po: 1.10 -> 1.11 finnish/po/stats.fi.po: 1.5 -> 1.6 finnish/po/templates.fi.po: 1.50 -> 1.51 finnish/po/vendors.fi.po: 1.9 -> 1.10 finnish/po/vote.fi.po: 1.4 -> 1.5 french/po/cdimage.fr.po: 1.10 -> 1.11 french/po/distrib.fr.po: 1.23 -> 1.24 french/po/doc.fr.po: 1.39 -> 1.40 french/po/mailinglists.fr.po: 1.7 -> 1.8 french/po/newsevents.fr.po: 1.24 -> 1.25 french/po/organization.fr.po: 1.62 -> 1.63 french/po/others.fr.po: 1.59 -> 1.60 french/po/ports.fr.po: 1.27 -> 1.28 french/po/stats.fr.po: 1.9 -> 1.10 french/po/templates.fr.po: 1.78 -> 1.79 french/po/vendors.fr.po: 1.14 -> 1.15 french/po/vote.fr.po: 1.4 -> 1.5 galician/po/cdimage.gl.po: 1.3 -> 1.4 galician/po/consultants.gl.po: 1.3 -> 1.4 galician/po/distrib.gl.po: 1.2 -> 1.3 galician/po/doc.gl.po: 1.5 -> 1.6 galician/po/newsevents.gl.po: 1.6 -> 1.7 galician/po/organization.gl.po: 1.4 -> 1.5 galician/po/others.gl.po: 1.4 -> 1.5 galician/po/stats.gl.po: 1.3 -> 1.4 galician/po/templates.gl.po: 1.4 -> 1.5 galician/po/vendors.gl.po: 1.2 -> 1.3 galician/po/vote.gl.po: 1.2 -> 1.3 german/po/cdimage.de.po: 1.12 -> 1.13 german/po/doc.de.po: 1.32 -> 1.33 german/po/mailinglists.de.po: 1.15 -> 1.16 german/po/organization.de.po: 1.83 -> 1.84 german/po/others.de.po: 1.61 -> 1.62 german/po/ports.de.po: 1.24 -> 1.25 german/po/stats.de.po: 1.14 -> 1.15 german/po/templates.de.po: 1.95 -> 1.96 german/po/vendors.de.po: 1.17 -> 1.18 greek/po/bugs.el.po: 1.11 -> 1.12 greek/po/cdimage.el.po: 1.4 -> 1.5 greek/po/distrib.el.po: 1.8 -> 1.9 greek/po/doc.el.po: 1.9 -> 1.10 greek/po/l10n.el.po: 1.8 -> 1.9 greek/po/mailinglists.el.po: 1.3 -> 1.4 greek/po/newsevents.el.po: 1.6 -> 1.7 greek/po/organization.el.po: 1.8 -> 1.9 greek/po/others.el.po: 1.15 -> 1.16 greek/po/ports.el.po: 1.8 -> 1.9 greek/po/templates.el.po: 1.24 -> 1.25 greek/po/vendors.el.po: 1.7 -> 1.8 greek/po/vote.el.po: 1.3 -> 1.4 hebrew/po/cdimage.he.po: 1.3 -> 1.4 hebrew/po/distrib.he.po: 1.3 -> 1.4 hebrew/po/doc.he.po: 1.3 -> 1.4 hebrew/po/newsevents.he.po: 1.5 -> 1.6 hebrew/po/organization.he.po: 1.5 -> 1.6 hebrew/po/others.he.po: 1.10 -> 1.11 hebrew/po/ports.he.po: 1.4 -> 1.5 hebrew/po/templates.he.po: 1.14 -> 1.15 hebrew/po/vendors.he.po: 1.3 -> 1.4 hebrew/po/vote.he.po: 1.2 -> 1.3 hungarian/po/cdimage.hu.po: 1.8 -> 1.9 hungarian/po/countries.hu.po: 1.22 -> 1.23 hungarian/po/distrib.hu.po: 1.14 -> 1.15 hungarian/po/doc.hu.po: 1.10 -> 1.11 hungarian/po/mailinglists.hu.po: 1.5 -> 1.6 hungarian/po/newsevents.hu.po: 1.10 -> 1.11 hungarian/po/organization.hu.po: 1.15 -> 1.16 hungarian/po/others.hu.po: 1.20 -> 1.21 hungarian/po/ports.hu.po: 1.10 -> 1.11 hungarian/po/templates.hu.po: 1.30 -> 1.31 hungarian/po/vendors.hu.po: 1.10 -> 1.11 hungarian/po/vote.hu.po: 1.5 -> 1.6 indonesian/po/cdimage.id.po: 1.6 -> 1.7 indonesian/po/distrib.id.po: 1.7 -> 1.8 indonesian/po/doc.id.po: 1.7 -> 1.8 indonesian/po/mailinglists.id.po: 1.4 -> 1.5 indonesian/po/newsevents.id.po: 1.6 -> 1.7 indonesian/po/organization.id.po: 1.8 -> 1.9 indonesian/po/others.id.po: 1.13 -> 1.14 indonesian/po/templates.id.po: 1.18 -> 1.19 indonesian/po/vendors.id.po: 1.4 -> 1.5 indonesian/po/vote.id.po: 1.2 -> 1.3 italian/po/bugs.it.po: 1.19 -> 1.20 italian/po/cdimage.it.po: 1.9 -> 1.10 italian/po/distrib.it.po: 1.22 -> 1.23 italian/po/doc.it.po: 1.25 -> 1.26 italian/po/l10n.it.po: 1.14 -> 1.15 italian/po/newsevents.it.po: 1.22 -> 1.23 italian/po/organization.it.po: 1.45 -> 1.46 italian/po/others.it.po: 1.38 -> 1.39 italian/po/stats.it.po: 1.10 -> 1.11 italian/po/templates.it.po: 1.56 -> 1.57 italian/po/vendors.it.po: 1.11 -> 1.12 italian/po/vote.it.po: 1.5 -> 1.6 japanese/po/bugs.ja.po: 1.22 -> 1.23 japanese/po/cdimage.ja.po: 1.9 -> 1.10 japanese/po/distrib.ja.po: 1.22 -> 1.23 japanese/po/doc.ja.po: 1.29 -> 1.30 japanese/po/mailinglists.ja.po: 1.5 -> 1.6 japanese/po/newsevents.ja.po: 1.14 -> 1.15 japanese/po/organization.ja.po: 1.44 -> 1.45 japanese/po/others.ja.po: 1.36 -> 1.37 japanese/po/ports.ja.po: 1.13 -> 1.14 japanese/po/stats.ja.po: 1.9 -> 1.10 japanese/po/templates.ja.po: 1.45 -> 1.46 japanese/po/vendors.ja.po: 1.10 -> 1.11 japanese/po/vote.ja.po: 1.4 -> 1.5 korean/po/bugs.ko.po: 1.7 -> 1.8 korean/po/cdimage.ko.po: 1.4 -> 1.5 korean/po/countries.ko.po: 1.13 -> 1.14 korean/po/distrib.ko.po: 1.5 -> 1.6 korean/po/doc.ko.po: 1.6 -> 1.7 korean/po/l10n.ko.po: 1.6 -> 1.7 korean/po/mailinglists.ko.po: 1.3 -> 1.4 korean/po/newsevents.ko.po: 1.7 -> 1.8 korean/po/organization.ko.po: 1.12 -> 1.13 korean/po/others.ko.po: 1.14 -> 1.15 korean/po/ports.ko.po: 1.7 -> 1.8 korean/po/vendors.ko.po: 1.8 -> 1.9 korean/po/vote.ko.po: 1.3 -> 1.4 lithuanian/po/bugs.lt.po: 1.12 -> 1.13 lithuanian/po/cdimage.lt.po: 1.7 -> 1.8 lithuanian/po/distrib.lt.po: 1.11 -> 1.12 lithuanian/po/doc.lt.po: 1.12 -> 1.13 lithuanian/po/mailinglists.lt.po: 1.9 -> 1.10 lithuanian/po/newsevents.lt.po: 1.12 -> 1.13 lithuanian/po/organization.lt.po: 1.13 -> 1.14 lithuanian/po/others.lt.po: 1.18 -> 1.19 lithuanian/po/ports.lt.po: 1.10 -> 1.11 lithuanian/po/templates.lt.po: 1.24 -> 1.25 lithuanian/po/vendors.lt.po: 1.11 -> 1.12 lithuanian/po/vote.lt.po: 1.8 -> 1.9 norwegian/po/bugs.nb.po: 1.3 -> 1.4 norwegian/po/cdimage.nb.po: 1.5 -> 1.6 norwegian/po/countries.nb.po: 1.6 -> 1.7 norwegian/po/distrib.nb.po: 1.5 -> 1.6 norwegian/po/doc.nb.po: 1.4 -> 1.5 norwegian/po/mailinglists.nb.po: 1.3 -> 1.4 norwegian/po/newsevents.nb.po: 1.7 -> 1.8 norwegian/po/organization.nb.po: 1.7 -> 1.8 norwegian/po/others.nb.po: 1.8 -> 1.9 norwegian/po/ports.nb.po: 1.3 -> 1.4 norwegian/po/stats.nb.po: 1.5 -> 1.6 norwegian/po/templates.nb.po: 1.8 -> 1.9 norwegian/po/vendors.nb.po: 1.3 -> 1.4 norwegian/po/vote.nb.po: 1.3 -> 1.4 persian/po/bugs.fa.po: 1.6 -> 1.7 persian/po/cdimage.fa.po: 1.6 -> 1.7 persian/po/consultants.fa.po: 1.5 -> 1.6 persian/po/distrib.fa.po: 1.6 -> 1.7 persian/po/doc.fa.po: 1.5 -> 1.6 persian/po/mailinglists.fa.po: 1.3 -> 1.4 persian/po/newsevents.fa.po: 1.6 -> 1.7 persian/po/organization.fa.po: 1.4 -> 1.5 persian/po/others.fa.po: 1.10 -> 1.11 persian/po/ports.fa.po: 1.4 -> 1.5 persian/po/templates.fa.po: 1.16 -> 1.17 persian/po/vendors.fa.po: 1.5 -> 1.6 persian/po/vote.fa.po: 1.5 -> 1.6 polish/po/cdimage.pl.po: 1.9 -> 1.10 polish/po/distrib.pl.po: 1.21 -> 1.22 polish/po/doc.pl.po: 1.25 -> 1.26 polish/po/newsevents.pl.po: 1.13 -> 1.14 polish/po/organization.pl.po: 1.40 -> 1.41 polish/po/others.pl.po: 1.47 -> 1.48 polish/po/stats.pl.po: 1.7 -> 1.8 polish/po/templates.pl.po: 1.52 -> 1.53 polish/po/vendors.pl.po: 1.11 -> 1.12 polish/po/vote.pl.po: 1.4 -> 1.5 portuguese/po/bugs.pt.po: 1.21 -> 1.22 portuguese/po/cdimage.pt.po: 1.14 -> 1.15 portuguese/po/distrib.pt.po: 1.36 -> 1.37 portuguese/po/doc.pt.po: 1.30 -> 1.31 portuguese/po/l10n.pt.po: 1.25 -> 1.26 portuguese/po/legal.pt.po: 1.5 -> 1.6 portuguese/po/mailinglists.pt.po: 1.7 -> 1.8 portuguese/po/organization.pt.po: 1.50 -> 1.51 portuguese/po/others.pt.po: 1.50 -> 1.51 portuguese/po/ports.pt.po: 1.29 -> 1.30 portuguese/po/security.pt.po: 1.22 -> 1.23 portuguese/po/stats.pt.po: 1.12 -> 1.13 portuguese/po/templates.pt.po: 1.71 -> 1.72 portuguese/po/vendors.pt.po: 1.20 -> 1.21 portuguese/po/vote.pt.po: 1.6 -> 1.7 romanian/po/bugs.ro.po: 1.12 -> 1.13 romanian/po/cdimage.ro.po: 1.5 -> 1.6 romanian/po/consultants.ro.po: 1.4 -> 1.5 romanian/po/countries.ro.po: 1.11 -> 1.12 romanian/po/date.ro.po: 1.8 -> 1.9 romanian/po/distrib.ro.po: 1.8 -> 1.9 romanian/po/doc.ro.po: 1.11 -> 1.12 romanian/po/l10n.ro.po: 1.11 -> 1.12 romanian/po/mailinglists.ro.po: 1.2 -> 1.3 romanian/po/newsevents.ro.po: 1.6 -> 1.7 romanian/po/organization.ro.po: 1.11 -> 1.12 romanian/po/others.ro.po: 1.17 -> 1.18 romanian/po/ports.ro.po: 1.10 -> 1.11 romanian/po/templates.ro.po: 1.32 -> 1.33 romanian/po/vendors.ro.po: 1.8 -> 1.9 romanian/po/vote.ro.po: 1.3 -> 1.4 russian/po/cdimage.ru.po: 1.9 -> 1.10 russian/po/distrib.ru.po: 1.21 -> 1.22 russian/po/doc.ru.po: 1.26 -> 1.27 russian/po/mailinglists.ru.po: 1.5 -> 1.6 russian/po/organization.ru.po: 1.33 -> 1.34 russian/po/others.ru.po: 1.36 -> 1.37 russian/po/ports.ru.po: 1.13 -> 1.14 russian/po/stats.ru.po: 1.8 -> 1.9 russian/po/templates.ru.po: 1.56 -> 1.57 russian/po/vendors.ru.po: 1.14 -> 1.15 slovak/po/bugs.sk.po: 1.6 -> 1.7 slovak/po/cdimage.sk.po: 1.6 -> 1.7 slovak/po/countries.sk.po: 1.11 -> 1.12 slovak/po/distrib.sk.po: 1.8 -> 1.9 slovak/po/doc.sk.po: 1.7 -> 1.8 slovak/po/mailinglists.sk.po: 1.5 -> 1.6 slovak/po/newsevents.sk.po: 1.10 -> 1.11 slovak/po/organization.sk.po: 1.11 -> 1.12 slovak/po/others.sk.po: 1.12 -> 1.13 slovak/po/ports.sk.po: 1.6 -> 1.7 slovak/po/stats.sk.po: 1.4 -> 1.5 slovak/po/templates.sk.po: 1.23 -> 1.24 slovak/po/vendors.sk.po: 1.5 -> 1.6 slovak/po/vote.sk.po: 1.5 -> 1.6 slovene/po/bugs.sl.po: 1.3 -> 1.4 slovene/po/cdimage.sl.po: 1.3 -> 1.4 slovene/po/countries.sl.po: 1.5 -> 1.6 slovene/po/distrib.sl.po: 1.3 -> 1.4 slovene/po/doc.sl.po: 1.3 -> 1.4 slovene/po/l10n.sl.po: 1.3 -> 1.4 slovene/po/newsevents.sl.po: 1.5 -> 1.6 slovene/po/organization.sl.po: 1.4 -> 1.5 slovene/po/others.sl.po: 1.8 -> 1.9 slovene/po/templates.sl.po: 1.12 -> 1.13 slovene/po/vendors.sl.po: 1.3 -> 1.4 slovene/po/vote.sl.po: 1.2 -> 1.3 spanish/po/bugs.es.po: 1.20 -> 1.21 spanish/po/cdimage.es.po: 1.10 -> 1.11 spanish/po/countries.es.po: 1.32 -> 1.33 spanish/po/distrib.es.po: 1.20 -> 1.21 spanish/po/doc.es.po: 1.30 -> 1.31 spanish/po/l10n.es.po: 1.18 -> 1.19 spanish/po/mailinglists.es.po: 1.7 -> 1.8 spanish/po/organization.es.po: 1.35 -> 1.36 spanish/po/others.es.po: 1.45 -> 1.46 spanish/po/ports.es.po: 1.21 -> 1.22 spanish/po/stats.es.po: 1.7 -> 1.8 spanish/po/templates.es.po: 1.56 -> 1.57 spanish/po/vendors.es.po: 1.18 -> 1.19 spanish/po/vote.es.po: 1.6 -> 1.7 swedish/po/bugs.sv.po: 1.24 -> 1.25 swedish/po/cdimage.sv.po: 1.10 -> 1.11 swedish/po/consultants.sv.po: 1.8 -> 1.9 swedish/po/distrib.sv.po: 1.26 -> 1.27 swedish/po/doc.sv.po: 1.34 -> 1.35 swedish/po/mailinglists.sv.po: 1.10 -> 1.11 swedish/po/newsevents.sv.po: 1.13 -> 1.14 swedish/po/organization.sv.po: 1.40 -> 1.41 swedish/po/others.sv.po: 1.43 -> 1.44 swedish/po/ports.sv.po: 1.17 -> 1.18 swedish/po/stats.sv.po: 1.5 -> 1.6 swedish/po/templates.sv.po: 1.68 -> 1.69 swedish/po/vendors.sv.po: 1.13 -> 1.14 swedish/po/vote.sv.po: 1.6 -> 1.7 tamil/po/bugs.ta.po: 1.2 -> 1.3 tamil/po/cdimage.ta.po: 1.3 -> 1.4 tamil/po/distrib.ta.po: 1.2 -> 1.3 tamil/po/doc.ta.po: 1.2 -> 1.3 tamil/po/mailinglists.ta.po: 1.2 -> 1.3 tamil/po/newsevents.ta.po: 1.5 -> 1.6 tamil/po/organization.ta.po: 1.3 -> 1.4 tamil/po/others.ta.po: 1.7 -> 1.8 tamil/po/ports.ta.po: 1.2 -> 1.3 tamil/po/templates.ta.po: 1.13 -> 1.14 tamil/po/vendors.ta.po: 1.2 -> 1.3 tamil/po/vote.ta.po: 1.2 -> 1.3 turkish/po/cdimage.tr.po: 1.4 -> 1.5 turkish/po/distrib.tr.po: 1.6 -> 1.7 turkish/po/doc.tr.po: 1.7 -> 1.8 turkish/po/newsevents.tr.po: 1.5 -> 1.6 turkish/po/organization.tr.po: 1.7 -> 1.8 turkish/po/others.tr.po: 1.13 -> 1.14 turkish/po/ports.tr.po: 1.6 -> 1.7 turkish/po/templates.tr.po: 1.27 -> 1.28 turkish/po/vendors.tr.po: 1.5 -> 1.6 turkish/po/vote.tr.po: 1.2 -> 1.3 ukrainian/po/bugs.uk.po: 1.8 -> 1.9 ukrainian/po/cdimage.uk.po: 1.3 -> 1.4 ukrainian/po/distrib.uk.po: 1.6 -> 1.7 ukrainian/po/doc.uk.po: 1.3 -> 1.4 ukrainian/po/l10n.uk.po: 1.4 -> 1.5 ukrainian/po/newsevents.uk.po: 1.5 -> 1.6 ukrainian/po/organization.uk.po: 1.6 -> 1.7 ukrainian/po/others.uk.po: 1.11 -> 1.12 ukrainian/po/ports.uk.po: 1.4 -> 1.5 ukrainian/po/templates.uk.po: 1.20 -> 1.21 ukrainian/po/vendors.uk.po: 1.5 -> 1.6 ukrainian/po/vote.uk.po: 1.2 -> 1.3 vietnamese/po/cdimage.vi.po: 1.3 -> 1.4 vietnamese/po/consultants.vi.po: 1.1 -> 1.2 vietnamese/po/distrib.vi.po: 1.1 -> 1.2 vietnamese/po/doc.vi.po: 1.1 -> 1.2 vietnamese/po/mailinglists.vi.po: 1.2 -> 1.3 vietnamese/po/newsevents.vi.po: 1.2 -> 1.3 vietnamese/po/organization.vi.po: 1.3 -> 1.4 vietnamese/po/others.vi.po: 1.3 -> 1.4 vietnamese/po/ports.vi.po: 1.1 -> 1.2 vietnamese/po/security.vi.po: 1.2 -> 1.3 vietnamese/po/stats.vi.po: 1.1 -> 1.2 vietnamese/po/vendors.vi.po: 1.3 -> 1.4 vietnamese/po/vote.vi.po: 1.1 -> 1.2 vietnamese/po/wnpp.vi.po: 1.1 -> 1.2
author: Tobias Quathamer <toddy> 2016-01-13 19:33:04 +0000
committer: Tobias Quathamer <toddy> 2016-01-13 19:33:04 +0000
commit: c115acf57565449ed3a560e709d8ac0fbc8a684d (patch)
tree: 142575199fdea6e36356a3dbe1715980611a72f3 /norwegian/po
parent: 24da40d56397485471fbf430177d7554eb8fa9a1 (diff)
14 files changed, 1073 insertions, 973 deletions
diff --git a/norwegian/po/bugs.nb.po b/norwegian/po/bugs.nb.po
index 6c102e831e2..e720e7c8cce 100644
--- a/norwegian/po/bugs.nb.po
+++ b/norwegian/po/bugs.nb.po
@@ -155,140 +155,140 @@ msgstr "Arkivert"
 msgid "Archived and Unarchived"
 msgstr "Arkivert og ikke arkivert"
 
-#~ msgid "Exclude tag:"
-#~ msgstr "Ekskludér merkelapp:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Inkludér merkelapp:"
+#~ msgid "Flags:"
+#~ msgstr "Flagger:"
 
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "aktive feil"
 
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+# Sjekkes!
+#~ msgid "display merged bugs only once"
+#~ msgstr "vis kombinerte feil kun én gang"
 
-#~ msgid "wontfix"
-#~ msgstr "fikser-ikke"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ingen sortering på status/alvorlighetsgrad"
 
-#~ msgid "upstream"
-#~ msgstr "oppstrøms"
+# Sjekkes!
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "vis ikke inneholdsfortegnelse i sidehode"
 
 # Sjekkes!
-#~ msgid "unreproducible"
-#~ msgstr "ikkereproduserbart"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "vis ikke statistikk i sidefot"
 
-#~ msgid "security"
-#~ msgstr "sikkerhet"
+#~ msgid "bugs"
+#~ msgstr "feil"
 
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "open"
+#~ msgstr "åpen"
 
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo"
+#~ msgid "forwarded"
+#~ msgstr "videresendt"
 
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "pending"
+#~ msgstr "på gang"
 
-#~ msgid "help"
-#~ msgstr "hjelp"
+#~ msgid "fixed"
+#~ msgstr "rettet"
 
-#~ msgid "fixed-upstream"
-#~ msgstr "rettet-oppstrøms"
+#~ msgid "done"
+#~ msgstr "ferdigt"
 
-#~ msgid "fixed-in-experimental"
-#~ msgstr "rettet-i-experimental"
+#~ msgid "Include status:"
+#~ msgstr "Inkludér status:"
 
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "Exclude status:"
+#~ msgstr "Ekskludér status:"
 
-#~ msgid "confirmed"
-#~ msgstr "bekreftet"
+#~ msgid "critical"
+#~ msgstr "kritisk"
 
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "grave"
+#~ msgstr "graverende"
 
-#, fuzzy
-#~ msgid "etch-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "alvorlig"
 
-#, fuzzy
-#~ msgid "etch"
-#~ msgstr "patch"
+#~ msgid "important"
+#~ msgstr "viktig"
 
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "minor"
+#~ msgstr "liten"
 
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "ønske"
 
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Inkludér alvorlighetsgrad:"
 
 #~ msgid "Exclude severity:"
 #~ msgstr "Ekskludér alvorlighetsgrad:"
 
-#~ msgid "Include severity:"
-#~ msgstr "Inkludér alvorlighetsgrad:"
+#~ msgid "potato"
+#~ msgstr "potato"
 
-#~ msgid "wishlist"
-#~ msgstr "ønske"
+#~ msgid "woody"
+#~ msgstr "woody"
 
-#~ msgid "minor"
-#~ msgstr "liten"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
 
-#~ msgid "important"
-#~ msgstr "viktig"
+#, fuzzy
+#~ msgid "etch"
+#~ msgstr "patch"
 
-#~ msgid "serious"
-#~ msgstr "alvorlig"
+#, fuzzy
+#~ msgid "etch-ignore"
+#~ msgstr "sarge-ignore"
 
-#~ msgid "grave"
-#~ msgstr "graverende"
+#~ msgid "sid"
+#~ msgstr "sid"
 
-#~ msgid "critical"
-#~ msgstr "kritisk"
+#~ msgid "confirmed"
+#~ msgstr "bekreftet"
 
-#~ msgid "Exclude status:"
-#~ msgstr "Ekskludér status:"
+#~ msgid "d-i"
+#~ msgstr "d-i"
 
-#~ msgid "Include status:"
-#~ msgstr "Inkludér status:"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "rettet-i-experimental"
 
-#~ msgid "done"
-#~ msgstr "ferdigt"
+#~ msgid "fixed-upstream"
+#~ msgstr "rettet-oppstrøms"
 
-#~ msgid "fixed"
-#~ msgstr "rettet"
+#~ msgid "help"
+#~ msgstr "hjelp"
 
-#~ msgid "pending"
-#~ msgstr "på gang"
+#~ msgid "l10n"
+#~ msgstr "l10n"
 
-#~ msgid "forwarded"
-#~ msgstr "videresendt"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo"
 
-#~ msgid "open"
-#~ msgstr "åpen"
+#~ msgid "patch"
+#~ msgstr "patch"
 
-#~ msgid "bugs"
-#~ msgstr "feil"
+#~ msgid "security"
+#~ msgstr "sikkerhet"
 
 # Sjekkes!
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "vis ikke statistikk i sidefot"
+#~ msgid "unreproducible"
+#~ msgstr "ikkereproduserbart"
 
-# Sjekkes!
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "vis ikke inneholdsfortegnelse i sidehode"
+#~ msgid "upstream"
+#~ msgstr "oppstrøms"
 
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ingen sortering på status/alvorlighetsgrad"
+#~ msgid "wontfix"
+#~ msgstr "fikser-ikke"
 
-# Sjekkes!
-#~ msgid "display merged bugs only once"
-#~ msgstr "vis kombinerte feil kun én gang"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
 
-#~ msgid "active bugs"
-#~ msgstr "aktive feil"
+#~ msgid "lfs"
+#~ msgstr "lfs"
 
-#~ msgid "Flags:"
-#~ msgstr "Flagger:"
+#~ msgid "Include tag:"
+#~ msgstr "Inkludér merkelapp:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Ekskludér merkelapp:"
diff --git a/norwegian/po/cdimage.nb.po b/norwegian/po/cdimage.nb.po
index 43cb09450e6..bcf0d5adc88 100644
--- a/norwegian/po/cdimage.nb.po
+++ b/norwegian/po/cdimage.nb.po
@@ -10,18 +10,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:9
-#: ../../english/CD/CD-keys.data:14 ../../english/CD/CD-keys.data:19
-#: ../../english/CD/CD-keys.data:24 ../../english/CD/CD-keys.data:28
-#: ../../english/CD/CD-keys.data:33 ../../english/CD/CD-keys.data:38
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
 msgid "      Key fingerprint"
 msgstr " Nøkkelfingeravtrykk"
 
-#: ../../english/devel/debian-installer/images.data:90
+#: ../../english/devel/debian-installer/images.data:87
 msgid "ISO images"
 msgstr ""
 
-#: ../../english/devel/debian-installer/images.data:91
+#: ../../english/devel/debian-installer/images.data:88
 msgid "Jigdo files"
 msgstr ""
 
diff --git a/norwegian/po/countries.nb.po b/norwegian/po/countries.nb.po
index 32326382a3b..7d6be4d0f01 100644
--- a/norwegian/po/countries.nb.po
+++ b/norwegian/po/countries.nb.po
@@ -425,8 +425,8 @@ msgstr "Sørafrika"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#~ msgid "Great Britain"
-#~ msgstr "Storbritania"
-
 #~ msgid "Yugoslavia"
 #~ msgstr "Jugoslavia"
+
+#~ msgid "Great Britain"
+#~ msgstr "Storbritania"
diff --git a/norwegian/po/distrib.nb.po b/norwegian/po/distrib.nb.po
index b2a5d35a065..4cd0a679e30 100644
--- a/norwegian/po/distrib.nb.po
+++ b/norwegian/po/distrib.nb.po
@@ -129,83 +129,93 @@ msgid "ARM"
 msgstr "ARM"
 
 #: ../../english/releases/arches.data:11
+#, fuzzy
+#| msgid "64-bit PC (amd64)"
+msgid "64-bit ARM (AArch64)"
+msgstr "64-bit PC (amd64)"
+
+#: ../../english/releases/arches.data:12
 msgid "EABI ARM"
 msgstr "EABI ARM"
 
-#: ../../english/releases/arches.data:12
+#: ../../english/releases/arches.data:13
 msgid "Hard Float ABI ARM"
 msgstr ""
 
-#: ../../english/releases/arches.data:13
+#: ../../english/releases/arches.data:14
 msgid "HP PA-RISC"
 msgstr "HP PA-RISC"
 
-#: ../../english/releases/arches.data:14
+#: ../../english/releases/arches.data:15
 msgid "Hurd 32-bit PC (i386)"
 msgstr "Hurd 32-bit PC (i386)"
 
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
 msgid "32-bit PC (i386)"
 msgstr "32-bit PC (i386)"
 
-#: ../../english/releases/arches.data:16
+#: ../../english/releases/arches.data:17
 msgid "Intel Itanium IA-64"
 msgstr "Intel Itanium IA-64"
 
-#: ../../english/releases/arches.data:17
+#: ../../english/releases/arches.data:18
 msgid "kFreeBSD 32-bit PC (i386)"
 msgstr "kFreeBSD 32-bit PC (i386)"
 
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
 msgid "kFreeBSD 64-bit PC (amd64)"
 msgstr "kFreeBSD 64-bit PC (amd64)"
 
-#: ../../english/releases/arches.data:19
+#: ../../english/releases/arches.data:20
 msgid "Motorola 680x0"
 msgstr "Motorola 680x0"
 
-#: ../../english/releases/arches.data:20
+#: ../../english/releases/arches.data:21
 msgid "MIPS (big endian)"
 msgstr "MIPS (big endian)"
 
-#: ../../english/releases/arches.data:21
+#: ../../english/releases/arches.data:22
 msgid "MIPS (little endian)"
 msgstr "MIPS (little endian)"
 
-#: ../../english/releases/arches.data:22
+#: ../../english/releases/arches.data:23
 msgid "PowerPC"
 msgstr "PowerPC"
 
-#: ../../english/releases/arches.data:23
+#: ../../english/releases/arches.data:24
+msgid "POWER Processors"
+msgstr ""
+
+#: ../../english/releases/arches.data:25
 msgid "IBM S/390"
 msgstr "IBM S/390"
 
-#: ../../english/releases/arches.data:24
+#: ../../english/releases/arches.data:26
 msgid "IBM System z"
 msgstr ""
 
-#: ../../english/releases/arches.data:25
+#: ../../english/releases/arches.data:27
 msgid "SPARC"
 msgstr "SPARC"
 
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
 
-#~| msgid "Intel x86"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
 
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
 
 #~ msgid "Intel IA-64"
 #~ msgstr "Intel IA-64"
 
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
 
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~| msgid "Intel x86"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
 
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
diff --git a/norwegian/po/doc.nb.po b/norwegian/po/doc.nb.po
index a9916364265..d4a5930106f 100644
--- a/norwegian/po/doc.nb.po
+++ b/norwegian/po/doc.nb.po
@@ -9,7 +9,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/doc/books.data:30
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+"  Debian 8 is the must-have handbook for learning Linux. Start on the \n"
+"  beginners level and learn how to deploy the system with graphical \n"
+"  interface and terminal.\n"
+"  This book provides the basic knowledge to grow and become a 'junior' \n"
+"  systems administrator. Start off with exploring the GNOME desktop \n"
+"  interface and adjust it to your personal needs. Overcome your fear of \n"
+"  using the Linux terminal and learn the most essential commands in \n"
+"  administering Debian. Expand your knowledge of system services (systemd) \n"
+"  and learn how to adapt them. Get more out of the software in Debian and \n"
+"  outside of Debian. Manage your home-network with network-manager, etc.\n"
+"  10 percent of the profits on this book will be donated to the Debian \n"
+"  Project."
+msgstr ""
+
+#: ../../english/doc/books.data:57
 msgid ""
 "Written by two Debian developers, this free book\n"
 "  started as a translation of their French best-seller known as Cahier de\n"
@@ -24,7 +41,7 @@ msgid ""
 "  virtualization with Xen, KVM or LXC."
 msgstr ""
 
-#: ../../english/doc/books.data:50
+#: ../../english/doc/books.data:77
 msgid ""
 "The aim of this freely available, up-to-date, book is to get you up to\n"
 "  speed with Debian (including both the current stable release and the\n"
@@ -33,15 +50,15 @@ msgid ""
 "  in the home, office, club, or school)."
 msgstr ""
 
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
 msgid "Sarge CD with installer and a selection of packages"
 msgstr ""
 
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
 msgid "Live CD with Knoppix"
 msgstr ""
 
-#: ../../english/doc/books.data:65
+#: ../../english/doc/books.data:92
 msgid ""
 "Beginners and advanced users alike will find this book to be a\n"
 "  comprehensive source of information on using Debian for desktops,\n"
@@ -50,13 +67,13 @@ msgid ""
 "  Debian's unique package management system."
 msgstr ""
 
-#: ../../english/doc/books.data:77 ../../english/doc/books.data:180
-#: ../../english/doc/books.data:229 ../../english/doc/books.data:274
+#: ../../english/doc/books.data:104 ../../english/doc/books.data:207
+#: ../../english/doc/books.data:267 ../../english/doc/books.data:312
 msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
 msgstr ""
 
-#: ../../english/doc/books.data:80 ../../english/doc/books.data:183
-#: ../../english/doc/books.data:232 ../../english/doc/books.data:277
+#: ../../english/doc/books.data:107 ../../english/doc/books.data:210
+#: ../../english/doc/books.data:270 ../../english/doc/books.data:315
 msgid ""
 "This book introduces the concepts and techniques of the Debian\n"
 "  operating system, explaining their usage and pitfalls, and\n"
@@ -71,7 +88,7 @@ msgid ""
 "  Linux experience in Debian's bottom-up philosophy."
 msgstr ""
 
-#: ../../english/doc/books.data:100
+#: ../../english/doc/books.data:127
 msgid ""
 "A hands-on reference guide to the Debian GNU/Linux system that shows,\n"
 "  in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
@@ -81,11 +98,11 @@ msgid ""
 "  and its source data is available."
 msgstr ""
 
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
 msgid "Debian 2.2 ARM architecture"
 msgstr ""
 
-#: ../../english/doc/books.data:116
+#: ../../english/doc/books.data:143
 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, "
@@ -105,7 +122,7 @@ msgid ""
 "  host machine too."
 msgstr ""
 
-#: ../../english/doc/books.data:136
+#: ../../english/doc/books.data:163
 msgid ""
 "Learning Debian GNU/Linux guides the new user of Linux through the\n"
 "  installation and configuration of Debian GNU/Linux.\n"
@@ -113,11 +130,11 @@ msgid ""
 "  computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</q>."
 msgstr ""
 
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
 msgid "Debian 2.1"
 msgstr ""
 
-#: ../../english/doc/books.data:148
+#: ../../english/doc/books.data:175
 msgid ""
 "Includes 230+ pages and three CD-ROM discs. Topics covered by software\n"
 "  include Debian Linux, networking, programming tools, GUI, desktop\n"
@@ -125,11 +142,11 @@ msgid ""
 "  support included."
 msgstr ""
 
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
 msgid "DVD Debian Squeeze i386/amd64"
 msgstr ""
 
-#: ../../english/doc/books.data:166
+#: ../../english/doc/books.data:193
 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"
@@ -141,24 +158,27 @@ msgid ""
 "  administrator who wants to build a reliable network with Debian."
 msgstr ""
 
-#: ../../english/doc/books.data:205
-msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#: ../../english/doc/books.data:234
+msgid ""
+"The book covers topics ranging from concepts of package \n"
+"  management over the available tools and how they're used to concrete "
+"problems\n"
+"  which may occur in real life and how they can be solved. The book is "
+"written \n"
+"  in German, an English translation is planned. Format: e-book (Online, "
+"HTML, \n"
+"  PDF, ePub, Mobi), printed book planned.\n"
 msgstr ""
 
-#: ../../english/doc/books.data:208
-msgid ""
-"An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-"mode=viewone&amp;titnr=254925022\">\n"
-"  publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-"29.95\n"
-"  euro (as of 2008)."
+#: ../../english/doc/books.data:248
+msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
 msgstr ""
 
-#: ../../english/doc/books.data:218
+#: ../../english/doc/books.data:256
 msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
 msgstr ""
 
-#: ../../english/doc/books.data:221
+#: ../../english/doc/books.data:259
 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 "
@@ -167,13 +187,13 @@ msgid ""
 "services."
 msgstr ""
 
-#: ../../english/doc/books.data:249
+#: ../../english/doc/books.data:287
 msgid ""
 "2 editions: One with no CD, the other with Official CD (i386, contrib and "
 "sources)"
 msgstr ""
 
-#: ../../english/doc/books.data:252
+#: ../../english/doc/books.data:290
 msgid ""
 "The book covers all steps of planning and installing Debian GNU/Linux on\n"
 "  PC based hardware, including important applications like the X Window\n"
@@ -189,24 +209,24 @@ msgid ""
 "  a server for Windows based clients (Samba)."
 msgstr ""
 
-#: ../../english/doc/books.data:295
+#: ../../english/doc/books.data:333
 msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
 msgstr ""
 
-#: ../../english/doc/books.data:298
+#: ../../english/doc/books.data:336
 msgid ""
 "This book is dictionary style and covers various tips for beginners\n"
 "  and intermediate skill users; installation via various ways,\n"
 "  desktop customize, troubleshooting, profitable knowhow and so on."
 msgstr ""
 
-#: ../../english/doc/books.data:311
+#: ../../english/doc/books.data:349
 msgid ""
 "Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
 "     CD)"
 msgstr ""
 
-#: ../../english/doc/books.data:315
+#: ../../english/doc/books.data:353
 msgid ""
 "This is the latest book for Sarge of the series that has been\n"
 "  supported as a standard bible of Debian in Japan.\n"
@@ -217,11 +237,11 @@ msgid ""
 "  for all Debian users from beginners to advanced users."
 msgstr ""
 
-#: ../../english/doc/books.data:330
+#: ../../english/doc/books.data:368
 msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
 msgstr ""
 
-#: ../../english/doc/books.data:333
+#: ../../english/doc/books.data:371
 msgid ""
 "This book covers general topics about Debian GNU/Linux:\n"
 "  installation, APT and dpkg, shell, X Window System, networking, system\n"
@@ -231,11 +251,11 @@ msgid ""
 "  environment very easily with the customized CDs."
 msgstr ""
 
-#: ../../english/doc/books.data:349
+#: ../../english/doc/books.data:387
 msgid "1 unofficial Woody, 3 Potato rev0"
 msgstr ""
 
-#: ../../english/doc/books.data:352
+#: ../../english/doc/books.data:390
 msgid ""
 "This book gives a brief guide to installation of Debian\n"
 "  GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
@@ -246,11 +266,11 @@ msgid ""
 "  people in Korea to become official Debian maintainers."
 msgstr ""
 
-#: ../../english/doc/books.data:366
+#: ../../english/doc/books.data:404
 msgid "Three official potato r3 CDs and an unofficial woody CD"
 msgstr ""
 
-#: ../../english/doc/books.data:369
+#: ../../english/doc/books.data:407
 msgid ""
 "This book introduces readers to Debian GNU/Linux with many\n"
 "  hands-on tutorials and tips. Written in Korean, this book covers\n"
@@ -260,11 +280,11 @@ msgid ""
 "  Debian for Korean language environment, and it is good for newcomers, too."
 msgstr ""
 
-#: ../../english/doc/books.data:391
+#: ../../english/doc/books.data:429
 msgid "Debian GNU/Linux 3.1r0 CD1"
 msgstr ""
 
-#: ../../english/doc/books.data:394
+#: ../../english/doc/books.data:432
 msgid ""
 "The first Persian book about Debian GNU/Linux. This book helps you\n"
 "  to install Debian GNU/Linux and set up network services like web,\n"
@@ -272,7 +292,7 @@ msgid ""
 "  using GNU/Linux and Debian's powerful package management system."
 msgstr ""
 
-#: ../../english/doc/books.data:410
+#: ../../english/doc/books.data:448
 msgid ""
 "This book is divided into four parts: Basic concepts, Management of\n"
 "  GNU/Linux, Administration of the system and Advanced operations. Each "
@@ -288,7 +308,7 @@ msgid ""
 "  Debian Sarge."
 msgstr ""
 
-#: ../../english/doc/books.data:433
+#: ../../english/doc/books.data:471
 msgid ""
 "This is the right book for you to learn how to create basic and complex IT "
 "platforms using only Free Software. Inside it you will find a wide range of "
@@ -318,49 +338,73 @@ msgstr "Inkludert CD:"
 msgid "Publisher:"
 msgstr "Forlag:"
 
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
 msgid "Authors:"
 msgstr "Forfattere:"
 
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
 msgid "Editors:"
 msgstr "Redaktører:"
 
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
 msgid "Maintainer:"
 msgstr "Ansvarlig:"
 
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
 msgid "Availability:"
 msgstr "Tilgjengelighet:"
 
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
 msgid "Latest version:"
 msgstr "Siste versjon:"
 
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
 msgid "(version <get-var version />)"
 msgstr "(versjon <get-var version />)"
 
-#: ../../english/doc/manuals.defs:133 ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
 msgid "plain text"
 msgstr "ren tekst"
 
-#. The ddp_pkg_loc variable contains 
-#. <a href="http://anonscm.debian.org/viewvc/ddp/manuals/trunk/manuals.sgml/[package]/">[package]</a>
-#: ../../english/doc/manuals.defs:152
+#: ../../english/doc/manuals.defs:154
 msgid ""
-"Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-"ddp_pkg_loc />."
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+msgstr ""
+
+#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
+#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+msgid "Web interface: "
 msgstr ""
-"Bruk <a href=\"cvs\">SVN</a> for å hente SGML-kildeteksten for <get-var "
-"ddp_pkg_loc />."
 
-#: ../../english/doc/manuals.defs:158
+#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+msgid "VCS interface: "
+msgstr ""
+
+#: ../../english/doc/manuals.defs:162
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+
+#: ../../english/doc/manuals.defs:170
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"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"
 "  to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -370,25 +414,32 @@ msgstr ""
 "  til <kbd>:ext:<var>brukerid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
 "  og hent ut modulen <kbd>boot-floppies/documentation</kbd>."
 
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
 msgid "CVS via web"
 msgstr "CVS via nettet"
 
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
 msgid "Debian package"
 msgstr "Debianpakke"
 
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
 msgid "Debian package (archived)"
 msgstr "Debianpakke (arkivert)"
 
-#: ../../english/releases/arches.data:32
+#: ../../english/releases/arches.data:34
 msgid "HTML"
 msgstr ""
 
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
 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 />."
diff --git a/norwegian/po/mailinglists.nb.po b/norwegian/po/mailinglists.nb.po
index 5ad79fdd49f..a805517f8c1 100644
--- a/norwegian/po/mailinglists.nb.po
+++ b/norwegian/po/mailinglists.nb.po
@@ -122,8 +122,8 @@ msgstr "åpen"
 msgid "closed"
 msgstr "lukket"
 
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Velg listene du vil si opp abonnementet på:"
-
 #~ msgid "Please select which lists you want to subscribe to:"
 #~ msgstr "Velg listene du vil abonnere på:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Velg listene du vil si opp abonnementet på:"
diff --git a/norwegian/po/newsevents.nb.po b/norwegian/po/newsevents.nb.po
index f97c61a5cb3..480dffec07b 100644
--- a/norwegian/po/newsevents.nb.po
+++ b/norwegian/po/newsevents.nb.po
@@ -25,27 +25,27 @@ msgstr "s.<get-var page />"
 msgid "The newsletter for the Debian community"
 msgstr ""
 
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
 msgid "Email:"
 msgstr "E-post:"
 
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
 msgid "Previous Talks:"
 msgstr "Tidligere foredrag"
 
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
 msgid "Languages:"
 msgstr "Språk"
 
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
 msgid "Location:"
 msgstr "Adresse:"
 
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
 msgid "Topics:"
 msgstr "Emner:"
 
@@ -334,11 +334,16 @@ msgid ""
 msgstr ""
 
 #: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+#| msgid ""
+#| "To receive this newsletter weekly in your mailbox, <a href=\"https://"
+#| "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=\"https://lists."
-"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
+"org/debian-news/\">subscribe to the debian-news mailing list</a>."
 msgstr ""
-"For å få dette nyhetsbrevet per e-post annenhver uke, <a href=\"https://lists."
+"For å få dette nyhetsbrevet per e-post hver uke, <a href=\"https://lists."
 "debian.org/debian-news/\">abonner</a> på postlisten debian-news."
 
 #: ../../english/template/debian/projectnews/footer.wml:10
@@ -460,3 +465,11 @@ msgid ""
 msgstr ""
 "<void id=\"plural\" />Dette nummeret av Debian Weekly News ble redigert <a "
 "href=\"mailto:dwn@debian.org\">%s</a>."
+
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "For å få dette nyhetsbrevet per e-post annenhver uke, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">abonner</a> på postlisten debian-news."
diff --git a/norwegian/po/organization.nb.po b/norwegian/po/organization.nb.po
index d862f617a55..8506e844cac 100644
--- a/norwegian/po/organization.nb.po
+++ b/norwegian/po/organization.nb.po
@@ -71,7 +71,7 @@ msgid "Officers"
 msgstr "Styremedlemmer"
 
 #: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
 msgid "Distribution"
 msgstr "Distribusjon"
 
@@ -81,11 +81,11 @@ msgid "Publicity"
 msgstr "Publisitet"
 
 #: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
 msgid "Support and Infrastructure"
 msgstr "Støtte og infrastruktur"
 
-#. formerly Custom Debian Distributions (CCDs); see http://blends.alioth.debian.org/blends/ch-about.en.html#s-Blends
+#. formerly Custom Debian Distributions (CCDs); see https://blends.alioth.debian.org/blends/ch-about.en.html#s-Blends
 #: ../../english/intro/organization.data:56
 msgid "Debian Pure Blends"
 msgstr ""
@@ -98,99 +98,99 @@ msgstr "Leder"
 msgid "Technical Committee"
 msgstr "Teknisk komité"
 
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
 msgid "Secretary"
 msgstr "Sekretær"
 
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
 msgid "Development Projects"
 msgstr "Utviklingsprosjekter"
 
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
 msgid "FTP Archives"
 msgstr "FTP-arkiv"
 
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
 msgid "FTP Masters"
 msgstr "FTP-ansvarlige"
 
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
 msgid "FTP Assistants"
 msgstr "FTP-assistenter"
 
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
 msgid "FTP Wizards"
 msgstr ""
 
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
 msgid "Backports"
 msgstr ""
 
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
 msgid "Backports Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
 msgid "Individual Packages"
 msgstr "Individuelle pakker"
 
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
 msgid "Release Management"
 msgstr "Utgavekoordinering"
 
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
 msgid "Release Team"
 msgstr "Utgiverlag"
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
 msgid "Quality Assurance"
 msgstr "Kvalitetskontroll"
 
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
 msgid "Installation System Team"
 msgstr "Installasjonsystems-gruppen"
 
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
 msgid "Release Notes"
 msgstr "Utgivelsesnotater"
 
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
 msgid "CD Images"
 msgstr "CD-avtrykk"
 
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
 msgid "Production"
 msgstr "Produksjon"
 
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
 msgid "Testing"
 msgstr "Testing"
 
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
 msgid "Autobuilding infrastructure"
 msgstr "Infrastruktur for automatisk bygging"
 
-#: ../../english/intro/organization.data:140
+#: ../../english/intro/organization.data:139
 msgid "Wanna-build team"
 msgstr ""
 
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:147
 msgid "Buildd administration"
 msgstr "Buildd-administrasjon"
 
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
 msgid "Work-Needing and Prospective Packages list"
 msgstr "List over pakker som trenger arbeid og mulige pakker"
 
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
 msgid "Live System Team"
 msgstr "Gruppen for «live»-system"
 
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
 msgid "Ports"
 msgstr "Porteringer"
 
@@ -218,81 +218,73 @@ msgstr "Pressekontakt"
 msgid "Partner Program"
 msgstr "Partnerprogram"
 
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
 msgid "Events"
 msgstr "Begivenheter"
 
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:237
 msgid "Bits from Debian"
 msgstr ""
 
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:246
 msgid "User support"
 msgstr "Brukerstøtte"
 
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
 msgid "Bug Tracking System"
 msgstr "Feilrapportsystem"
 
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "Postlisteadministrasjon og -arkiv"
 
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
 msgid "New Members Front Desk"
 msgstr "Resepsjon for nye medlemmer"
 
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
 msgid "Debian Account Managers"
 msgstr "Debian kontoforvaltere"
 
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "Nøkkelring-koordinatore (PGP og GPG)"
 
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
 #, fuzzy
 #| msgid "Debian Maintainer Keyring Team"
 msgid "Debian Maintainer (DM) Keyring Maintainers"
 msgstr "Debian utviklernøkkelringlag"
 
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
 msgid "Security Team"
 msgstr "Sikkerhetsgruppen"
 
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "Lag for sikkerhet testing"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Sikkerhetsvurderingsprosjekt"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
 msgid "Web Pages"
 msgstr "Nettsider"
 
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
 msgid "Consultants Page"
 msgstr "Konsulentsiden"
 
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
 msgid "CD Vendors Page"
 msgstr "Side med CD-leverandører"
 
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
 msgid "Planet Debian"
 msgstr "Planet Debian"
 
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
 msgid "Policy"
 msgstr "Retningslinjer"
 
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
 msgid "System Administration"
 msgstr "Systemadministrasjon"
 
-#: ../../english/intro/organization.data:401
+#: ../../english/intro/organization.data:384
 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."
@@ -301,111 +293,128 @@ msgstr ""
 "maskiner, slik som passordproblemer eller behov for å ha en særskilt pakke "
 "installert."
 
-#: ../../english/intro/organization.data:408
+#: ../../english/intro/organization.data:394
 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 "
 "contain per-machine administrator information."
 msgstr ""
-"Om du har problemer med Debians maskinvare, se på <a href=\"https://db.debian."
-"org/machines.cgi\">Debians maskinside</a>. Denne skulle inneholde "
+"Om du har problemer med Debians maskinvare, se på <a href=\"https://db."
+"debian.org/machines.cgi\">Debians maskinside</a>. Denne skulle inneholde "
 "adminstrator-opplysninger for hver maskin."
 
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
 msgid "LDAP Developer Directory Administrator"
 msgstr "Administrator av LDAP-utviklerlisten"
 
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
 msgid "Mirrors"
 msgstr "Blåkopier"
 
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
 msgid "DNS Maintainer"
 msgstr "DNS-forvalter"
 
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
 msgid "Package Tracking System"
 msgstr "Pakkesporingssystem"
 
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
 msgid "Hardware Donations Coordination"
 msgstr "Koordinering av maskinvaredonasjon"
 
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
 msgid "Auditor"
 msgstr "Revisor"
 
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
-msgstr "nåværende leder for Debian-prosjektet"
-
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
 msgid "Alioth administrators"
 msgstr "Alioth-administratorer"
 
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
 msgid "Debian Women Project"
 msgstr "Debian kvinneprosjekt"
 
-#: ../../english/intro/organization.data:443
+#: ../../english/intro/organization.data:429
 msgid "DebConf chairs"
 msgstr ""
 
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:433
 msgid "Anti-harassment"
 msgstr ""
 
-#: ../../english/intro/organization.data:458
+#: ../../english/intro/organization.data:436
+msgid "Outreach"
+msgstr ""
+
+#: ../../english/intro/organization.data:446
 msgid "Debian for children from 1 to 99"
 msgstr "Debian for barn mellom 1 og 99"
 
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
 msgid "Debian for medical practice and research"
 msgstr "Debian for medisinsk praksis og forskning"
 
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
 msgid "Debian for education"
 msgstr "Debian for utdanning"
 
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
 msgid "Debian in legal offices"
 msgstr "Debian på juridiske kontor"
 
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
 msgid "Debian for people with disabilities"
 msgstr "Debian for folk med funksjonshemning"
 
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
 msgid "Debian for science and related research"
 msgstr "Debian for naturvitenskap og relatert forskning"
 
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Tilpassede Debian distribusjoner"
+#, fuzzy
+#~| msgid "Release Team"
+#~ msgid "Volatile Team"
+#~ msgstr "Utgiverlag"
 
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Utgiverlag for den «stabile» utgaven"
+#~ msgid "Vendors"
+#~ msgstr "Leverandører"
 
-#~ msgid "APT Team"
-#~ msgstr "APT-gruppen"
+#, fuzzy
+#~ msgid "Release Assistants"
+#~ msgstr "Utgavekoordinering"
 
-#~ msgid "Handhelds"
-#~ msgstr "Håndholdte"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Postliste-arkiver"
 
-#~ msgid "Marketing Team"
-#~ msgstr "Markedsføringslag"
+#~ msgid "Mailing list"
+#~ msgstr "Postliste"
 
-#~ 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 "Installation"
+#~ msgstr "Installasjon"
+
+#~ msgid "Delegates"
+#~ msgstr "Delegater"
+
+#, fuzzy
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Installasjonsystems-gruppen"
+
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian for ikke-kommersielle organisasjoner"
+
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Det universelle operativsystemet som ditt skrivebord"
+
+#~ msgid "Accountant"
+#~ msgstr "Regnskapsfører"
+
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinering av nøkkelsignering"
 
 #~ msgid ""
 #~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -417,42 +426,35 @@ msgstr "Debian for naturvitenskap og relatert forskning"
 #~ "arkitektur og en distribusjon for å se tilgjengelig buildd-er og deres "
 #~ "administrator."
 
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinering av nøkkelsignering"
-
-#~ msgid "Accountant"
-#~ msgstr "Regnskapsfører"
-
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Det universelle operativsystemet som ditt skrivebord"
-
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian for ikke-kommersielle organisasjoner"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "Administratorene har ansvaret for at buildd for en spesiell arkitektur "
+#~ "(arch) kan nåes på <genericemail arch@buildd.debian.org>, for eksempel "
+#~ "<genericemail i386@buildd.debian.org>."
 
-#, fuzzy
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Installasjonsystems-gruppen"
+#~ msgid "Marketing Team"
+#~ msgstr "Markedsføringslag"
 
-#~ msgid "Delegates"
-#~ msgstr "Delegater"
+#~ msgid "Handhelds"
+#~ msgstr "Håndholdte"
 
-#~ msgid "Installation"
-#~ msgstr "Installasjon"
+#~ msgid "APT Team"
+#~ msgstr "APT-gruppen"
 
-#~ msgid "Mailing list"
-#~ msgstr "Postliste"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Utgiverlag for den «stabile» utgaven"
 
-#~ msgid "Mailing List Archives"
-#~ msgstr "Postliste-arkiver"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Tilpassede Debian distribusjoner"
 
-#, fuzzy
-#~ msgid "Release Assistants"
-#~ msgstr "Utgavekoordinering"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "nåværende leder for Debian-prosjektet"
 
-#~ msgid "Vendors"
-#~ msgstr "Leverandører"
+#~ msgid "Security Audit Project"
+#~ msgstr "Sikkerhetsvurderingsprosjekt"
 
-#, fuzzy
-#~| msgid "Release Team"
-#~ msgid "Volatile Team"
-#~ msgstr "Utgiverlag"
+#~ msgid "Testing Security Team"
+#~ msgstr "Lag for sikkerhet testing"
diff --git a/norwegian/po/others.nb.po b/norwegian/po/others.nb.po
index 54f3fbb3990..b19510339fe 100644
--- a/norwegian/po/others.nb.po
+++ b/norwegian/po/others.nb.po
@@ -156,26 +156,6 @@ msgstr "[Debian] (miniknapp)"
 msgid "same as the above"
 msgstr "samme som over"
 
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Ønsket:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Hvem:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Arkitektur:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Spesifikasjoner:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Hvor:"
-
 #: ../../english/misc/merchandise.def:8
 msgid "Products"
 msgstr "Produkter"
@@ -220,22 +200,34 @@ msgstr "merker"
 msgid "basketball goals"
 msgstr "basketballmål"
 
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
 msgid "earrings"
 msgstr "øreringer"
 
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
 msgid "suitcases"
 msgstr "dresser"
 
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
 msgid "umbrellas"
 msgstr "paraplyer"
 
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
 msgid "pillowcases"
 msgstr "putevar"
 
+#: ../../english/misc/merchandise.def:54
+msgid "keychains"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:57
+msgid "Swiss army knives"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:61
+msgid "USB-Sticks"
+msgstr ""
+
 #: ../../english/women/profiles/profiles.def:24
 msgid "How long have you been using Debian?"
 msgstr "Hvor lenge har du brukt Debian?"
@@ -257,14 +249,13 @@ msgid ""
 "Do you have any tips for women interested in getting more involved with "
 "Debian?"
 msgstr ""
-"Har du noen tips til kvinner som er interessert i å bli mer "
-"involvert med Debian?"
+"Har du noen tips til kvinner som er interessert i å bli mer involvert med "
+"Debian?"
 
 #: ../../english/women/profiles/profiles.def:39
 msgid ""
 "Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-"Er du involvert med noen andre kvinner i teknologigrupper? Hvilke?"
+msgstr "Er du involvert med noen andre kvinner i teknologigrupper? Hvilke?"
 
 #: ../../english/women/profiles/profiles.def:42
 msgid "A bit more about you..."
@@ -314,116 +305,131 @@ msgstr "Versjon"
 msgid "URL"
 msgstr "Nettadresse"
 
-#~ msgid "Name:"
-#~ msgstr "Navn:"
-
-#~ msgid "Company:"
-#~ msgstr "Selskap:"
+#~ msgid "p<get-var page />"
+#~ msgstr "s.<get-var page />"
 
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "developers only"
+#~ msgstr "kun for utviklere"
 
-#~ msgid "or"
-#~ msgstr "eller"
+#~ msgid "deity developers only"
+#~ msgstr "kun for deity-utviklere"
 
-#~ msgid "Email:"
-#~ msgstr "E-post:"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "Kun for Debians tekniske komité"
 
-#~ msgid "Rates:"
-#~ msgstr "Takst:"
+#~ msgid "closed"
+#~ msgstr "lukket"
 
-#~ msgid "Willing to Relocate"
-#~ msgstr "Villig å flytte"
+#~ msgid "open"
+#~ msgstr "åpen"
 
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr "<total_consultant> Debian-konsulenter i <total_country> land vist."
+#~ msgid "Unsubscribe"
+#~ msgstr "Si opp"
 
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Postliste-abonnement"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Velg listene du vil si opp abonnementet på:"
 
 #~ 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. "
+#~ "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 abonnerer via e-post. En <a href=\"unsubscribe\">oppsigelsesnettside</"
-#~ "a> er også tilgjengelig, for å si opp postlisteabonnementer. "
+#~ "du sier opp via e-post. En <a href=\"unsubscribe\">abonnementside</a> er "
+#~ "også tilgjengelig, for å abonnere på postlister. "
 
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Velg listene du vil abonnere på"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Oppsigelse av postliste-abonnement"
 
-#~ msgid "No description given"
-#~ msgstr "Beskrivelse savnes"
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr ""
+#~ "Vennligst respektér <a href=\"./#ads\">Debians retningslinjer for "
+#~ "postlisteannonsering</a>."
 
-#~ msgid "Moderated:"
-#~ msgstr "Ordstyrt:"
+#~ msgid "Clear"
+#~ msgstr "Nullstill"
 
-# Sjekkes!
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Kun medlemmer kan sende meldinger."
+#~ msgid "Subscribe"
+#~ msgstr "Abonnér"
+
+#~ msgid "Your E-Mail address:"
+#~ msgstr "E-postadressen din:"
+
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "er en oppsummert versjon som bare kan leses."
+
+#~ msgid "Subscription:"
+#~ msgstr "Abonnement:"
 
 # Sjekkes!
 #~ msgid ""
 #~ "Only messages signed by a Debian developer will be accepted by this list."
 #~ msgstr "Listen godtar kun meldinger signert av Debianutviklere."
 
-#~ msgid "Subscription:"
-#~ msgstr "Abonnement:"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "er en oppsummert versjon som bare kan leses."
+# Sjekkes!
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Kun medlemmer kan sende meldinger."
 
-#~ msgid "Your E-Mail address:"
-#~ msgstr "E-postadressen din:"
+#~ msgid "Moderated:"
+#~ msgstr "Ordstyrt:"
 
-#~ msgid "Subscribe"
-#~ msgstr "Abonnér"
+#~ msgid "No description given"
+#~ msgstr "Beskrivelse savnes"
 
-#~ msgid "Clear"
-#~ msgstr "Nullstill"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Velg listene du vil abonnere på"
 
 #~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
 #~ msgstr ""
-#~ "Vennligst respektér <a href=\"./#ads\">Debians retningslinjer for "
-#~ "postlisteannonsering</a>."
+#~ "Se <a href=\"./#subunsub\">postlistesiden</a> for informasjon om hvordan "
+#~ "du abonnerer via e-post. En <a href=\"unsubscribe\">oppsigelsesnettside</"
+#~ "a> er også tilgjengelig, for å si opp postlisteabonnementer. "
 
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Oppsigelse av postliste-abonnement"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Postliste-abonnement"
 
 #~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to unsubscribe using e-mail. An <a href=\"subscribe\">subscription "
-#~ "web form</a> is also available, for subscribing to mailing lists. "
-#~ msgstr ""
-#~ "Se <a href=\"./#subunsub\">postlistesiden</a> for informasjon om hvordan "
-#~ "du sier opp via e-post. En <a href=\"unsubscribe\">abonnementside</a> er "
-#~ "også tilgjengelig, for å abonnere på postlister. "
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr "<total_consultant> Debian-konsulenter i <total_country> land vist."
 
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Velg listene du vil si opp abonnementet på:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Villig å flytte"
 
-#~ msgid "Unsubscribe"
-#~ msgstr "Si opp"
+#~ msgid "Rates:"
+#~ msgstr "Takst:"
 
-#~ msgid "open"
-#~ msgstr "åpen"
+#~ msgid "Email:"
+#~ msgstr "E-post:"
 
-#~ msgid "closed"
-#~ msgstr "lukket"
+#~ msgid "or"
+#~ msgstr "eller"
 
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "Kun for Debians tekniske komité"
+#~ msgid "URL:"
+#~ msgstr "URL:"
 
-#~ msgid "deity developers only"
-#~ msgstr "kun for deity-utviklere"
+#~ msgid "Company:"
+#~ msgstr "Selskap:"
 
-#~ msgid "developers only"
-#~ msgstr "kun for utviklere"
+#~ msgid "Name:"
+#~ msgstr "Navn:"
 
-#~ msgid "p<get-var page />"
-#~ msgstr "s.<get-var page />"
+#~ msgid "Where:"
+#~ msgstr "Hvor:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Spesifikasjoner:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Arkitektur:"
+
+#~ msgid "Who:"
+#~ msgstr "Hvem:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Ønsket:"
diff --git a/norwegian/po/ports.nb.po b/norwegian/po/ports.nb.po
index 7352a043293..bf64dcee7b2 100644
--- a/norwegian/po/ports.nb.po
+++ b/norwegian/po/ports.nb.po
@@ -113,32 +113,32 @@ msgstr "Debian for PowerPC"
 msgid "Debian for Sparc"
 msgstr "Debian for Sparc"
 
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian for Sparc64"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian for S/390"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian for bærbare"
 
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian for MIPS"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian for AMD64"
 
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian for Motorola 680x0"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian for ARM"
 
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian for Beowulf"
 
 #~ msgid "Main"
 #~ msgstr "Hoved"
 
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian for Beowulf"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
 
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian for ARM"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian for Motorola 680x0"
 
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian for AMD64"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian for MIPS"
 
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian for bærbare"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian for S/390"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian for Sparc64"
diff --git a/norwegian/po/stats.nb.po b/norwegian/po/stats.nb.po
index eb47c17a3bf..9597dd1e07d 100644
--- a/norwegian/po/stats.nb.po
+++ b/norwegian/po/stats.nb.po
@@ -25,75 +25,75 @@ msgstr "Det er %d byte å oversette."
 msgid "There are %d strings to translate."
 msgstr "Det er %d strenger å oversette."
 
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
 msgid "This translation is too out of date"
 msgstr "Denne oversettelsen for utdatert"
 
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
 msgid "Wrong translation version"
 msgstr "Feil oversettelsesversjon"
 
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
 msgid "The original is newer than this translation"
 msgstr "Originalen er nyere enn denne oversettelsen"
 
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
 msgid "The original no longer exists"
 msgstr "Originalen fins ikke lenger"
 
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
 msgid "hit count N/A"
 msgstr "antall treff fins ikke"
 
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
 msgid "hits"
 msgstr "treff"
 
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
 msgid "Click to fetch diffstat data"
 msgstr ""
 
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
 msgid "Unified diff"
 msgstr ""
 
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
 msgid "Colored diff"
 msgstr ""
 
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
 msgid "Translation summary for"
 msgstr "Oversettelsessammendrag for"
 
-#: ../../stattrans.pl:578 ../../stattrans.pl:737 ../../stattrans.pl:783
-#: ../../stattrans.pl:826
+#: ../../stattrans.pl:544 ../../stattrans.pl:700 ../../stattrans.pl:746
+#: ../../stattrans.pl:789
 msgid "Not translated"
 msgstr "Ikke oversatt"
 
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
 msgid "Outdated"
 msgstr "Utdatert"
 
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
 msgid "Translated"
 msgstr "Oversatt"
 
-#: ../../stattrans.pl:578 ../../stattrans.pl:663 ../../stattrans.pl:735
-#: ../../stattrans.pl:781 ../../stattrans.pl:824
+#: ../../stattrans.pl:544 ../../stattrans.pl:626 ../../stattrans.pl:698
+#: ../../stattrans.pl:744 ../../stattrans.pl:787
 msgid "Up to date"
 msgstr "Oppdatert"
 
-#: ../../stattrans.pl:579 ../../stattrans.pl:580 ../../stattrans.pl:581
-#: ../../stattrans.pl:582
+#: ../../stattrans.pl:545 ../../stattrans.pl:546 ../../stattrans.pl:547
+#: ../../stattrans.pl:548
 msgid "files"
 msgstr "filer"
 
-#: ../../stattrans.pl:585 ../../stattrans.pl:586 ../../stattrans.pl:587
-#: ../../stattrans.pl:588
+#: ../../stattrans.pl:551 ../../stattrans.pl:552 ../../stattrans.pl:553
+#: ../../stattrans.pl:554
 msgid "bytes"
 msgstr "byte"
 
-#: ../../stattrans.pl:595
+#: ../../stattrans.pl:561
 msgid ""
 "Note: the lists of pages are sorted by popularity. Hover over the page name "
 "to see the number of hits."
@@ -101,135 +101,135 @@ msgstr ""
 "Merk: Lista med sider er sortert etter popularitet. Hold musepekeren over "
 "sidenavnet for å se antall treff."
 
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
 msgid "Outdated translations"
 msgstr "Utdaterte oversettelser"
 
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
 msgid "File"
 msgstr "Fil"
 
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
 msgid "Diff"
 msgstr ""
 
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
 msgid "Diffstat"
 msgstr ""
 
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
 msgid "Log"
 msgstr "Logg"
 
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
 msgid "Translation"
 msgstr "Oversettelse"
 
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
 msgid "Maintainer"
 msgstr "Vedlikeholder"
 
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
 msgid "Status"
 msgstr "Status"
 
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
 msgid "Translator"
 msgstr "Oversetter"
 
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
 msgid "Date"
 msgstr "Dato"
 
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
 msgid "General pages not translated"
 msgstr "Generelle sider som ikke er oversatt"
 
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
 msgid "Untranslated general pages"
 msgstr "Ikke-oversatte generelle sider"
 
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
 msgid "News items not translated"
 msgstr "Nyhetsoppføringer som ikke er oversatt"
 
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
 msgid "Untranslated news items"
 msgstr "Ikke-oversatte nyhetsoppføringer"
 
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
 msgid "Consultant/user pages not translated"
 msgstr "Konsulent/brukersider som ikke er oversatt"
 
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
 msgid "Untranslated consultant/user pages"
 msgstr "Ikke-oversatte konsulent/brukersider"
 
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
 msgid "International pages not translated"
 msgstr "Internasjonale sider som ikke er oversatt"
 
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
 msgid "Untranslated international pages"
 msgstr "Ikke-oversatte internasjonale sider"
 
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
 msgid "Translated pages (up-to-date)"
 msgstr "Oversatte sider (oppdatert)"
 
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
 msgid "Translated templates (PO files)"
 msgstr "Oversatte maler (PO-filer)"
 
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
 msgid "PO Translation Statistics"
 msgstr "PO-oversettelsesstatistikk"
 
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
 msgid "Fuzzy"
 msgstr "Fuzzy"
 
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
 msgid "Untranslated"
 msgstr "Ikke oversatt"
 
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
 msgid "Total"
 msgstr "Totalt"
 
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
 msgid "Total:"
 msgstr "Totalt:"
 
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
 msgid "Created with"
 msgstr "Opprettet med"
 
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
 msgid "Translated web pages"
 msgstr "Oversatte nettsider"
 
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
 msgid "Translation Statistics by Page Count"
 msgstr "Oversettelsesstatistikk etter sideantall"
 
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
 msgid "Language"
 msgstr "Språk"
 
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
 msgid "Translations"
 msgstr "Oversettelser"
 
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
 msgid "Translated web pages (by size)"
 msgstr "Oversatte nettsider (etter størrelse)"
 
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
 msgid "Translation Statistics by Page Size"
 msgstr "Oversettelsesstatistikk etter sidestørrelse"
 
diff --git a/norwegian/po/templates.nb.po b/norwegian/po/templates.nb.po
index 61cc53b5a2f..4966b20725d 100644
--- a/norwegian/po/templates.nb.po
+++ b/norwegian/po/templates.nb.po
@@ -57,7 +57,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
 msgstr "Tilbake til <a href=\"m4_HOME/\">Debianprosjektets hjemmeside</a>."
 
 #: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:152
 msgid "Home"
 msgstr "Hjem"
 
@@ -98,7 +98,7 @@ msgid "Support"
 msgstr "Brukerstøtte"
 
 #: ../../english/template/debian/common_translation.wml:52
-#: ../../english/template/debian/links.tags.wml:43
+#: ../../english/template/debian/links.tags.wml:46
 msgid "Developers' Corner"
 msgstr "Utviklerhjørnet"
 
@@ -135,7 +135,7 @@ msgid "Miscellaneous"
 msgstr "Diverse"
 
 #: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:107
 msgid "Getting Debian"
 msgstr "Få tak i Debian"
 
@@ -189,7 +189,7 @@ msgstr "i utgave 2.2"
 #. you can add some information of your own translation mailing list
 #. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
 #. your language.
-#: ../../english/template/debian/footer.wml:96
+#: ../../english/template/debian/footer.wml:97
 msgid ""
 "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
 "www@lists.debian.org\">debian-www@lists.debian.org</a>.  For other contact "
@@ -197,28 +197,29 @@ msgid ""
 "Web site source code is <a href=\"m4_HOME/devel/website/using_cvs"
 "\">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>. "
-"For øvrig kontaktinformasjon, se Debians <a href=\"m4_HOME/contact\">kontaktside</a>."
-"Nettstedets kildekode er <a href=\"m4_HOME/devel/website/using_cvs\">tilgjengelig</a>."
+"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>. "
+"For øvrig kontaktinformasjon, se Debians <a href=\"m4_HOME/contact"
+"\">kontaktside</a>.Nettstedets kildekode er <a href=\"m4_HOME/devel/website/"
+"using_cvs\">tilgjengelig</a>."
 
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
 msgid "Last Modified"
 msgstr "Sist oppdatert"
 
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
 msgid "Copyright"
 msgstr "Opphavsrett"
 
-#: ../../english/template/debian/footer.wml:105
+#: ../../english/template/debian/footer.wml:106
 msgid "<a href=\"http://www.spi-inc.org/\">SPI</a> and others;"
 msgstr "<a href=\"http://www.spi-inc.org/\">SPI</a> og andre;"
 
-#: ../../english/template/debian/footer.wml:108
+#: ../../english/template/debian/footer.wml:109
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr "Se <a href=\"m4_HOME/license\" rel=\"copyright\">lisensvilkårene</a>"
 
-#: ../../english/template/debian/footer.wml:111
+#: ../../english/template/debian/footer.wml:112
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -280,139 +281,149 @@ msgid "Debian Books"
 msgstr "Debianbøker"
 
 #: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Debian"
+msgid "Debian Wiki"
+msgstr "Debian"
+
+#: ../../english/template/debian/links.tags.wml:40
 msgid "Mailing List Archives"
 msgstr "Postlistearkiver"
 
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
 msgid "Mailing Lists"
 msgstr "Postlister"
 
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
 msgid "Social Contract"
 msgstr "Sosial kontrakt"
 
-#: ../../english/template/debian/links.tags.wml:49
+#: ../../english/template/debian/links.tags.wml:52
+msgid "Code of Conduct"
+msgstr ""
+
+#: ../../english/template/debian/links.tags.wml:55
 msgid "Visit the site sponsor"
 msgstr "Besøk sponsoren for disse sidene"
 
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
 msgid "Debian 5.0 - The universal operating system"
 msgstr "Debian 5.0 - det universelle operativsystemet"
 
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
 msgid "Site map for Debian web pages"
 msgstr "Oversikt av Debians nettsider"
 
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
 msgid "Developer Database"
 msgstr "Database av utviklere"
 
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
 msgid "Debian FAQ"
 msgstr "Debian OSS/FAQ"
 
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
 msgid "Debian Policy Manual"
 msgstr "Retningslinjehåndbok"
 
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
 msgid "Developers' Reference"
 msgstr "Utviklerhåndbok"
 
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
 msgid "New Maintainers' Guide"
 msgstr "Innledning for nye utviklere"
 
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
 msgid "Release Critical Bugs"
 msgstr "Utgavekritiske feil"
 
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
 msgid "Lintian Reports"
 msgstr "Lintian-rapporter"
 
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
 msgid "Archives for users' mailing lists"
 msgstr "Arkiv av brukerpostlister"
 
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
 msgid "Archives for developers' mailing lists"
 msgstr "Arkiv av utviklerpostlister"
 
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
 msgid "Archives for i18n/l10n mailing lists"
 msgstr "Arkiv av i18n-/l10n-postlister"
 
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
 msgid "Archives for ports' mailing lists"
 msgstr "Arkiv av porterings-postlister"
 
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:98
 msgid "Archives for mailing lists of the Bug tracking system"
 msgstr "Arkiv av postlister for feilrapportsystemet"
 
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
 msgid "Archives for miscellaneous mailing lists"
 msgstr "Arkiv av diverse postlister"
 
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
 msgid "Free Software"
 msgstr "Fri programvare"
 
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
 msgid "Development"
 msgstr "Utvikling"
 
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
 msgid "Help Debian"
 msgstr "Hjelp Debian"
 
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
 msgid "Bug reports"
 msgstr "Feilmeldinger"
 
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
 msgid "Ports/Architectures"
 msgstr "Arkitekturtilpasninger"
 
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
 msgid "Installation manual"
 msgstr "Installasjonshåndbok"
 
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
 msgid "CD vendors"
 msgstr "CD-leverandører"
 
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
 msgid "CD/USB ISO images"
 msgstr "CD/USB-ISO-avtrykk"
 
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
 msgid "Network install"
 msgstr "Nettverksinstallasjon"
 
 # Sjekkes!
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
 msgid "Pre-installed"
 msgstr "Ferdiginstallert"
 
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
 msgid "Debian-Edu project"
 msgstr "Debian-Edu-prosjektet"
 
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
 msgid "Alioth &ndash; Debian GForge"
 msgstr "Alioth &ndash; Debian GForge"
 
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
 msgid "Quality Assurance"
 msgstr "Kvalitetskontroll"
 
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
 msgid "Package Tracking System"
 msgstr "Pakkesporingssystemet"
 
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
 msgid "Debian Developer's Packages Overview"
 msgstr "Debianutviklernes pakkeoversikt"
 
@@ -494,272 +505,136 @@ 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 "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 ""
+#~| "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 ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
+#~ "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 ""
-#~ "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"
+#~ "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 ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
 #~ msgstr ""
-#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joey "
-#~ "Hess</a>."
+#~ "<a href=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
 
 #, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
 #~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier og Martin 'Joey' Schulze</a>."
-
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier og Martin 'Joey' Schulze</a>."
-
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
-#~ msgstr ""
-#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary og Tollef Fog Heen</a>."
-
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (død peker)"
-
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Sikkerhetsmelding fra Debian"
-
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Sikkerhetsmeldinger fra Debian"
-
-#~ msgid "Vulnerable"
-#~ msgstr "Sårbar"
-
-#~ msgid "Fixed in"
-#~ msgstr "Rettet i"
-
-#~ msgid "Source:"
-#~ msgstr "Kildekode:"
-
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Arkitekturuavhengig bestanddel:"
-
-#~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
-#~ msgstr ""
-#~ "MD5-kontrolsummer av disse filene er tilgjengelig i den <a href=\"<get-"
-#~ "var url />\">originale sikkerhetsmeldingen</a>."
-
-#~ msgid "No other external database security references currently available."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
-#~ "Ingen sikkerhetsreferanser er for tiden tilgjengelig i andre databaser."
-
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "CERT's notater om sårbarheter, sikkerhet, og observasjoner:"
-
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
-
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "I Mitre's CVE-ordbok:"
-
-#~ msgid "Security database references"
-#~ msgstr "Referanser i sikkerhetsdatabaser"
-
-#~ msgid "License Information"
-#~ msgstr "Lisensinformasjon"
-
-#, fuzzy
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "diverse"
+#~ "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>."
@@ -771,135 +646,271 @@ 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=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "diverse"
+
+#~ msgid "License Information"
+#~ msgstr "Lisensinformasjon"
+
+#~ msgid "Security database references"
+#~ msgstr "Referanser i sikkerhetsdatabaser"
+
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "I Mitre's CVE-ordbok:"
+
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
+
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "CERT's notater om sårbarheter, sikkerhet, og observasjoner:"
+
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "Ingen sikkerhetsreferanser er for tiden tilgjengelig i andre databaser."
+
 #~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
 #~ msgstr ""
-#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ "MD5-kontrolsummer av disse filene er tilgjengelig i den <a href=\"<get-"
+#~ "var url />\">originale sikkerhetsmeldingen</a>."
 
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ 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 ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
 #~ msgstr ""
-#~ "<a href=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary og Tollef Fog Heen</a>."
+
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier og Martin 'Joey' Schulze</a>."
 
 #, 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>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</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."
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier og Martin 'Joey' Schulze</a>."
 
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (død peker)"
+#, fuzzy
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Redaktør av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">Joey "
+#~ "Hess</a>."
+
+#~ msgid "download with pik"
+#~ msgstr "hent med pik"
 
-# Sjekkes!
 #~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
 #~ msgstr ""
-#~ "Tilbake til: andre <a href=\"./\">Debiannyheter</a> || <a href=\"m4_HOME/"
-#~ "\">Debianprosjektets hjemmeside</a>."
+#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for informasjon om "
+#~ "å komme i kontakt med oss."
 
-#~ msgid "Latest News"
-#~ msgstr "Siste nytt"
+#~ msgid "buy pre-made images"
+#~ msgstr "kjøp ferdige cd-avtrykk"
 
-#~ msgid "Related Links"
-#~ msgstr "Beslektede pekere"
+#~ msgid "network install"
+#~ msgstr "nettverksinstallasjon"
 
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Prosjekt</th><th>Koordinator</th>"
+#~ msgid "discussed"
+#~ msgstr "diskutert"
 
-#~ msgid "Main Coordinator"
-#~ msgstr "Hovedkoordinator"
+#~ msgid "Vote"
+#~ msgstr "Stem"
 
-#~ msgid "Debian Involvement"
-#~ msgstr "Debians engasjement"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Les&nbsp;et&nbsp;resultat"
 
-#~ msgid "More Info"
-#~ msgstr "Mer informasjon"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Følg&nbsp;et&nbsp;forslag"
 
-#~ msgid "Where"
-#~ msgstr "Hvor"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Legg&nbsp;til&nbsp;et&nbsp;forslag"
 
-#~ msgid "When"
-#~ msgstr "Når"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Send&nbsp;inn&nbsp;et&nbsp;forslag"
 
-#~ msgid "link may no longer be valid"
-#~ msgstr "pekeren er muligvis gammel"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Hvordan..."
 
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Kommende begivenheter"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Hjem&nbsp;Avstemmingssiden"
 
-#~ msgid "More information"
-#~ msgstr "Mer informasjon"
+#~ msgid "Other"
+#~ msgstr "Annet"
 
-#~ msgid "Rating:"
-#~ msgstr "Vurdering:"
+#~ msgid "Withdrawn"
+#~ msgstr "Tilbaketrukket"
 
-#~ msgid "Nobody"
-#~ msgstr "Ingen"
+#~ msgid "Decided"
+#~ msgstr "Besluttet"
 
-#~ msgid "Taken by:"
-#~ msgstr "Tatt av:"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Avstemming&nbsp;pågår"
 
-#~ msgid "More information:"
-#~ msgstr "Mer informasjon:"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Under&nbsp;diskusjon"
 
-#~| msgid "Select a server near you"
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Velg en tjener nær deg: &nbsp;"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Venter&nbsp;på&nbsp;sponsorer"
 
-#~| msgid "Report"
-#~ msgid "Report it!"
-#~ msgstr "Rapporter det"
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "Under&nbsp;diskusjon"
 
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Har du oppdaget et problem med nettstedets utforming?"
+#, fuzzy
+#~ msgid "Proposer"
+#~ msgstr "foreslått"
+
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "Debians cd-gruppe"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Donasjoner"
+
+#~ msgid ""
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
+#~ msgstr ""
+#~ "Engelskspråklige <a href=\"/MailingLists/disclaimer\">åpne postlister</a> "
+#~ "for CD'er/DVD'er:"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "diverse"
+
+#~ msgid "net_install"
+#~ msgstr "nettinstall"
+
+#~ msgid "buy"
+#~ msgstr "kjøp"
+
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
+
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
+
+#~ msgid "debian_on_cd"
+#~ msgstr "Debian på CD"
+
+#~ msgid "Debian CD team"
+#~ msgstr "Debians cd-gruppe"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "diverse"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "diverse"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "OSS"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "diverse"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "OSS"
+
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "Nettverksinstallasjon"
+
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "hent via http/ftp"
+
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "hent med jigdo"
+
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Tilbake til <a href=\"./\">Debians konsulentliste</a>."
+
+#~ msgid "List of Consultants"
+#~ msgstr "Konsulentliste"
diff --git a/norwegian/po/vendors.nb.po b/norwegian/po/vendors.nb.po
index 7ef3da510be..f0c9e57955b 100644
--- a/norwegian/po/vendors.nb.po
+++ b/norwegian/po/vendors.nb.po
@@ -9,138 +9,131 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Leverandør:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL for Debiansiden:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Tar imot bidrag til Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Land:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Sender til utlandet:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "epost:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "CD-type:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "DVD-type:"
-
 #: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Arkitekturer:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
 msgid "Vendor"
 msgstr "Leverandør"
 
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
 msgid "Allows Contributions"
 msgstr "Tillater bidrag"
 
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+#, fuzzy
+#| msgid "CD/DVD"
+msgid "CD/DVD/BD/USB"
 msgstr "CD/DVD"
 
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
 msgid "Architectures"
 msgstr "Arkitekturer"
 
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
 msgid "Ship International"
 msgstr "Sender til utlandet"
 
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
 msgid "Contact"
 msgstr "Kontakt"
 
 #. ###################
 #. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:54
+#: ../../english/CD/vendors/vendors.CD.def:44
 msgid "Vendor Home"
 msgstr "Leverandørens hjemmeside"
 
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
 msgid "page"
 msgstr "side"
 
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
 msgid "email"
 msgstr "e-post"
 
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
 msgid "within Europe"
 msgstr "til Europa"
 
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
 msgid "To some areas"
 msgstr "Til visse områder"
 
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
 msgid "source"
 msgstr "kildekode"
 
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
 msgid "and"
 msgstr "og"
 
-#~ msgid "Official CD"
-#~ msgstr "Offisiell CD"
+#~ msgid "updated monthly"
+#~ msgstr "oppdateres månedlig"
 
-#, fuzzy
-#~ msgid "Official DVD"
-#~ msgstr "Offisiell CD"
+#~ msgid "updated twice weekly"
+#~ msgstr "oppdateres to ganger i uken"
 
-#~ msgid "Development Snapshot"
-#~ msgstr "Utviklingsversjon"
+#~ msgid "updated weekly"
+#~ msgstr "oppdateres ukentlig"
 
-#~ msgid "Vendor Release"
-#~ msgstr "Leverandørutgave"
+#~ msgid "reseller"
+#~ msgstr "videreformidler"
 
-#~ msgid "Multiple Distribution"
-#~ msgstr "Fler-distribusjon"
+#~ msgid "reseller of $var"
+#~ msgstr "videreformidler av $var"
 
-#~ msgid "non-US included"
-#~ msgstr "non-US inkludert"
+#~ msgid "Custom Release"
+#~ msgstr "Bestillingsverk"
 
-#~ msgid "non-free included"
-#~ msgstr "non-free inkludert"
+#~ msgid "vendor additions"
+#~ msgstr "tillegg fra leverandør"
 
 #~ msgid "contrib included"
 #~ msgstr "contrib inkludert"
 
-#~ msgid "vendor additions"
-#~ msgstr "tillegg fra leverandør"
+#~ msgid "non-free included"
+#~ msgstr "non-free inkludert"
 
-#~ msgid "Custom Release"
-#~ msgstr "Bestillingsverk"
+#~ msgid "non-US included"
+#~ msgstr "non-US inkludert"
 
-#~ msgid "reseller of $var"
-#~ msgstr "videreformidler av $var"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Fler-distribusjon"
 
-#~ msgid "reseller"
-#~ msgstr "videreformidler"
+#~ msgid "Vendor Release"
+#~ msgstr "Leverandørutgave"
 
-#~ msgid "updated weekly"
-#~ msgstr "oppdateres ukentlig"
+#~ msgid "Development Snapshot"
+#~ msgstr "Utviklingsversjon"
 
-#~ msgid "updated twice weekly"
-#~ msgstr "oppdateres to ganger i uken"
+#, fuzzy
+#~ msgid "Official DVD"
+#~ msgstr "Offisiell CD"
 
-#~ msgid "updated monthly"
-#~ msgstr "oppdateres månedlig"
+#~ msgid "Official CD"
+#~ msgstr "Offisiell CD"
+
+#~ msgid "Architectures:"
+#~ msgstr "Arkitekturer:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD-type:"
+
+#~ msgid "CD Type:"
+#~ msgstr "CD-type:"
+
+#~ msgid "email:"
+#~ msgstr "epost:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Sender til utlandet:"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Tar imot bidrag til Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL for Debiansiden:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Leverandør:"
diff --git a/norwegian/po/vote.nb.po b/norwegian/po/vote.nb.po
index 5994330f900..207f0685cf4 100644
--- a/norwegian/po/vote.nb.po
+++ b/norwegian/po/vote.nb.po
@@ -18,233 +18,249 @@ msgid "Time Line"
 msgstr ""
 
 #: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
 #, fuzzy
 msgid "Nominations"
 msgstr "Donasjoner"
 
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
 #, fuzzy
 msgid "Debate"
 msgstr "Debians cd-gruppe"
 
-#: ../../english/template/debian/votebar.wml:25
+#: ../../english/template/debian/votebar.wml:28
 msgid "Platforms"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
 #, fuzzy
 msgid "Proposer"
 msgstr "foreslått"
 
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
 msgid "Proposal A Proposer"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
 msgid "Proposal B Proposer"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
 msgid "Proposal C Proposer"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
 msgid "Proposal D Proposer"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
 msgid "Proposal E Proposer"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
 msgid "Proposal F Proposer"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
 msgid "Seconds"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
 msgid "Proposal A Seconds"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
 msgid "Proposal B Seconds"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
 msgid "Proposal C Seconds"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
 msgid "Proposal D Seconds"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
 msgid "Proposal E Seconds"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
 msgid "Proposal F Seconds"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
 msgid "Opposition"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
 msgid "Text"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
 msgid "Proposal A"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
 msgid "Proposal B"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
 msgid "Proposal C"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
 msgid "Proposal D"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
 msgid "Proposal E"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
 msgid "Proposal F"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
 msgid "Choices"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
 msgid "Amendment Proposer"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
 msgid "Amendment Seconds"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
 msgid "Amendment Text"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
 msgid "Amendment Proposer A"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
 msgid "Amendment Seconds A"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
 msgid "Amendment Text A"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
 msgid "Amendment Proposer B"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
 msgid "Amendment Seconds B"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
 msgid "Amendment Text B"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+msgid "Amendment Proposer C"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:130
+msgid "Amendment Seconds C"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:133
+msgid "Amendment Text C"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:136
 msgid "Amendments"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:139
 msgid "Proceedings"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:142
 msgid "Majority Requirement"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:145
 msgid "Data and Statistics"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:148
 msgid "Quorum"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:151
 #, fuzzy
 msgid "Minimum Discussion"
 msgstr "Under&nbsp;diskusjon"
 
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:154
 msgid "Ballot"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:157
 msgid "Forum"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:160
 msgid "Outcome"
 msgstr ""
 
-#: ../../english/template/debian/votebar.wml:152
+#: ../../english/template/debian/votebar.wml:164
 msgid "Waiting&nbsp;for&nbsp;Sponsors"
 msgstr "Venter&nbsp;på&nbsp;sponsorer"
 
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
 msgid "In&nbsp;Discussion"
 msgstr "Under&nbsp;diskusjon"
 
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
 msgid "Voting&nbsp;Open"
 msgstr "Avstemming&nbsp;pågår"
 
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
 msgid "Decided"
 msgstr "Besluttet"
 
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
 msgid "Withdrawn"
 msgstr "Tilbaketrukket"
 
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
 msgid "Other"
 msgstr "Annet"
 
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
 msgid "Home&nbsp;Vote&nbsp;Page"
 msgstr "Hjem&nbsp;Avstemmingssiden"
 
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
 msgid "How&nbsp;To"
 msgstr "Hvordan..."
 
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
 msgid "Submit&nbsp;a&nbsp;Proposal"
 msgstr "Send&nbsp;inn&nbsp;et&nbsp;forslag"
 
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
 msgid "Amend&nbsp;a&nbsp;Proposal"
 msgstr "Legg&nbsp;til&nbsp;et&nbsp;forslag"
 
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
 msgid "Follow&nbsp;a&nbsp;Proposal"
 msgstr "Følg&nbsp;et&nbsp;forslag"
 
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
 msgid "Read&nbsp;a&nbsp;Result"
 msgstr "Les&nbsp;et&nbsp;resultat"
 
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
 msgid "Vote"
 msgstr "Stem"
author	Tobias Quathamer <toddy>	2016-01-13 19:33:04 +0000
committer	Tobias Quathamer <toddy>	2016-01-13 19:33:04 +0000
commit	c115acf57565449ed3a560e709d8ac0fbc8a684d (patch)
tree	142575199fdea6e36356a3dbe1715980611a72f3 /norwegian/po
parent	24da40d56397485471fbf430177d7554eb8fa9a1 (diff)