aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Quathamer <toddy>2016-01-13 19:33:04 +0000
committerTobias Quathamer <toddy>2016-01-13 19:33:04 +0000
commitc115acf57565449ed3a560e709d8ac0fbc8a684d (patch)
tree142575199fdea6e36356a3dbe1715980611a72f3
parent24da40d56397485471fbf430177d7554eb8fa9a1 (diff)
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
-rw-r--r--arabic/po/cdimage.ar.po10
-rw-r--r--arabic/po/distrib.ar.po36
-rw-r--r--arabic/po/doc.ar.po181
-rw-r--r--arabic/po/newsevents.ar.po21
-rw-r--r--arabic/po/organization.ar.po146
-rw-r--r--arabic/po/others.ar.po59
-rw-r--r--arabic/po/ports.ar.po170
-rw-r--r--arabic/po/stats.ar.po108
-rw-r--r--arabic/po/templates.ar.po98
-rw-r--r--arabic/po/vendors.ar.po89
-rw-r--r--arabic/po/vote.ar.po134
-rw-r--r--armenian/po/cdimage.hy.po10
-rw-r--r--armenian/po/distrib.hy.po50
-rw-r--r--armenian/po/doc.hy.po172
-rw-r--r--armenian/po/newsevents.hy.po16
-rw-r--r--armenian/po/organization.hy.po143
-rw-r--r--armenian/po/others.hy.po40
-rw-r--r--armenian/po/templates.hy.po92
-rw-r--r--armenian/po/vendors.hy.po86
-rw-r--r--armenian/po/vote.hy.po128
-rw-r--r--bulgarian/po/bugs.bg.po198
-rw-r--r--bulgarian/po/cdimage.bg.po10
-rw-r--r--bulgarian/po/distrib.bg.po62
-rw-r--r--bulgarian/po/doc.bg.po113
-rw-r--r--bulgarian/po/l10n.bg.po6
-rw-r--r--bulgarian/po/mailinglists.bg.po6
-rw-r--r--bulgarian/po/newsevents.bg.po33
-rw-r--r--bulgarian/po/organization.bg.po224
-rw-r--r--bulgarian/po/others.bg.po199
-rw-r--r--bulgarian/po/ports.bg.po38
-rw-r--r--bulgarian/po/stats.bg.po108
-rw-r--r--bulgarian/po/templates.bg.po839
-rw-r--r--bulgarian/po/vendors.bg.po91
-rw-r--r--bulgarian/po/vote.bg.po134
-rw-r--r--catalan/po/bugs.ca.po198
-rw-r--r--catalan/po/cdimage.ca.po10
-rw-r--r--catalan/po/distrib.ca.po104
-rw-r--r--catalan/po/doc.ca.po181
-rw-r--r--catalan/po/l10n.ca.po6
-rw-r--r--catalan/po/mailinglists.ca.po6
-rw-r--r--catalan/po/newsevents.ca.po36
-rw-r--r--catalan/po/organization.ca.po255
-rw-r--r--catalan/po/others.ca.po229
-rw-r--r--catalan/po/ports.ca.po174
-rw-r--r--catalan/po/templates.ca.po896
-rw-r--r--catalan/po/vendors.ca.po147
-rw-r--r--catalan/po/vote.ca.po134
-rw-r--r--chinese/po/bugs.zh.po190
-rw-r--r--chinese/po/cdimage.zh.po10
-rw-r--r--chinese/po/countries.zh.po6
-rw-r--r--chinese/po/distrib.zh.po38
-rw-r--r--chinese/po/doc.zh.po200
-rw-r--r--chinese/po/mailinglists.zh.po6
-rw-r--r--chinese/po/newsevents.zh.po33
-rw-r--r--chinese/po/organization.zh.po213
-rw-r--r--chinese/po/others.zh.po127
-rw-r--r--chinese/po/ports.zh.po38
-rw-r--r--chinese/po/stats.zh.po108
-rw-r--r--chinese/po/templates.zh.po426
-rw-r--r--chinese/po/vendors.zh.po147
-rw-r--r--chinese/po/vote.zh.po134
-rw-r--r--croatian/po/cdimage.hr.po10
-rw-r--r--croatian/po/distrib.hr.po76
-rw-r--r--croatian/po/doc.hr.po181
-rw-r--r--croatian/po/mailinglists.hr.po6
-rw-r--r--croatian/po/newsevents.hr.po36
-rw-r--r--croatian/po/organization.hr.po217
-rw-r--r--croatian/po/others.hr.po277
-rw-r--r--croatian/po/ports.hr.po46
-rw-r--r--croatian/po/templates.hr.po773
-rw-r--r--croatian/po/vendors.hr.po147
-rw-r--r--croatian/po/vote.hr.po134
-rw-r--r--czech/po/bugs.cs.po190
-rw-r--r--czech/po/cdimage.cs.po10
-rw-r--r--czech/po/distrib.cs.po44
-rw-r--r--czech/po/doc.cs.po181
-rw-r--r--czech/po/newsevents.cs.po39
-rw-r--r--czech/po/organization.cs.po143
-rw-r--r--czech/po/others.cs.po40
-rw-r--r--czech/po/templates.cs.po115
-rw-r--r--czech/po/vendors.cs.po62
-rw-r--r--czech/po/vote.cs.po128
-rw-r--r--danish/po/bugs.da.po198
-rw-r--r--danish/po/cdimage.da.po8
-rw-r--r--danish/po/countries.da.po6
-rw-r--r--danish/po/distrib.da.po64
-rw-r--r--danish/po/doc.da.po80
-rw-r--r--danish/po/l10n.da.po8
-rw-r--r--danish/po/mailinglists.da.po6
-rw-r--r--danish/po/organization.da.po313
-rw-r--r--danish/po/others.da.po302
-rw-r--r--danish/po/ports.da.po180
-rw-r--r--danish/po/stats.da.po116
-rw-r--r--danish/po/templates.da.po866
-rw-r--r--danish/po/vendors.da.po157
-rw-r--r--dutch/po/bugs.nl.po3
-rw-r--r--dutch/po/cdimage.nl.po11
-rw-r--r--dutch/po/consultants.nl.po1
-rw-r--r--dutch/po/distrib.nl.po62
-rw-r--r--dutch/po/doc.nl.po371
-rw-r--r--dutch/po/newsevents.nl.po353
-rw-r--r--dutch/po/organization.nl.po182
-rw-r--r--dutch/po/others.nl.po62
-rw-r--r--dutch/po/ports.nl.po38
-rw-r--r--dutch/po/stats.nl.po109
-rw-r--r--dutch/po/templates.nl.po152
-rw-r--r--dutch/po/vendors.nl.po91
-rw-r--r--dutch/po/vote.nl.po134
-rw-r--r--esperanto/po/cdimage.eo.po10
-rw-r--r--esperanto/po/distrib.eo.po36
-rw-r--r--esperanto/po/doc.eo.po172
-rw-r--r--esperanto/po/newsevents.eo.po26
-rw-r--r--esperanto/po/organization.eo.po143
-rw-r--r--esperanto/po/others.eo.po40
-rw-r--r--esperanto/po/templates.eo.po446
-rw-r--r--esperanto/po/vendors.eo.po62
-rw-r--r--esperanto/po/vote.eo.po128
-rw-r--r--finnish/po/bugs.fi.po200
-rw-r--r--finnish/po/cdimage.fi.po10
-rw-r--r--finnish/po/countries.fi.po6
-rw-r--r--finnish/po/distrib.fi.po102
-rw-r--r--finnish/po/doc.fi.po199
-rw-r--r--finnish/po/l10n.fi.po6
-rw-r--r--finnish/po/mailinglists.fi.po6
-rw-r--r--finnish/po/newsevents.fi.po34
-rw-r--r--finnish/po/organization.fi.po263
-rw-r--r--finnish/po/others.fi.po245
-rw-r--r--finnish/po/ports.fi.po180
-rw-r--r--finnish/po/stats.fi.po108
-rw-r--r--finnish/po/templates.fi.po789
-rw-r--r--finnish/po/vendors.fi.po147
-rw-r--r--finnish/po/vote.fi.po134
-rw-r--r--french/po/cdimage.fr.po11
-rw-r--r--french/po/distrib.fr.po62
-rw-r--r--french/po/doc.fr.po127
-rw-r--r--french/po/mailinglists.fr.po8
-rw-r--r--french/po/newsevents.fr.po53
-rw-r--r--french/po/organization.fr.po150
-rw-r--r--french/po/others.fr.po35
-rw-r--r--french/po/ports.fr.po38
-rw-r--r--french/po/stats.fr.po108
-rw-r--r--french/po/templates.fr.po122
-rw-r--r--french/po/vendors.fr.po91
-rw-r--r--french/po/vote.fr.po134
-rw-r--r--galician/po/cdimage.gl.po11
-rw-r--r--galician/po/consultants.gl.po1
-rw-r--r--galician/po/distrib.gl.po38
-rw-r--r--galician/po/doc.gl.po349
-rw-r--r--galician/po/newsevents.gl.po112
-rw-r--r--galician/po/organization.gl.po153
-rw-r--r--galician/po/others.gl.po186
-rw-r--r--galician/po/stats.gl.po108
-rw-r--r--galician/po/templates.gl.po100
-rw-r--r--galician/po/vendors.gl.po91
-rw-r--r--galician/po/vote.gl.po134
-rw-r--r--german/po/cdimage.de.po8
-rw-r--r--german/po/doc.de.po20
-rw-r--r--german/po/mailinglists.de.po6
-rw-r--r--german/po/organization.de.po173
-rw-r--r--german/po/others.de.po16
-rw-r--r--german/po/ports.de.po38
-rw-r--r--german/po/stats.de.po116
-rw-r--r--german/po/templates.de.po24
-rw-r--r--german/po/vendors.de.po109
-rw-r--r--greek/po/bugs.el.po190
-rw-r--r--greek/po/cdimage.el.po10
-rw-r--r--greek/po/distrib.el.po78
-rw-r--r--greek/po/doc.el.po193
-rw-r--r--greek/po/l10n.el.po6
-rw-r--r--greek/po/mailinglists.el.po6
-rw-r--r--greek/po/newsevents.el.po35
-rw-r--r--greek/po/organization.el.po235
-rw-r--r--greek/po/others.el.po197
-rw-r--r--greek/po/ports.el.po80
-rw-r--r--greek/po/templates.el.po676
-rw-r--r--greek/po/vendors.el.po145
-rw-r--r--greek/po/vote.el.po128
-rw-r--r--hebrew/po/cdimage.he.po10
-rw-r--r--hebrew/po/distrib.he.po36
-rw-r--r--hebrew/po/doc.he.po172
-rw-r--r--hebrew/po/newsevents.he.po16
-rw-r--r--hebrew/po/organization.he.po166
-rw-r--r--hebrew/po/others.he.po215
-rw-r--r--hebrew/po/ports.he.po38
-rw-r--r--hebrew/po/templates.he.po114
-rw-r--r--hebrew/po/vendors.he.po62
-rw-r--r--hebrew/po/vote.he.po128
-rw-r--r--hungarian/po/cdimage.hu.po10
-rw-r--r--hungarian/po/countries.hu.po6
-rw-r--r--hungarian/po/distrib.hu.po104
-rw-r--r--hungarian/po/doc.hu.po181
-rw-r--r--hungarian/po/mailinglists.hu.po6
-rw-r--r--hungarian/po/newsevents.hu.po33
-rw-r--r--hungarian/po/organization.hu.po241
-rw-r--r--hungarian/po/others.hu.po103
-rw-r--r--hungarian/po/ports.hu.po38
-rw-r--r--hungarian/po/templates.hu.po400
-rw-r--r--hungarian/po/vendors.hu.po145
-rw-r--r--hungarian/po/vote.hu.po128
-rw-r--r--indonesian/po/cdimage.id.po10
-rw-r--r--indonesian/po/distrib.id.po102
-rw-r--r--indonesian/po/doc.id.po200
-rw-r--r--indonesian/po/mailinglists.id.po6
-rw-r--r--indonesian/po/newsevents.id.po26
-rw-r--r--indonesian/po/organization.id.po217
-rw-r--r--indonesian/po/others.id.po59
-rw-r--r--indonesian/po/templates.id.po438
-rw-r--r--indonesian/po/vendors.id.po62
-rw-r--r--indonesian/po/vote.id.po128
-rw-r--r--italian/po/bugs.it.po198
-rw-r--r--italian/po/cdimage.it.po10
-rw-r--r--italian/po/distrib.it.po118
-rw-r--r--italian/po/doc.it.po347
-rw-r--r--italian/po/l10n.it.po6
-rw-r--r--italian/po/newsevents.it.po402
-rw-r--r--italian/po/organization.it.po243
-rw-r--r--italian/po/others.it.po169
-rw-r--r--italian/po/stats.it.po168
-rw-r--r--italian/po/templates.it.po18
-rw-r--r--italian/po/vendors.it.po103
-rw-r--r--italian/po/vote.it.po2
-rw-r--r--japanese/po/bugs.ja.po192
-rw-r--r--japanese/po/cdimage.ja.po11
-rw-r--r--japanese/po/distrib.ja.po102
-rw-r--r--japanese/po/doc.ja.po333
-rw-r--r--japanese/po/mailinglists.ja.po6
-rw-r--r--japanese/po/newsevents.ja.po45
-rw-r--r--japanese/po/organization.ja.po130
-rw-r--r--japanese/po/others.ja.po35
-rw-r--r--japanese/po/ports.ja.po180
-rw-r--r--japanese/po/stats.ja.po108
-rw-r--r--japanese/po/templates.ja.po80
-rw-r--r--japanese/po/vendors.ja.po147
-rw-r--r--japanese/po/vote.ja.po134
-rw-r--r--korean/po/bugs.ko.po16
-rw-r--r--korean/po/cdimage.ko.po10
-rw-r--r--korean/po/countries.ko.po6
-rw-r--r--korean/po/distrib.ko.po52
-rw-r--r--korean/po/doc.ko.po172
-rw-r--r--korean/po/l10n.ko.po6
-rw-r--r--korean/po/mailinglists.ko.po6
-rw-r--r--korean/po/newsevents.ko.po34
-rw-r--r--korean/po/organization.ko.po177
-rw-r--r--korean/po/others.ko.po70
-rw-r--r--korean/po/ports.ko.po8
-rw-r--r--korean/po/vendors.ko.po107
-rw-r--r--korean/po/vote.ko.po128
-rw-r--r--lithuanian/po/bugs.lt.po190
-rw-r--r--lithuanian/po/cdimage.lt.po10
-rw-r--r--lithuanian/po/distrib.lt.po82
-rw-r--r--lithuanian/po/doc.lt.po181
-rw-r--r--lithuanian/po/mailinglists.lt.po6
-rw-r--r--lithuanian/po/newsevents.lt.po36
-rw-r--r--lithuanian/po/organization.lt.po237
-rw-r--r--lithuanian/po/others.lt.po63
-rw-r--r--lithuanian/po/ports.lt.po170
-rw-r--r--lithuanian/po/templates.lt.po600
-rw-r--r--lithuanian/po/vendors.lt.po147
-rw-r--r--lithuanian/po/vote.lt.po134
-rw-r--r--norwegian/po/bugs.nb.po182
-rw-r--r--norwegian/po/cdimage.nb.po10
-rw-r--r--norwegian/po/countries.nb.po6
-rw-r--r--norwegian/po/distrib.nb.po64
-rw-r--r--norwegian/po/doc.nb.po181
-rw-r--r--norwegian/po/mailinglists.nb.po6
-rw-r--r--norwegian/po/newsevents.nb.po31
-rw-r--r--norwegian/po/organization.nb.po254
-rw-r--r--norwegian/po/others.nb.po210
-rw-r--r--norwegian/po/ports.nb.po38
-rw-r--r--norwegian/po/stats.nb.po108
-rw-r--r--norwegian/po/templates.nb.po679
-rw-r--r--norwegian/po/vendors.nb.po149
-rw-r--r--norwegian/po/vote.nb.po128
-rw-r--r--persian/po/bugs.fa.po198
-rw-r--r--persian/po/cdimage.fa.po24
-rw-r--r--persian/po/consultants.fa.po9
-rw-r--r--persian/po/distrib.fa.po70
-rw-r--r--persian/po/doc.fa.po232
-rw-r--r--persian/po/mailinglists.fa.po6
-rw-r--r--persian/po/newsevents.fa.po16
-rw-r--r--persian/po/organization.fa.po153
-rw-r--r--persian/po/others.fa.po215
-rw-r--r--persian/po/ports.fa.po38
-rw-r--r--persian/po/templates.fa.po122
-rw-r--r--persian/po/vendors.fa.po91
-rw-r--r--persian/po/vote.fa.po134
-rw-r--r--polish/po/cdimage.pl.po10
-rw-r--r--polish/po/distrib.pl.po38
-rw-r--r--polish/po/doc.pl.po338
-rw-r--r--polish/po/newsevents.pl.po38
-rw-r--r--polish/po/organization.pl.po154
-rw-r--r--polish/po/others.pl.po35
-rw-r--r--polish/po/stats.pl.po108
-rw-r--r--polish/po/templates.pl.po84
-rw-r--r--polish/po/vendors.pl.po91
-rw-r--r--polish/po/vote.pl.po134
-rw-r--r--portuguese/po/bugs.pt.po198
-rw-r--r--portuguese/po/cdimage.pt.po8
-rw-r--r--portuguese/po/distrib.pt.po67
-rw-r--r--portuguese/po/doc.pt.po121
-rw-r--r--portuguese/po/l10n.pt.po6
-rw-r--r--portuguese/po/legal.pt.po3
-rw-r--r--portuguese/po/mailinglists.pt.po6
-rw-r--r--portuguese/po/organization.pt.po263
-rw-r--r--portuguese/po/others.pt.po211
-rw-r--r--portuguese/po/ports.pt.po182
-rw-r--r--portuguese/po/security.pt.po3
-rw-r--r--portuguese/po/stats.pt.po108
-rw-r--r--portuguese/po/templates.pt.po799
-rw-r--r--portuguese/po/vendors.pt.po160
-rw-r--r--portuguese/po/vote.pt.po3
-rw-r--r--romanian/po/bugs.ro.po177
-rw-r--r--romanian/po/cdimage.ro.po49
-rw-r--r--romanian/po/consultants.ro.po5
-rw-r--r--romanian/po/countries.ro.po9
-rw-r--r--romanian/po/date.ro.po4
-rw-r--r--romanian/po/distrib.ro.po42
-rw-r--r--romanian/po/doc.ro.po335
-rw-r--r--romanian/po/l10n.ro.po6
-rw-r--r--romanian/po/mailinglists.ro.po10
-rw-r--r--romanian/po/newsevents.ro.po35
-rw-r--r--romanian/po/organization.ro.po190
-rw-r--r--romanian/po/others.ro.po272
-rw-r--r--romanian/po/ports.ro.po56
-rw-r--r--romanian/po/templates.ro.po622
-rw-r--r--romanian/po/vendors.ro.po147
-rw-r--r--romanian/po/vote.ro.po128
-rw-r--r--russian/po/cdimage.ru.po10
-rw-r--r--russian/po/distrib.ru.po24
-rw-r--r--russian/po/doc.ru.po254
-rw-r--r--russian/po/mailinglists.ru.po6
-rw-r--r--russian/po/organization.ru.po193
-rw-r--r--russian/po/others.ru.po34
-rw-r--r--russian/po/ports.ru.po38
-rw-r--r--russian/po/stats.ru.po164
-rw-r--r--russian/po/templates.ru.po24
-rw-r--r--russian/po/vendors.ru.po101
-rw-r--r--slovak/po/bugs.sk.po184
-rw-r--r--slovak/po/cdimage.sk.po10
-rw-r--r--slovak/po/countries.sk.po1364
-rw-r--r--slovak/po/distrib.sk.po62
-rw-r--r--slovak/po/doc.sk.po181
-rw-r--r--slovak/po/mailinglists.sk.po6
-rw-r--r--slovak/po/newsevents.sk.po35
-rw-r--r--slovak/po/organization.sk.po227
-rw-r--r--slovak/po/others.sk.po55
-rw-r--r--slovak/po/ports.sk.po38
-rw-r--r--slovak/po/stats.sk.po108
-rw-r--r--slovak/po/templates.sk.po608
-rw-r--r--slovak/po/vendors.sk.po91
-rw-r--r--slovak/po/vote.sk.po134
-rw-r--r--slovene/po/bugs.sl.po104
-rw-r--r--slovene/po/cdimage.sl.po10
-rw-r--r--slovene/po/countries.sl.po6
-rw-r--r--slovene/po/distrib.sl.po36
-rw-r--r--slovene/po/doc.sl.po190
-rw-r--r--slovene/po/l10n.sl.po6
-rw-r--r--slovene/po/newsevents.sl.po26
-rw-r--r--slovene/po/organization.sl.po190
-rw-r--r--slovene/po/others.sl.po78
-rw-r--r--slovene/po/templates.sl.po586
-rw-r--r--slovene/po/vendors.sl.po62
-rw-r--r--slovene/po/vote.sl.po128
-rw-r--r--spanish/po/bugs.es.po198
-rw-r--r--spanish/po/cdimage.es.po8
-rw-r--r--spanish/po/countries.es.po6
-rw-r--r--spanish/po/distrib.es.po66
-rw-r--r--spanish/po/doc.es.po127
-rw-r--r--spanish/po/organization.es.po285
-rw-r--r--spanish/po/others.es.po288
-rw-r--r--spanish/po/stats.es.po108
-rw-r--r--spanish/po/templates.es.po900
-rw-r--r--spanish/po/vendors.es.po103
-rw-r--r--spanish/po/vote.es.po2
-rw-r--r--swedish/po/bugs.sv.po198
-rw-r--r--swedish/po/cdimage.sv.po24
-rw-r--r--swedish/po/consultants.sv.po9
-rw-r--r--swedish/po/distrib.sv.po62
-rw-r--r--swedish/po/doc.sv.po287
-rw-r--r--swedish/po/mailinglists.sv.po6
-rw-r--r--swedish/po/newsevents.sv.po327
-rw-r--r--swedish/po/organization.sv.po176
-rw-r--r--swedish/po/others.sv.po62
-rw-r--r--swedish/po/ports.sv.po40
-rw-r--r--swedish/po/stats.sv.po108
-rw-r--r--swedish/po/templates.sv.po161
-rw-r--r--swedish/po/vendors.sv.po147
-rw-r--r--swedish/po/vote.sv.po134
-rw-r--r--tamil/po/bugs.ta.po198
-rw-r--r--tamil/po/cdimage.ta.po10
-rw-r--r--tamil/po/distrib.ta.po42
-rw-r--r--tamil/po/doc.ta.po189
-rw-r--r--tamil/po/mailinglists.ta.po6
-rw-r--r--tamil/po/newsevents.ta.po34
-rw-r--r--tamil/po/organization.ta.po239
-rwxr-xr-xtamil/po/others.ta.po219
-rwxr-xr-xtamil/po/ports.ta.po38
-rw-r--r--tamil/po/templates.ta.po881
-rw-r--r--tamil/po/vendors.ta.po91
-rw-r--r--tamil/po/vote.ta.po134
-rw-r--r--turkish/po/cdimage.tr.po10
-rw-r--r--turkish/po/distrib.tr.po38
-rw-r--r--turkish/po/doc.tr.po193
-rw-r--r--turkish/po/newsevents.tr.po35
-rw-r--r--turkish/po/organization.tr.po221
-rw-r--r--turkish/po/others.tr.po250
-rw-r--r--turkish/po/ports.tr.po170
-rw-r--r--turkish/po/templates.tr.po795
-rw-r--r--turkish/po/vendors.tr.po141
-rw-r--r--turkish/po/vote.tr.po128
-rw-r--r--ukrainian/po/bugs.uk.po190
-rw-r--r--ukrainian/po/cdimage.uk.po10
-rw-r--r--ukrainian/po/distrib.uk.po82
-rw-r--r--ukrainian/po/doc.uk.po172
-rw-r--r--ukrainian/po/l10n.uk.po6
-rw-r--r--ukrainian/po/newsevents.uk.po34
-rw-r--r--ukrainian/po/organization.uk.po209
-rw-r--r--ukrainian/po/others.uk.po40
-rw-r--r--ukrainian/po/ports.uk.po38
-rw-r--r--ukrainian/po/templates.uk.po702
-rw-r--r--ukrainian/po/vendors.uk.po145
-rw-r--r--ukrainian/po/vote.uk.po128
-rw-r--r--vietnamese/po/cdimage.vi.po8
-rw-r--r--vietnamese/po/consultants.vi.po39
-rw-r--r--vietnamese/po/distrib.vi.po141
-rw-r--r--vietnamese/po/doc.vi.po398
-rw-r--r--vietnamese/po/mailinglists.vi.po6
-rw-r--r--vietnamese/po/newsevents.vi.po354
-rw-r--r--vietnamese/po/organization.vi.po153
-rw-r--r--vietnamese/po/others.vi.po182
-rw-r--r--vietnamese/po/ports.vi.po92
-rw-r--r--vietnamese/po/security.vi.po74
-rw-r--r--vietnamese/po/stats.vi.po221
-rw-r--r--vietnamese/po/vendors.vi.po106
-rw-r--r--vietnamese/po/vote.vi.po129
-rw-r--r--vietnamese/po/wnpp.vi.po68
436 files changed, 30941 insertions, 27030 deletions
diff --git a/arabic/po/cdimage.ar.po b/arabic/po/cdimage.ar.po
index 10b76ef4626..d60aed4faba 100644
--- a/arabic/po/cdimage.ar.po
+++ b/arabic/po/cdimage.ar.po
@@ -13,18 +13,16 @@ msgstr ""
"X-Generator: Virtaal 0.7.1\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 " مفتاح بصمة الأصبع"
-#: ../../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/arabic/po/distrib.ar.po b/arabic/po/distrib.ar.po
index 19276affbcb..7cf4ea858b1 100644
--- a/arabic/po/distrib.ar.po
+++ b/arabic/po/distrib.ar.po
@@ -136,61 +136,69 @@ msgid "ARM"
msgstr ""
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
-msgid "HP PA-RISC"
+msgid "Hard Float ABI ARM"
msgstr ""
#: ../../english/releases/arches.data:14
-msgid "Hurd 32-bit PC (i386)"
+msgid "HP PA-RISC"
msgstr ""
#: ../../english/releases/arches.data:15
-msgid "32-bit PC (i386)"
+msgid "Hurd 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:16
-msgid "Intel Itanium IA-64"
+msgid "32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:17
-msgid "kFreeBSD 32-bit PC (i386)"
+msgid "Intel Itanium IA-64"
msgstr ""
#: ../../english/releases/arches.data:18
-msgid "kFreeBSD 64-bit PC (amd64)"
+msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:19
-msgid "Motorola 680x0"
+msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
#: ../../english/releases/arches.data:20
-msgid "MIPS (big endian)"
+msgid "Motorola 680x0"
msgstr ""
#: ../../english/releases/arches.data:21
-msgid "MIPS (little endian)"
+msgid "MIPS (big endian)"
msgstr ""
#: ../../english/releases/arches.data:22
-msgid "PowerPC"
+msgid "MIPS (little endian)"
msgstr ""
#: ../../english/releases/arches.data:23
-msgid "IBM S/390"
+msgid "PowerPC"
msgstr ""
#: ../../english/releases/arches.data:24
-msgid "IBM System z"
+msgid "POWER Processors"
msgstr ""
#: ../../english/releases/arches.data:25
+msgid "IBM S/390"
+msgstr ""
+
+#: ../../english/releases/arches.data:26
+msgid "IBM System z"
+msgstr ""
+
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr ""
diff --git a/arabic/po/doc.ar.po b/arabic/po/doc.ar.po
index 6ec6d1a7492..5616a848832 100644
--- a/arabic/po/doc.ar.po
+++ b/arabic/po/doc.ar.po
@@ -13,7 +13,24 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Virtaal 0.7.1\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"
@@ -28,7 +45,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"
@@ -37,15 +54,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"
@@ -54,13 +71,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"
@@ -75,7 +92,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 -- "
@@ -85,11 +102,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, "
@@ -109,7 +126,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"
@@ -117,11 +134,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"
@@ -129,11 +146,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"
@@ -145,24 +162,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 "
@@ -171,13 +191,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"
@@ -193,24 +213,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"
@@ -221,11 +241,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"
@@ -235,11 +255,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 "
@@ -250,11 +270,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"
@@ -264,11 +284,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"
@@ -276,7 +296,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 "
@@ -292,7 +312,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 "
@@ -322,49 +342,73 @@ msgstr "متضمّن قرص مدمج:"
msgid "Publisher:"
msgstr "الناشر:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "المؤلفون:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "المحررين:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "المشرف:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "الحالة:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "التوفر:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "أحدث نسخة:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr ""
-#: ../../english/doc/manuals.defs:133 ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr "نص صِرف"
-#. 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 ""
-"استخدم <a href=\"cvs\">CVS</a> لتنزيل مصدر نص الـ SGML لـ <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"
@@ -374,22 +418,29 @@ msgstr ""
" القيمة <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" ومراجعة وحدة <kbd>أقراص الإقلاع المرنة/التوثيق</kbd>."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "CVS عبر الوِب"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "حزمة دبيان"
-#: ../../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 ""
-#: ../../english/releases/arches.data:32
+#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
msgid "PDF"
msgstr "PDF"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "استخدم <a href=\"cvs\">CVS</a> لتنزيل مصدر نص الـ SGML لـ <get-var "
+#~ "ddp_pkg_loc />."
diff --git a/arabic/po/newsevents.ar.po b/arabic/po/newsevents.ar.po
index 759191e32dd..3cfa6f89915 100644
--- a/arabic/po/newsevents.ar.po
+++ b/arabic/po/newsevents.ar.po
@@ -30,27 +30,27 @@ msgstr ""
msgid "The newsletter for the Debian community"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr "الاسم:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "البريد الإلكتروني:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "المحادثات السابقة:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "اللغات:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "الموقع:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "المواضيع:"
@@ -338,9 +338,14 @@ msgid ""
msgstr ""
#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+#| 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>."
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 ""
"لاستلام هذه الرسال الإخبارية الأسبوعية، <a href=\"https://lists.debian.org/"
"debian-news/\">سجّل في القائمة البريدية debian-news </a>."
diff --git a/arabic/po/organization.ar.po b/arabic/po/organization.ar.po
index 49344b34dc2..e49341e2544 100644
--- a/arabic/po/organization.ar.po
+++ b/arabic/po/organization.ar.po
@@ -80,7 +80,7 @@ msgid "Officers"
msgstr "أعضاء"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "توزيعة"
@@ -90,11 +90,11 @@ msgid "Publicity"
msgstr "الدعاية والإعلان"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "دعم فني وبنية تحتية"
-#. 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 ""
@@ -107,99 +107,99 @@ msgstr "قائد"
msgid "Technical Committee"
msgstr "اللجنة التقنية"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "أمين عام"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "مشاريع التطوير"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "أرشيف FTP "
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "مساعد FTP"
-#: ../../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 "حزم منفردة"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "إدارة الإصدارات"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "ضمان الجودة"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "فريق نظام التثبيت"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "ملاحظات الإصدارة"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "ملفات قرص مدمج"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "الإنتاج"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "اختبار"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "التوثيق"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "قائمة الحزم التي هي بحاجة إلى مزيد من العمل والمتوقعة"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr ""
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "تحويلات"
@@ -227,79 +227,71 @@ msgstr "جهة الإتصال الصحفي"
msgid "Partner Program"
msgstr "برامج الشراكة"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "أحداث"
-#: ../../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 "دعم المستخدم"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "نظام تتبع العلاّت"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "مدراء حسابات دبيان"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "مشرفو مفاتيح التشفير PGP و GPG"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "الفريق الأمني"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "مشروع التدقيق الأمني"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "صفحات الإنترنت"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "صفحة المستشارين"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "صفحة موزعي الأقراص المدمجة"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "سياسة"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "إدارة النظام"
-#: ../../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."
@@ -308,7 +300,7 @@ msgstr ""
"دبيان، وهذا يشمل المشاكل مع الدخول وكلمة السر، والحصول على حزمة معينة "
"للتثبيت."
-#: ../../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 "
@@ -318,74 +310,78 @@ msgstr ""
"db.debian.org/machines.cgi\">أجهزة دبيان</a> للحصول على معلومات الإتصال "
"الخاصة بالمدير المسؤول عن الجهاز."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "مدير دليل LDAP لمعلومات المطورين"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "المرايا"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "مشرف ال DNS"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "نظام تتبع الحزم"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "تنسيق التبرعات بالعتاد والأجهزة"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "مدراء اولاين"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr ""
-#: ../../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 "ديبيان للأطفال من سنة الى 99 سنوات"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "دبيان للأغراض الطبية والبحث الطبي"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "دبيان للتعليم"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "دبيان في المكاتب القانونية"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "دبيان لدوي الاحتياجات الخاصة"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr ""
+
+#~ msgid "Security Audit Project"
+#~ msgstr "مشروع التدقيق الأمني"
diff --git a/arabic/po/others.ar.po b/arabic/po/others.ar.po
index 1c944cc8514..757cbcd503e 100644
--- a/arabic/po/others.ar.po
+++ b/arabic/po/others.ar.po
@@ -108,8 +108,8 @@ msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
"(only available in French) for more information."
msgstr ""
-"انظر <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
-"(متوفرة بالفرنسية فقط) للمزيد من المعلومات."
+"انظر <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</"
+"a> (متوفرة بالفرنسية فقط) للمزيد من المعلومات."
#: ../../english/devel/website/tc.data:12
#: ../../english/devel/website/tc.data:14
@@ -170,26 +170,6 @@ msgstr "[دبيان] (زر مصغّر)"
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "مطلوب:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "من:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "الهندسة:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "المواصفات:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "أين:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "المنتجات"
@@ -234,22 +214,34 @@ msgstr "شارات"
msgid "basketball goals"
msgstr "شباك مرمى كرة سلة"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "أقراط آذان"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "حقائب"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
msgstr ""
+#: ../../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 ""
@@ -324,3 +316,18 @@ msgstr "الإصدار"
#: ../../english/y2k/l10n.data:36
msgid "URL"
msgstr "المسار"
+
+#~ msgid "Where:"
+#~ msgstr "أين:"
+
+#~ msgid "Specifications:"
+#~ msgstr "المواصفات:"
+
+#~ msgid "Architecture:"
+#~ msgstr "الهندسة:"
+
+#~ msgid "Who:"
+#~ msgstr "من:"
+
+#~ msgid "Wanted:"
+#~ msgstr "مطلوب:"
diff --git a/arabic/po/ports.ar.po b/arabic/po/ports.ar.po
index 3284047ccc1..b6505ea9908 100644
--- a/arabic/po/ports.ar.po
+++ b/arabic/po/ports.ar.po
@@ -122,68 +122,65 @@ msgstr "دبيان لأنظمة PowerPC"
msgid "Debian for Sparc"
msgstr "دبيان لأنظمة Sparc"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "دبيان لأنظمة Sparc64"
+#~ msgid "Debian for Laptops"
+#~ msgstr "دبيان للحواسيب المحمولة"
-#~ msgid "Debian for S/390"
-#~ msgstr "دبيان لأنظمة S/390"
+#~ msgid "Debian for AMD64"
+#~ msgstr "دبيان لأنظمة AMD64"
-#~ msgid "Debian for MIPS"
-#~ msgstr "ديبيان لأنظمة MIPS"
+#~ msgid "Debian for ARM"
+#~ msgstr "دبيان لأنظمة ARM"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "دبيان لأنظمة Beowulf"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgid "Main"
+#~ msgstr "رئيسي"
-#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgstr ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "دبيان غنو/FreeBSD"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "دبيان لأنظمة موتورولا 680x0"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 L2 cache on die"
+#~ msgid "Vendor/Name"
+#~ msgstr "البائع/الاسم"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, 64-bit external bus, external L2 cache"
+#~ msgid "Date announced"
+#~ msgstr "تاريخ الإعلان"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, 64-bit external bus"
+#~ msgid "Clock"
+#~ msgstr "ساعة"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, 32-bit external bus"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgid "Specials"
+#~ msgstr "الأشياء الخاصة"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "No FPU (R2010), external caches"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "No FPU (R3010)"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Virtual indexed L1 cache, L2 cache controller"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgid "External L1 cache"
+#~ msgstr "External L1 cache"
+
+#~ msgid "Multiple chip CPU"
+#~ msgstr "وحدة معالجة مركزية (CPU) متعددة الرقاقات"
#~ msgid ""
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
@@ -192,62 +189,65 @@ msgstr "دبيان لأنظمة Sparc"
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
#~ "I2C, Watchdog"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "وحدة معالجة مركزية (CPU) متعددة الرقاقات"
-
-#~ msgid "External L1 cache"
-#~ msgstr "External L1 cache"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Virtual indexed L1 cache, L2 cache controller"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "No FPU (R3010)"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "No FPU (R2010), external caches"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgid "Specials"
-#~ msgstr "الأشياء الخاصة"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, 32-bit external bus"
-#~ msgid "Clock"
-#~ msgstr "ساعة"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, 64-bit external bus"
-#~ msgid "Date announced"
-#~ msgstr "تاريخ الإعلان"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, 64-bit external bus, external L2 cache"
-#~ msgid "Vendor/Name"
-#~ msgstr "البائع/الاسم"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 L2 cache on die"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "دبيان لأنظمة موتورولا 680x0"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "دبيان غنو/FreeBSD"
+#~ msgid ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgstr ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgid "Main"
-#~ msgstr "رئيسي"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "دبيان لأنظمة Beowulf"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
-#~ msgid "Debian for ARM"
-#~ msgstr "دبيان لأنظمة ARM"
+#~ msgid "Debian for MIPS"
+#~ msgstr "ديبيان لأنظمة MIPS"
-#~ msgid "Debian for AMD64"
-#~ msgstr "دبيان لأنظمة AMD64"
+#~ msgid "Debian for S/390"
+#~ msgstr "دبيان لأنظمة S/390"
-#~ msgid "Debian for Laptops"
-#~ msgstr "دبيان للحواسيب المحمولة"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "دبيان لأنظمة Sparc64"
diff --git a/arabic/po/stats.ar.po b/arabic/po/stats.ar.po
index 24cd34c8e29..369cbd08d26 100644
--- a/arabic/po/stats.ar.po
+++ b/arabic/po/stats.ar.po
@@ -28,208 +28,208 @@ msgstr ""
msgid "There are %d strings to translate."
msgstr ""
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr ""
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr ""
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr ""
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr ""
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr ""
-#: ../../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 ""
-#: ../../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 ""
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr ""
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr ""
-#: ../../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 ""
-#: ../../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 "الملفات"
-#: ../../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 ""
-#: ../../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."
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr ""
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "الملف"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr ""
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "السِجل"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr ""
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr ""
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr ""
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "المترجم"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr ""
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr ""
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr ""
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr ""
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr ""
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr ""
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr ""
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr ""
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr ""
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr ""
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr ""
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr ""
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr ""
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr ""
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr ""
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr ""
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr ""
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr ""
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr ""
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr ""
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr ""
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr ""
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr ""
diff --git a/arabic/po/templates.ar.po b/arabic/po/templates.ar.po
index f435e879ac6..34a89bfa86a 100644
--- a/arabic/po/templates.ar.po
+++ b/arabic/po/templates.ar.po
@@ -65,7 +65,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "العودة إلى <a href=\"m4_HOME/\">الصفحة الرئيسية لمشروع دبيان</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 "الرئيسية"
@@ -106,7 +106,7 @@ msgid "Support"
msgstr "الدعم"
#: ../../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 "ركن المطورين"
@@ -143,7 +143,7 @@ msgid "Miscellaneous"
msgstr "متفرقات"
#: ../../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 "الحصول على دبيان"
@@ -196,7 +196,7 @@ msgstr "في الإصدار 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 "
@@ -209,23 +209,23 @@ msgstr ""
"<a href=\"m4_HOME/contact\">صفحة المراسلة</a>. الشِّفرة المصدرية للموقع <a "
"href=\"m4_HOME/devel/website/using_cvs\">متوفرة</a>."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "آخر تعديل"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "حقوق النسخ"
-#: ../../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> و آخرون؛"
-#: ../../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 "راجع <a href=\"m4_HOME/license\" rel=\"copyright\">بنود الترخيص</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."
@@ -287,138 +287,150 @@ msgid "Debian Books"
msgstr "كُتب دبيان"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Debian"
+msgid "Debian Wiki"
+msgstr "دبيان"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "أرشيف القوائم البريدية"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "القوائم البريدية"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "العقد الاجتماعي"
-#: ../../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 "زيارة راعي الموقع"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr "دبيان 5.0 - نظام التشغيل العالمي"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "خريطة صفحات موقع دبيان"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "قاعدة بيانات المطورين"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr "أسئلة دبيان الشائعة"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "كتيّب سياسة دبيان"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "مرجع المطورين"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "كتيّب المشرفين الجدد"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "العلاّت الحرجة"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "تقارير Lintian"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "أرشيف القوائم البريدية للمستخدمين"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "أرشيف القوائم البريدية للمطورين"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "أرشيف القوائم البريدية الخاصة بالترجمة والتوطين i18n/l10n"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "أرشيف القوائم البريدية للبنى المتعددة ports"
-#: ../../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 "أرشيف القوائم البريدية لنظام تتبّع العلاّت"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "أرشيف القوائم البريدية المتفرقة"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "البرمجيات الحرّة"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "تطوير"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "مساعدة دبيان"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "تقارير العلاّت"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Ports/البُنى"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "كتيّب التثبيت"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "باعة الأقراص المضغوطة"
-#: ../../english/template/debian/links.tags.wml:122
-msgid "CD ISO images"
+#: ../../english/template/debian/links.tags.wml:128
+#, fuzzy
+#| msgid "CD ISO images"
+msgid "CD/USB ISO images"
msgstr "صور ISO للأقراص المضغوطة"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "التثبيت الشّبكي"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr " سابق التثبيت"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "مشروع Debian-Edu"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr "اولاين &ndash; دبيان GForge"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "ضمان الجودة"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "نظام تتبّع الحزم"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "وصف حزم مطوري دبيان"
diff --git a/arabic/po/vendors.ar.po b/arabic/po/vendors.ar.po
index a46cbc54311..79f0a9fca70 100644
--- a/arabic/po/vendors.ar.po
+++ b/arabic/po/vendors.ar.po
@@ -17,92 +17,83 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Virtaal 0.7.1\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "المصنّع:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "مسار صفحة دبيان:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "يسمح التبرّع لدبيان:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "البلد:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "الشحن الدولي:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "البريد الإلكتروني:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "نوع القرص المدمج:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "نوع قرص DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "البُنى:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr ""
#. ###################
#. 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 ""
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "البريد الإلكتروني:"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "ضمن أوروبا"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "إلى بعض المناطق"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "مصدر"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "و"
+
+#~ msgid "Architectures:"
+#~ msgstr "البُنى:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "نوع قرص DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "نوع القرص المدمج:"
+
+#~ msgid "email:"
+#~ msgstr "البريد الإلكتروني:"
+
+#~ msgid "Ship International:"
+#~ msgstr "الشحن الدولي:"
+
+#~ msgid "Country:"
+#~ msgstr "البلد:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "يسمح التبرّع لدبيان:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "مسار صفحة دبيان:"
+
+#~ msgid "Vendor:"
+#~ msgstr "المصنّع:"
diff --git a/arabic/po/vote.ar.po b/arabic/po/vote.ar.po
index a043f84fa7d..f6445503172 100644
--- a/arabic/po/vote.ar.po
+++ b/arabic/po/vote.ar.po
@@ -27,229 +27,251 @@ msgid "Time Line"
msgstr "الوقت الزمني"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "الترشيحات"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "النقاش"
-#: ../../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
msgid "Proposer"
msgstr "مقترح"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "مقترح الإقتراح A"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "مقترح الإقتراح B"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "مقترح الإقتراح C"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "مقترح الإقتراح D"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "مقترح الإقتراح E"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "مقترح الإقتراح F"
-#: ../../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 "ثواني الإقتراح A"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "ثواني الإقتراح B"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "ثواني الإقتراح C"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "ثواني الإقتراح D"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "ثواني الإقتراح E"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "ثواني الإقتراح F"
-#: ../../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 "الاقتراح A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "الاقتراح B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "الاقتراح C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "الاقتراح D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "الاقتراح E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "الاقتراح F"
-#: ../../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
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "مُقترح التعديل أ"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "التعديلات أ"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+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
msgid "Minimum Discussion"
msgstr "الحدّ الأدنى للمناقشة"
-#: ../../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 "انتظار&nbsp;الرّعاة"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "قيد&nbsp;المناقشة"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "التصويت&nbsp;مفتوح"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "مُقرّر"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "مسحوب"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "أخرى"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "صفحة&nbsp;التصويت&nbsp;الرئيسيّة"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "طريقة&nbsp;عمل"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "إرسال&nbsp;اقتراح"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "إصلاح&nbsp;اقتراح"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "متابعة&nbsp;اقتراح"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "قراءة&nbsp;نتيجة"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "تصويت"
diff --git a/armenian/po/cdimage.hy.po b/armenian/po/cdimage.hy.po
index bcf2273178c..a0e4e20a9f4 100644
--- a/armenian/po/cdimage.hy.po
+++ b/armenian/po/cdimage.hy.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 " Key fingerprint"
-#: ../../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/armenian/po/distrib.hy.po b/armenian/po/distrib.hy.po
index e6bb9e3388a..5d6ef9516c2 100644
--- a/armenian/po/distrib.hy.po
+++ b/armenian/po/distrib.hy.po
@@ -130,73 +130,81 @@ msgid "ARM"
msgstr ""
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
-msgid "HP PA-RISC"
+msgid "Hard Float ABI ARM"
msgstr ""
#: ../../english/releases/arches.data:14
-msgid "Hurd 32-bit PC (i386)"
+msgid "HP PA-RISC"
msgstr ""
#: ../../english/releases/arches.data:15
-msgid "32-bit PC (i386)"
+msgid "Hurd 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:16
-msgid "Intel Itanium IA-64"
+msgid "32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:17
-msgid "kFreeBSD 32-bit PC (i386)"
+msgid "Intel Itanium IA-64"
msgstr ""
#: ../../english/releases/arches.data:18
-msgid "kFreeBSD 64-bit PC (amd64)"
+msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:19
-msgid "Motorola 680x0"
+msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
#: ../../english/releases/arches.data:20
-msgid "MIPS (big endian)"
+msgid "Motorola 680x0"
msgstr ""
#: ../../english/releases/arches.data:21
-msgid "MIPS (little endian)"
+msgid "MIPS (big endian)"
msgstr ""
#: ../../english/releases/arches.data:22
-msgid "PowerPC"
+msgid "MIPS (little endian)"
msgstr ""
#: ../../english/releases/arches.data:23
-msgid "IBM S/390"
+msgid "PowerPC"
msgstr ""
#: ../../english/releases/arches.data:24
-msgid "IBM System z"
+msgid "POWER Processors"
msgstr ""
#: ../../english/releases/arches.data:25
-msgid "SPARC"
+msgid "IBM S/390"
msgstr ""
-#~ msgid "all files in this package"
-#~ msgstr "այս փաթեթի բոլոր ֆայլերը"
+#: ../../english/releases/arches.data:26
+msgid "IBM System z"
+msgstr ""
-#~ msgid "no"
-#~ msgstr "ոչ"
+#: ../../english/releases/arches.data:27
+msgid "SPARC"
+msgstr ""
+
+#~ msgid "non-US"
+#~ msgstr "ոչ-US"
#~ msgid "yes"
#~ msgstr "այո"
-#~ msgid "non-US"
-#~ msgstr "ոչ-US"
+#~ msgid "no"
+#~ msgstr "ոչ"
+
+#~ msgid "all files in this package"
+#~ msgstr "այս փաթեթի բոլոր ֆայլերը"
diff --git a/armenian/po/doc.hy.po b/armenian/po/doc.hy.po
index 4cb7723abd2..90d9e0ab2ac 100644
--- a/armenian/po/doc.hy.po
+++ b/armenian/po/doc.hy.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,70 +338,96 @@ msgstr "Իր հետ ունի(CD)՝"
msgid "Publisher:"
msgstr "Հրատարակող՝"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Հեղինակներ՝"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr ""
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr ""
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr ""
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr ""
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "Վերջին տարբերակը՝"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr ""
-#: ../../english/doc/manuals.defs:133 ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr ""
-#. 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 ""
+"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 ""
+
+#: ../../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 ""
-"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://packages.debian.org/git\">Git</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:158
+#: ../../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"
" and check out the <kbd>boot-floppies/documentation</kbd> module."
msgstr ""
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr ""
-#: ../../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 ""
-#: ../../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 ""
diff --git a/armenian/po/newsevents.hy.po b/armenian/po/newsevents.hy.po
index eb9d8ff44d7..b236a8bb8f5 100644
--- a/armenian/po/newsevents.hy.po
+++ b/armenian/po/newsevents.hy.po
@@ -25,27 +25,27 @@ msgstr ""
msgid "The newsletter for the Debian community"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr ""
@@ -332,8 +332,8 @@ msgstr ""
#: ../../english/template/debian/projectnews/footer.wml:6
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 ""
#: ../../english/template/debian/projectnews/footer.wml:10
diff --git a/armenian/po/organization.hy.po b/armenian/po/organization.hy.po
index 04a8f3a3791..a953acdfd5b 100644
--- a/armenian/po/organization.hy.po
+++ b/armenian/po/organization.hy.po
@@ -71,7 +71,7 @@ msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr ""
@@ -81,11 +81,11 @@ msgid "Publicity"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr ""
-#. 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 ""
msgid "Technical Committee"
msgstr ""
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr ""
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr ""
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr ""
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr ""
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr ""
@@ -218,159 +218,152 @@ msgstr ""
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr ""
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr ""
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr ""
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr ""
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr ""
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr ""
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr ""
-#: ../../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."
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr ""
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr ""
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr ""
diff --git a/armenian/po/others.hy.po b/armenian/po/others.hy.po
index b927722334d..b634aae43ec 100644
--- a/armenian/po/others.hy.po
+++ b/armenian/po/others.hy.po
@@ -156,26 +156,6 @@ msgstr ""
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr ""
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr ""
@@ -220,22 +200,34 @@ msgstr ""
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr ""
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
msgstr ""
+#: ../../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 ""
diff --git a/armenian/po/templates.hy.po b/armenian/po/templates.hy.po
index 87f63bc9ddc..5451bebd917 100644
--- a/armenian/po/templates.hy.po
+++ b/armenian/po/templates.hy.po
@@ -54,7 +54,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr ""
#: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:152
msgid "Home"
msgstr ""
@@ -95,7 +95,7 @@ msgid "Support"
msgstr ""
#: ../../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 ""
@@ -132,7 +132,7 @@ msgid "Miscellaneous"
msgstr ""
#: ../../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 ""
@@ -183,7 +183,7 @@ msgstr ""
#. 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 "
@@ -192,23 +192,23 @@ msgid ""
"\">available</a>."
msgstr ""
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr ""
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr ""
-#: ../../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 ""
-#: ../../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 ""
-#: ../../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."
@@ -268,138 +268,146 @@ msgid "Debian Books"
msgstr ""
#: ../../english/template/debian/links.tags.wml:37
-msgid "Mailing List Archives"
+msgid "Debian Wiki"
msgstr ""
#: ../../english/template/debian/links.tags.wml:40
+msgid "Mailing List Archives"
+msgstr ""
+
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr ""
-#: ../../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 ""
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr ""
-#: ../../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 ""
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr ""
diff --git a/armenian/po/vendors.hy.po b/armenian/po/vendors.hy.po
index 022e5a2238a..324cff15055 100644
--- a/armenian/po/vendors.hy.po
+++ b/armenian/po/vendors.hy.po
@@ -9,100 +9,88 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Մատակարարող՝"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "Debian-ի հասցեն՝"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Երկիր՝"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Առաքում այլ երկրներ՝"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "էլ-փոստ՝"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "CD տիպը՝"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "DVD տիպը՝"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Համակառույցները՝"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
#, fuzzy
msgid "Vendor"
msgstr "Մատակարարող՝"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
#, fuzzy
msgid "Architectures"
msgstr "Համակառույցները՝"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
#, fuzzy
msgid "Ship International"
msgstr "Առաքում այլ երկրներ՝"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr ""
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:54
+#: ../../english/CD/vendors/vendors.CD.def:44
#, fuzzy
msgid "Vendor Home"
msgstr "Մատակարարող՝"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
#, fuzzy
msgid "email"
msgstr "էլ-փոստ՝"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr ""
#~ msgid "Vendor Release"
#~ msgstr "Մատակարարողի "
+
+#~ msgid "Architectures:"
+#~ msgstr "Համակառույցները՝"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD տիպը՝"
+
+#~ msgid "CD Type:"
+#~ msgstr "CD տիպը՝"
+
+#~ msgid "email:"
+#~ msgstr "էլ-փոստ՝"
+
+#~ msgid "Ship International:"
+#~ msgstr "Առաքում այլ երկրներ՝"
+
+#~ msgid "Country:"
+#~ msgstr "Երկիր՝"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian-ի հասցեն՝"
+
+#~ msgid "Vendor:"
+#~ msgstr "Մատակարարող՝"
diff --git a/armenian/po/vote.hy.po b/armenian/po/vote.hy.po
index 9601d87fa71..80b3ddf0d97 100644
--- a/armenian/po/vote.hy.po
+++ b/armenian/po/vote.hy.po
@@ -18,229 +18,245 @@ msgid "Time Line"
msgstr ""
#: ../../english/template/debian/votebar.wml:19
-msgid "Nominations"
+msgid "Summary"
msgstr ""
#: ../../english/template/debian/votebar.wml:22
-msgid "Debate"
+msgid "Nominations"
msgstr ""
#: ../../english/template/debian/votebar.wml:25
-msgid "Platforms"
+msgid "Debate"
msgstr ""
#: ../../english/template/debian/votebar.wml:28
-msgid "Proposer"
+msgid "Platforms"
msgstr ""
#: ../../english/template/debian/votebar.wml:31
-msgid "Proposal A Proposer"
+msgid "Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:34
-msgid "Proposal B Proposer"
+msgid "Proposal A Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:37
-msgid "Proposal C Proposer"
+msgid "Proposal B Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:40
-msgid "Proposal D Proposer"
+msgid "Proposal C Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:43
-msgid "Proposal E Proposer"
+msgid "Proposal D Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:46
-msgid "Proposal F Proposer"
+msgid "Proposal E Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:49
-msgid "Seconds"
+msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:52
-msgid "Proposal A Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Proposal B Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal C Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal D Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal E Seconds"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal F Seconds"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Opposition"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Text"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Proposal A"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Proposal B"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal C"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal D"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal E"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal F"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Choices"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Amendment Proposer"
+msgid "Choices"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Amendment Seconds"
+msgid "Amendment Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Text"
+msgid "Amendment Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Proposer A"
+msgid "Amendment Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Seconds A"
+msgid "Amendment Proposer A"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Text A"
+msgid "Amendment Seconds A"
msgstr ""
#: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Proposer B"
+msgid "Amendment Text A"
msgstr ""
#: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Seconds B"
+msgid "Amendment Proposer B"
msgstr ""
#: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Text B"
+msgid "Amendment Seconds B"
msgstr ""
#: ../../english/template/debian/votebar.wml:124
-msgid "Amendments"
+msgid "Amendment Text B"
msgstr ""
#: ../../english/template/debian/votebar.wml:127
-msgid "Proceedings"
+msgid "Amendment Proposer C"
msgstr ""
#: ../../english/template/debian/votebar.wml:130
-msgid "Majority Requirement"
+msgid "Amendment Seconds C"
msgstr ""
#: ../../english/template/debian/votebar.wml:133
-msgid "Data and Statistics"
+msgid "Amendment Text C"
msgstr ""
#: ../../english/template/debian/votebar.wml:136
-msgid "Quorum"
+msgid "Amendments"
msgstr ""
#: ../../english/template/debian/votebar.wml:139
-msgid "Minimum Discussion"
+msgid "Proceedings"
msgstr ""
#: ../../english/template/debian/votebar.wml:142
-msgid "Ballot"
+msgid "Majority Requirement"
msgstr ""
#: ../../english/template/debian/votebar.wml:145
-msgid "Forum"
+msgid "Data and Statistics"
msgstr ""
#: ../../english/template/debian/votebar.wml:148
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:151
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:154
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:157
+msgid "Forum"
+msgstr ""
+
+#: ../../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 ""
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr ""
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr ""
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr ""
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr ""
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr ""
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr ""
diff --git a/bulgarian/po/bugs.bg.po b/bulgarian/po/bugs.bg.po
index 340ec7ab2d6..4cebf2b1eb4 100644
--- a/bulgarian/po/bugs.bg.po
+++ b/bulgarian/po/bugs.bg.po
@@ -160,152 +160,152 @@ msgstr "Архивирани"
msgid "Archived and Unarchived"
msgstr "Активни и архивирани"
-#~ msgid "Flags:"
-#~ msgstr "Флагове"
-
-#~ msgid "active bugs"
-#~ msgstr "активни доклади"
+#~ msgid "Exclude tag:"
+#~ msgstr "Изключване на етикет:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "показване на слетите доклади само веднъж"
+#~ msgid "Include tag:"
+#~ msgstr "Включване на етикет:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "без подреждане по на статус или важност"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "скриване на съдържанието в антетката"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "скриване на статистиките в края на страницата"
+#~ msgid "wontfix"
+#~ msgstr "отхвърлен"
-#~ msgid "proposed-updates"
-#~ msgstr "предложени обновления"
+#~ msgid "upstream"
+#~ msgstr "авторски"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "предлагани обновления за тестовата дистрибуция"
+#~ msgid "unreproducible"
+#~ msgstr "невъзпроизводим"
-#~ msgid "Package version:"
-#~ msgstr "Версия на пакета:"
+#~ msgid "security"
+#~ msgstr "сигурност"
-#~ msgid "Distribution:"
-#~ msgstr "Дистрибуция:"
+#~ msgid "patch"
+#~ msgstr "кръпка"
-#~ msgid "bugs"
-#~ msgstr "доклади"
+#~ msgid "moreinfo"
+#~ msgstr "повече информация"
-#~ msgid "open"
-#~ msgstr "отворен"
+#~ msgid "l10n"
+#~ msgstr "локализация"
-#~ msgid "forwarded"
-#~ msgstr "препратен"
+#~ msgid "help"
+#~ msgstr "помощ"
-#~ msgid "pending"
-#~ msgstr "чакащ"
+#~ msgid "fixed-upstream"
+#~ msgstr "поправен от автора"
-#~ msgid "fixed"
-#~ msgstr "поправен"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "поправен в експерименталната дистрибуция"
-#~ msgid "done"
-#~ msgstr "приключен"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "Include status:"
-#~ msgstr "Включване на статус:"
+#~ msgid "confirmed"
+#~ msgstr "потвърден"
-#~ msgid "Exclude status:"
-#~ msgstr "Изключване на статус:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "критичен"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore"
-#~ msgid "grave"
-#~ msgstr "много сериозен"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "serious"
-#~ msgstr "сериозен"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "important"
-#~ msgstr "важен"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "minor"
-#~ msgstr "незначителен"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "wishlist"
-#~ msgstr "пожелание"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "Include severity:"
-#~ msgstr "Включване на важност:"
+#~ msgid "potato"
+#~ msgstr "potato"
#~ msgid "Exclude severity:"
#~ msgstr "Изключване на важност:"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Включване на важност:"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "пожелание"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "minor"
+#~ msgstr "незначителен"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "important"
+#~ msgstr "важен"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "serious"
+#~ msgstr "сериозен"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "grave"
+#~ msgstr "много сериозен"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore"
+#~ msgid "critical"
+#~ msgstr "критичен"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Изключване на статус:"
-#~ msgid "confirmed"
-#~ msgstr "потвърден"
+#~ msgid "Include status:"
+#~ msgstr "Включване на статус:"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "done"
+#~ msgstr "приключен"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "поправен в експерименталната дистрибуция"
+#~ msgid "fixed"
+#~ msgstr "поправен"
-#~ msgid "fixed-upstream"
-#~ msgstr "поправен от автора"
+#~ msgid "pending"
+#~ msgstr "чакащ"
-#~ msgid "help"
-#~ msgstr "помощ"
+#~ msgid "forwarded"
+#~ msgstr "препратен"
-#~ msgid "l10n"
-#~ msgstr "локализация"
+#~ msgid "open"
+#~ msgstr "отворен"
-#~ msgid "moreinfo"
-#~ msgstr "повече информация"
+#~ msgid "bugs"
+#~ msgstr "доклади"
-#~ msgid "patch"
-#~ msgstr "кръпка"
+#~ msgid "Distribution:"
+#~ msgstr "Дистрибуция:"
-#~ msgid "security"
-#~ msgstr "сигурност"
+#~ msgid "Package version:"
+#~ msgstr "Версия на пакета:"
-#~ msgid "unreproducible"
-#~ msgstr "невъзпроизводим"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "предлагани обновления за тестовата дистрибуция"
-#~ msgid "upstream"
-#~ msgstr "авторски"
+#~ msgid "proposed-updates"
+#~ msgstr "предложени обновления"
-#~ msgid "wontfix"
-#~ msgstr "отхвърлен"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "скриване на статистиките в края на страницата"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "скриване на съдържанието в антетката"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "без подреждане по на статус или важност"
-#~ msgid "Include tag:"
-#~ msgstr "Включване на етикет:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "показване на слетите доклади само веднъж"
-#~ msgid "Exclude tag:"
-#~ msgstr "Изключване на етикет:"
+#~ msgid "active bugs"
+#~ msgstr "активни доклади"
+
+#~ msgid "Flags:"
+#~ msgstr "Флагове"
diff --git a/bulgarian/po/cdimage.bg.po b/bulgarian/po/cdimage.bg.po
index 0e5649cd904..b3c8af6484a 100644
--- a/bulgarian/po/cdimage.bg.po
+++ b/bulgarian/po/cdimage.bg.po
@@ -15,18 +15,16 @@ msgstr ""
"X-Generator: Gtranslator 2.91.5\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 " Key fingerprint"
-#: ../../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 "Файлова за jigdo"
diff --git a/bulgarian/po/distrib.bg.po b/bulgarian/po/distrib.bg.po
index 162468ee434..8c5cddc5df5 100644
--- a/bulgarian/po/distrib.bg.po
+++ b/bulgarian/po/distrib.bg.po
@@ -135,82 +135,92 @@ 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 "ARM с хардуерен процесор за изчисления с плаваща запетая"
-#: ../../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 "IBM System z"
-#: ../../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 "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 "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
diff --git a/bulgarian/po/doc.bg.po b/bulgarian/po/doc.bg.po
index 97c61b7e66b..41ccbe45aa9 100644
--- a/bulgarian/po/doc.bg.po
+++ b/bulgarian/po/doc.bg.po
@@ -15,7 +15,24 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\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"
@@ -43,7 +60,7 @@ msgstr ""
" настройка на SELinux за подобряване на сигурността, автоматизиране на\n"
" инсталациите и виртуализацията с Xen, KVM или LXC."
-#: ../../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"
@@ -56,15 +73,15 @@ msgstr ""
"широк кръг от проблеми за потребители, които сами си инсталират и поддържат "
"операционната система в дома, офиса, клуба или учебното заведение."
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "Инсталатор за sarge с набор от пакети"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "Жив компактдиск с Knoppix"
-#: ../../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"
@@ -78,13 +95,13 @@ msgstr ""
" Включена е и информация за проекта, както и подробно описание на\n"
" уникалната система за управление на пакети на Дебиан."
-#: ../../english/doc/books.data:77 ../../english/doc/books.data:180
-#: ../../english/doc/books.data:224 ../../english/doc/books.data:269
+#: ../../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:227 ../../english/doc/books.data:272
+#: ../../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"
@@ -99,7 +116,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 -- "
@@ -109,11 +126,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 "Дебиан 2.2 за архитектура ARM"
-#: ../../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, "
@@ -133,7 +150,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"
@@ -141,11 +158,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 "Дебиан 2.1"
-#: ../../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"
@@ -153,11 +170,11 @@ msgid ""
" support included."
msgstr ""
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "DVD с Дебиан squeeze за 32-битови и 64-битови персонални компютри"
-#: ../../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"
@@ -169,17 +186,29 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr ""
"2 варианта: единият без диск, другият с два диска DVD за 32-битови "
"персонални компютри"
-#: ../../english/doc/books.data:213
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr ""
-#: ../../english/doc/books.data:216
+#: ../../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 "
@@ -192,7 +221,7 @@ msgstr ""
"пълния потенциал на дистрибуцията (версия 6.0) и предлага практическо "
"ръководство за всички потребители, които искат да научат повече за Дебиан."
-#: ../../english/doc/books.data:244
+#: ../../english/doc/books.data:287
msgid ""
"2 editions: One with no CD, the other with Official CD (i386, contrib and "
"sources)"
@@ -200,7 +229,7 @@ msgstr ""
"2 варианта: единият без диск, другият с официалния компактдиск за 32-битови "
"персонални компютри, включително раздела contrib и изходните кодове."
-#: ../../english/doc/books.data:247
+#: ../../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"
@@ -216,24 +245,24 @@ msgid ""
" a server for Windows based clients (Samba)."
msgstr ""
-#: ../../english/doc/books.data:290
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "Инсталатор на Дебиан ГНУ/Линукс 3.1 sarge"
-#: ../../english/doc/books.data:293
+#: ../../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:306
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
msgstr ""
-#: ../../english/doc/books.data:310
+#: ../../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"
@@ -244,11 +273,11 @@ msgid ""
" for all Debian users from beginners to advanced users."
msgstr ""
-#: ../../english/doc/books.data:325
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr ""
-#: ../../english/doc/books.data:328
+#: ../../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"
@@ -258,11 +287,11 @@ msgid ""
" environment very easily with the customized CDs."
msgstr ""
-#: ../../english/doc/books.data:344
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr ""
-#: ../../english/doc/books.data:347
+#: ../../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 "
@@ -273,11 +302,11 @@ msgid ""
" people in Korea to become official Debian maintainers."
msgstr ""
-#: ../../english/doc/books.data:361
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr ""
-#: ../../english/doc/books.data:364
+#: ../../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"
@@ -287,11 +316,11 @@ msgid ""
" Debian for Korean language environment, and it is good for newcomers, too."
msgstr ""
-#: ../../english/doc/books.data:386
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr ""
-#: ../../english/doc/books.data:389
+#: ../../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"
@@ -299,7 +328,7 @@ msgid ""
" using GNU/Linux and Debian's powerful package management system."
msgstr ""
-#: ../../english/doc/books.data:405
+#: ../../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 "
@@ -315,7 +344,7 @@ msgid ""
" Debian Sarge."
msgstr ""
-#: ../../english/doc/books.data:428
+#: ../../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 "
@@ -373,7 +402,7 @@ msgstr "Последна версия:"
msgid "(version <get-var version />)"
msgstr "(версия <get-var version />)"
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr "обикновен текст"
@@ -433,20 +462,20 @@ msgstr "Пакет за Дебиан"
msgid "Debian package (archived)"
msgstr "Пакет за Дебиан (архивен)"
-#: ../../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 "Език:"
-
#~ msgid ""
#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
#~ "ddp_pkg_loc />."
#~ msgstr ""
#~ "Използвайте <a href=\"cvs\">SVN</a> за да изтеглите изходния код (SGML) "
#~ "на <get-var ddp_pkg_loc />."
+
+#~ msgid "Language:"
+#~ msgstr "Език:"
diff --git a/bulgarian/po/l10n.bg.po b/bulgarian/po/l10n.bg.po
index e8f452c7b65..3fb0d38b174 100644
--- a/bulgarian/po/l10n.bg.po
+++ b/bulgarian/po/l10n.bg.po
@@ -97,8 +97,8 @@ msgstr "POT файлове"
msgid "Hints for translators"
msgstr "Съвети за преводачи"
-#~ msgid "Translated templates"
-#~ msgstr "Преведени шаблони"
-
#~ msgid "Original templates"
#~ msgstr "Оригинални шаблони"
+
+#~ msgid "Translated templates"
+#~ msgstr "Преведени шаблони"
diff --git a/bulgarian/po/mailinglists.bg.po b/bulgarian/po/mailinglists.bg.po
index 28f19972ff9..043a2aa849b 100644
--- a/bulgarian/po/mailinglists.bg.po
+++ b/bulgarian/po/mailinglists.bg.po
@@ -129,8 +129,8 @@ msgstr "отворен"
msgid "closed"
msgstr "затворен"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Изберете от кои списъци желаете да се отпишете:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Изберете за кои списъци желаете да се абонирате:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Изберете от кои списъци желаете да се отпишете:"
diff --git a/bulgarian/po/newsevents.bg.po b/bulgarian/po/newsevents.bg.po
index 87f64681191..91dbd0f3627 100644
--- a/bulgarian/po/newsevents.bg.po
+++ b/bulgarian/po/newsevents.bg.po
@@ -32,27 +32,27 @@ msgstr "p<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 "Име:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "Email:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Предишни лекции:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Езици:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Местоположение:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Теми:"
@@ -406,12 +406,17 @@ msgstr ""
"news />\">новините за разработчици</a> и засяга следните теми:"
#: ../../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 ""
-"За да получавате този двуседмичен бюлетин, <a href=\"https://lists.debian.org/"
-"debian-news/\">абонирайте се за пощенския списък debian-news</a>."
+"За да получавате този бюлетин всяка седмица, <a href=\"https://lists.debian."
+"org/debian-news/\">запишете се в пощенския списък debian-news</a>."
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
@@ -533,3 +538,11 @@ msgid ""
msgstr ""
"<void id=\"plural\" />Този брой на Седмични новини за Дебиан е радактиран от "
"<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 ""
+#~ "За да получавате този двуседмичен бюлетин, <a href=\"https://lists.debian."
+#~ "org/debian-news/\">абонирайте се за пощенския списък debian-news</a>."
diff --git a/bulgarian/po/organization.bg.po b/bulgarian/po/organization.bg.po
index 58b65210c67..7c1e37e56c1 100644
--- a/bulgarian/po/organization.bg.po
+++ b/bulgarian/po/organization.bg.po
@@ -77,7 +77,7 @@ msgid "Officers"
msgstr "Официални длъжности"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Дистрибуция"
@@ -87,11 +87,11 @@ msgid "Publicity"
msgstr "Публичност"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Поддръжка и инфраструктура"
-#. 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 "Дестилати на Дебиан"
@@ -104,99 +104,99 @@ msgstr "Лидер"
msgid "Technical Committee"
msgstr "Техническа комисия"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Секретар"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Разработка"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP архиви"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "Магьосник на FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Асистенти"
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "Магьосници на FTP"
-#: ../../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 "Отделни пакети"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Управление на изданията"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Екип по изданията"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Контрол на качеството"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Екип по инсталационната система"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Бележки по изданията"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Образи на компактдискове"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Производство"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Тестване"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Инфраструктура за автоматично компилиране на пакети"
-#: ../../english/intro/organization.data:140
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Екип на wanna-build"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Администриране на buildd"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Документация"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Списък на незавършени и планирани пакети"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Екип на живата система"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Архитектури"
@@ -224,71 +224,71 @@ msgstr "Контакт с пресата"
msgid "Partner Program"
msgstr "Партньоркса програма"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Събития"
-#: ../../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 "Поддръжка за потребители"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Система за следене на грешки"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Администрация и архив на пощенските списъци"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Портал за кандидат-членове"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Администратори на членството в проекта"
-#: ../../english/intro/organization.data:339
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Отговорници за ключодържателите (PGP и GPG)"
-#: ../../english/intro/organization.data:342
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Отговорници за ключодържателите (DM)"
-#: ../../english/intro/organization.data:346
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Екип по сигурността"
-#: ../../english/intro/organization.data:361
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Уеб-страници"
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Страница на консултантите"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Страница на търговците на компактдискове"
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Планета Дебиан"
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Правилник"
-#: ../../english/intro/organization.data:386
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Системна администрация"
-#: ../../english/intro/organization.data:387
+#: ../../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."
@@ -296,7 +296,7 @@ msgstr ""
"Това е адресът, на който да съобщите при проблеми с някоя от машините на "
"Дебиан, включително проблеми с паролата или липса на пакети."
-#: ../../english/intro/organization.data:395
+#: ../../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 "
@@ -306,106 +306,113 @@ msgstr ""
"страницата <a href=\"https://db.debian.org/machines.cgi\">Машини на Дебиан</"
"a>, която може да съдържа информация за администратора на конкретната машина."
-#: ../../english/intro/organization.data:396
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Администратор на директорията на разработчиците в LDAP"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Огледални сървъри"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Отговорник за DNS"
-#: ../../english/intro/organization.data:403
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Система за следене на пакетите"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Координация на хардуерни дарения"
-#: ../../english/intro/organization.data:411
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Одитор"
-#: ../../english/intro/organization.data:414
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+#: ../../english/intro/organization.data:413
+#, fuzzy
+#| msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"запитвания за използването на <a href=\"m4_HOME/trademark\">търговските "
"марки</a>"
-#: ../../english/intro/organization.data:415
-msgid "current Debian Project Leader"
-msgstr "текущ лидер на проекта"
-
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Администратори на Alioth"
-#: ../../english/intro/organization.data:423
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Проект Жени в Дебиан"
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "Ръководство на ДебКонф"
-#: ../../english/intro/organization.data:434
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Без тормоз"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:436
+msgid "Outreach"
+msgstr ""
+
+#: ../../english/intro/organization.data:446
msgid "Debian for children from 1 to 99"
msgstr "Дебиан за деца от 1 до 99г."
-#: ../../english/intro/organization.data:448
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Дебиан за медицински практики и разработки"
-#: ../../english/intro/organization.data:451
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Дебиан за образователни цели"
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Дебиан за правни кантори"
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Дебиан за хора с увреждания"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Дебиан за научни изследвания"
-#~ msgid "Summer of Code 2013 Administrators"
-#~ msgstr "Отговорници за програмата „Програмиране през лятото 2013“"
-
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (Неактивна, не е част от изданието squeeze)"
+#~ msgid "Testing Security Team"
+#~ msgstr "Екип по сигурността на тестовата дистрибуция"
-#~ msgid "Handhelds"
-#~ msgstr "Джобни компютри"
+#~ msgid "Security Audit Project"
+#~ msgstr "Проект за одит на сигурността"
-#~ msgid "Marketing Team"
-#~ msgstr "Маркетингов екип"
+#~ msgid "Volatile Team"
+#~ msgstr "Екип на volatile"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Координация на подписване на ключовете"
+#~ msgid "Vendors"
+#~ msgstr "Търговци"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Специализирани дистрибуции"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Дебиан за организации с идеална цел"
-#~ msgid "Release Managers for ``stable''"
-#~ msgstr "Управители на стабилните идания"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Универсалната операционна система"
-#~ msgid "Release Assistants"
-#~ msgstr "Асистенти"
+#~ msgid "Accountant"
+#~ msgstr "Счетоводител"
-#~ msgid "APT Team"
-#~ msgstr "Екип APT"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Имената на отделните администратори на buildd могат да бъдат открити на "
+#~ "<a href=\"http://www.buildd.net\">http://www.buildd.net</a>. Изберете "
+#~ "артхитектура и дистрибуция за да видите наличните buildd и техните "
+#~ "администратори."
#~ msgid ""
#~ "The admins responsible for buildd's for a particular arch can be reached "
@@ -416,33 +423,32 @@ msgstr "Дебиан за научни изследвания"
#~ "открити на <genericemail архитекрура@buildd.debian.org>, например "
#~ "<genericemail i386@buildd.debian.org>."
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Имената на отделните администратори на buildd могат да бъдат открити на "
-#~ "<a href=\"http://www.buildd.net\">http://www.buildd.net</a>. Изберете "
-#~ "артхитектура и дистрибуция за да видите наличните buildd и техните "
-#~ "администратори."
+#~ msgid "APT Team"
+#~ msgstr "Екип APT"
-#~ msgid "Accountant"
-#~ msgstr "Счетоводител"
+#~ msgid "Release Assistants"
+#~ msgstr "Асистенти"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Универсалната операционна система"
+#~ msgid "Release Managers for ``stable''"
+#~ msgstr "Управители на стабилните идания"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Дебиан за организации с идеална цел"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Специализирани дистрибуции"
-#~ msgid "Vendors"
-#~ msgstr "Търговци"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Координация на подписване на ключовете"
-#~ msgid "Volatile Team"
-#~ msgstr "Екип на volatile"
+#~ msgid "Marketing Team"
+#~ msgstr "Маркетингов екип"
-#~ msgid "Security Audit Project"
-#~ msgstr "Проект за одит на сигурността"
+#~ msgid "Handhelds"
+#~ msgstr "Джобни компютри"
-#~ msgid "Testing Security Team"
-#~ msgstr "Екип по сигурността на тестовата дистрибуция"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (Неактивна, не е част от изданието squeeze)"
+
+#~ msgid "Summer of Code 2013 Administrators"
+#~ msgstr "Отговорници за програмата „Програмиране през лятото 2013“"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "текущ лидер на проекта"
diff --git a/bulgarian/po/others.bg.po b/bulgarian/po/others.bg.po
index 271aa40f1c3..accd1e7478a 100644
--- a/bulgarian/po/others.bg.po
+++ b/bulgarian/po/others.bg.po
@@ -167,26 +167,6 @@ msgstr "[Дебиан] (малък бутон)"
msgid "same as the above"
msgstr "също като по-горе"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Желани:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Кой:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Архитектура:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Спецификации:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Къде:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Продукти"
@@ -334,68 +314,66 @@ msgstr "Версия"
msgid "URL"
msgstr "URL"
-#~ msgid "Name:"
-#~ msgstr "Име:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
-#~ msgid "Company:"
-#~ msgstr "Фирма:"
+#~ msgid "Previous Talks:"
+#~ msgstr "Предишни разговори:"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Languages:"
+#~ msgstr "Езици:"
-#~ msgid "or"
-#~ msgstr "или"
+#~ msgid "Location:"
+#~ msgstr "Локация:"
-#~ msgid "Email:"
-#~ msgstr "Email:"
+#~ msgid "Topics:"
+#~ msgstr "Теми:"
-#~ msgid "Rates:"
-#~ msgstr "Рейтинг:"
+#~ msgid "closed"
+#~ msgstr "затворен"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Желае да се премества"
+#~ msgid "open"
+#~ msgstr "отворен"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "<total_consultant> Debian консултанти от <total_country> страни от цял "
-#~ "свят."
+#~ msgid "Unsubscribe"
+#~ msgstr "Отписване"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Абониране за пощенски списък"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Моля изберете за кои списъци желаете да се отпишете:"
#~ 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 ""
#~ "Прочетете страницата за <a href=\"./#subunsub\">пощенски списъци</a> за "
-#~ "информация как да се абонирате за тях чрез e-mail. Достъпна е и <a href="
-#~ "\"unsubscribe\">web форма за отписване</a> от пощенските списъци"
+#~ "информация как да се отпишете от тях чрез e-mail. Достъпна е и <a href="
+#~ "\"unsubscribe\">web форма за абониране</a> за пощенски списъци"
+
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Отписване от пощенски списъци"
#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Имайте предвид, че повечето пощенски списъци на Debian са публични. Всеки "
-#~ "email изпратен до тях ще бъде публикуван в публичен пощенски архив и ще "
-#~ "бъде индексиран от търсещи машини. Затова използвайте email адрес, който "
-#~ "може да стане публично достояние."
+#~ "Моля съобразявайте се с <a href=\"./#ads\">правилник за рекламиране в "
+#~ "пощенските списъци на Дебиан</a>."
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Моля изберете за кои списъци желаете да се абонирате:"
+#~ msgid "Clear"
+#~ msgstr "Изчистване"
-#~ msgid "No description given"
-#~ msgstr "Без описание"
+#~ msgid "Subscribe"
+#~ msgstr "Абониране"
-#~ msgid "Moderated:"
-#~ msgstr "Модериран:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Вашият E-Mail адрес:"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Пускането на съобщения е разрешено само за абонирани."
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "е само за четене, версия дайджест"
+
+#~ msgid "Subscription:"
+#~ msgstr "Абониран:"
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -403,63 +381,80 @@ msgstr "URL"
#~ "Само съобщения, подписани от Debian програмист ще бъдат приемани в този "
#~ "списък."
-#~ msgid "Subscription:"
-#~ msgstr "Абониран:"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "е само за четене, версия дайджест"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Пускането на съобщения е разрешено само за абонирани."
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Вашият E-Mail адрес:"
+#~ msgid "Moderated:"
+#~ msgstr "Модериран:"
-#~ msgid "Subscribe"
-#~ msgstr "Абониране"
+#~ msgid "No description given"
+#~ msgstr "Без описание"
-#~ msgid "Clear"
-#~ msgstr "Изчистване"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Моля изберете за кои списъци желаете да се абонирате:"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
#~ msgstr ""
-#~ "Моля съобразявайте се с <a href=\"./#ads\">правилник за рекламиране в "
-#~ "пощенските списъци на Дебиан</a>."
-
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Отписване от пощенски списъци"
+#~ "Имайте предвид, че повечето пощенски списъци на Debian са публични. Всеки "
+#~ "email изпратен до тях ще бъде публикуван в публичен пощенски архив и ще "
+#~ "бъде индексиран от търсещи машини. Затова използвайте email адрес, който "
+#~ "може да стане публично достояние."
#~ 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. "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
#~ "Прочетете страницата за <a href=\"./#subunsub\">пощенски списъци</a> за "
-#~ "информация как да се отпишете от тях чрез e-mail. Достъпна е и <a href="
-#~ "\"unsubscribe\">web форма за абониране</a> за пощенски списъци"
+#~ "информация как да се абонирате за тях чрез e-mail. Достъпна е и <a href="
+#~ "\"unsubscribe\">web форма за отписване</a> от пощенските списъци"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Моля изберете за кои списъци желаете да се отпишете:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Абониране за пощенски списък"
-#~ msgid "Unsubscribe"
-#~ msgstr "Отписване"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> Debian консултанти от <total_country> страни от цял "
+#~ "свят."
-#~ msgid "open"
-#~ msgstr "отворен"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Желае да се премества"
-#~ msgid "closed"
-#~ msgstr "затворен"
+#~ msgid "Rates:"
+#~ msgstr "Рейтинг:"
-#~ msgid "Topics:"
-#~ msgstr "Теми:"
+#~ msgid "Email:"
+#~ msgstr "Email:"
-#~ msgid "Location:"
-#~ msgstr "Локация:"
+#~ msgid "or"
+#~ msgstr "или"
-#~ msgid "Languages:"
-#~ msgstr "Езици:"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "Previous Talks:"
-#~ msgstr "Предишни разговори:"
+#~ msgid "Company:"
+#~ msgstr "Фирма:"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Name:"
+#~ msgstr "Име:"
+
+#~ msgid "Where:"
+#~ msgstr "Къде:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Спецификации:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Архитектура:"
+
+#~ msgid "Who:"
+#~ msgstr "Кой:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Желани:"
diff --git a/bulgarian/po/ports.bg.po b/bulgarian/po/ports.bg.po
index 688c34444f2..d6fc2dc55dd 100644
--- a/bulgarian/po/ports.bg.po
+++ b/bulgarian/po/ports.bg.po
@@ -118,32 +118,32 @@ msgstr "Дебиан за PowerPC"
msgid "Debian for Sparc"
msgstr "Дебиан за Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Дебиан за преносими компютри"
-
-#~ msgid "Debian for AMD64"
-#~ msgstr "Дебиан за AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Дебиан за Sparc64"
-#~ msgid "Debian for ARM"
-#~ msgstr "Дебиан за ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Дебиан за S/390"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Дебиан за Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Дебиан за MIPS"
-#~ msgid "Main"
-#~ msgstr "Main"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Дебиан за Motorola 680x0"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Дебиан ГНУ/FreeBSD"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Дебиан за Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Main"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Дебиан за MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Дебиан за Beowulf"
-#~ msgid "Debian for S/390"
-#~ msgstr "Дебиан за S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Дебиан за ARM"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Дебиан за Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Дебиан за AMD64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Дебиан за преносими компютри"
diff --git a/bulgarian/po/stats.bg.po b/bulgarian/po/stats.bg.po
index d6c728eb45c..a67a46ee5c1 100644
--- a/bulgarian/po/stats.bg.po
+++ b/bulgarian/po/stats.bg.po
@@ -30,75 +30,75 @@ msgstr "Има %d байта за превод."
msgid "There are %d strings to translate."
msgstr "Има %d низа за превод."
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Преводът е твърде стар"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Грешна версия на превода"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "Оригиналният документ е променян след превода"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "Оригиналният документ вече не съществува"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "не е наличен брой на попаденията"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "попадения"
-#: ../../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 "Обобщена информация за превода на"
-#: ../../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 "Няма превод"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Остарял"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Преведено"
-#: ../../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 "Обновен"
-#: ../../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 "файла"
-#: ../../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 "байта"
-#: ../../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."
@@ -106,135 +106,135 @@ msgstr ""
"Забележка: списъкът на страниците е подреден по популярност. Поставете "
"мишката над името на страницата за да видите броя попадения."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Преводи, които имат нужда от обновяване"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "Файл"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Разлики"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Бележка"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Обобщени разлики"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Журнал на промените"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Превод"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Отговорник"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Статус"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Преводач"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Дата"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Общи страници без превод"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Общи страници без превод"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Новини без превод"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Новини без превод"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Страници за консултанти и потребители без превод"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Страници за консултанти и потребители без превод"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Международни страници без превод"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Международни страници без превод"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Преведени страници (обновени)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Преведени низове (файлове PO)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Статистика на преведените низове (PO)"
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr "Мъгяви"
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr "Без превод"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Общо"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Общо:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Създаден с"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Преведени страници"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Статистика на преводите по брой страници"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Език"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Преводи"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Преведени страници (по размер)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Статистика на преводите по размер на страниците"
diff --git a/bulgarian/po/templates.bg.po b/bulgarian/po/templates.bg.po
index 1ef2df9474e..07c3bb84d52 100644
--- a/bulgarian/po/templates.bg.po
+++ b/bulgarian/po/templates.bg.po
@@ -62,7 +62,7 @@ msgstr ""
"Обратно към <a href=\"m4_HOME/\">началната страница на проекта Дебиан</a>."
#: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:149
+#: ../../english/template/debian/links.tags.wml:152
msgid "Home"
msgstr "Начална страница"
@@ -103,7 +103,7 @@ msgid "Support"
msgstr "Поддръжка"
#: ../../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 "Разработка"
@@ -140,7 +140,7 @@ msgid "Miscellaneous"
msgstr "Разни"
#: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:107
msgid "Getting Debian"
msgstr "Снабдяване с Дебиан"
@@ -285,143 +285,148 @@ msgid "Debian Books"
msgstr "Книги за Дебиан"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Debian"
+msgid "Debian Wiki"
+msgstr "Дебиан"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Архиви на пощенските списъци"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Пощенски списъци"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Обществен договор"
-#: ../../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:52
+#: ../../english/template/debian/links.tags.wml:55
msgid "Visit the site sponsor"
msgstr "Посетете спонсорите на сайта"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr "Дебиан 5.0 - Универсалната операционна система"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Карта на сайта"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "База данни на програмистите"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr "Въпроси за Дебиан"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Политики на Дебиан"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Справочник на програмиста"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Ръководство за нови отговорници"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Критични грешки в предстоящото издание"
-#: ../../english/template/debian/links.tags.wml:79
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Доклади от Lintian"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Архиви на потребителски пощенски списъци"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Архиви на пощенски списъци за програмисти"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Архиви на пощенски списъци за преводи и локализация"
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Архиви на пощенски списъци за портове"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:98
msgid "Archives for mailing lists of the Bug tracking system"
msgstr "Архиви на пощенските списъци на Системата за следене на грешките"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Архиви на други пощенски списъци"
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Свободен софтуер "
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Разработка"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Помощ за Дебиан"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Доклади за грешки"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Портове и Архитектури"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Ръководство за инсталиране"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Търговци на дискове"
-#: ../../english/template/debian/links.tags.wml:125
-#| msgid "CD ISO images"
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "Образи на оптични/USB носители"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Мрежова инсталация"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Компютър с Дебиан"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Проект Debian-Edu"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr "Alioth &ndash; Debian GForge"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "Контрол на качеството"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Система за следене на пакети"
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Резюме на пакетите на разработчика"
@@ -505,546 +510,546 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Обратно към страницата <a href=\"../\">Кой използва Дебиан?</a>."
-#~ msgid "More information:"
-#~ msgstr "Повече информация:"
+#~ msgid "Select a server near you"
+#~ msgstr "Изберете сървър близо до вас"
-#~ msgid "Taken by:"
-#~ msgstr "Взет от:"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Страницата изглежда странно?"
-#~ msgid "Nobody"
-#~ msgstr "Никого"
+#~ msgid "Report it!"
+#~ msgstr "Съобщаване"
-#~ msgid "Rating:"
-#~ msgstr "Оценка:"
+#~ msgid "List of Consultants"
+#~ msgstr "Списък на консултантите"
-#~ msgid "More information"
-#~ msgstr "Повече информация"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Обратно към страницата на консултантите на Debian"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Предстоящи събития"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "link may no longer be valid"
-#~ msgstr "връзката може да не е валидна вече"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Сваляне чрез Jigdo"
-#~ msgid "When"
-#~ msgstr "Кога"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Сваляне чрез HTTP/FTP"
-#~ msgid "Where"
-#~ msgstr "Къде"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Купуване на CD и DVD дискове"
-#~ msgid "More Info"
-#~ msgstr "Повече инфо"
+#~ msgid "Network Install"
+#~ msgstr "Мрежова инсталация"
-#~ msgid "Debian Involvement"
-#~ msgstr "Debian Инициативи"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Сваляне"
-#~ msgid "Main Coordinator"
-#~ msgstr "Главен координатор"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Други"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Координатор на</th><th>проекта</th>"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Картинки"
-#~ msgid "Related Links"
-#~ msgstr "Връзки към тази тема"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Огледала"
-#~ msgid "Latest News"
-#~ msgstr "Последни новини"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync Огледала"
-#~ msgid "Download calendar entry"
-#~ msgstr "Сваляне на събитията по дата"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Сваляне чрез Torrent"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Обратно към: други <a href=\"./\">Debian новини</a> || <a href=\"m4_HOME/"
-#~ "\">началната страница на Debian проекта</a>."
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Инфо за версията на image файловете"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (несъществуваща връзка)"
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD екип"
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "За да получавате това писмо с новини всяка седмица, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">абонирайте се за debian-news пощенския "
-#~ "списък</a>."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_на_cd"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "Налични са <a href=\"../../\">по-стари броеве</a> от това писмо с новини."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Новините на Проекта се редактират от <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Новините на Проекта се редактират от <a href="
-#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Този брой на новините за Debian Проекта бе "
-#~ "редактиран от <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "buy"
+#~ msgstr "купи"
+
+#~ msgid "net_install"
+#~ msgstr "net_install"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />други"
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"plural\" />Този брой на новините за Debian Проекта бе "
-#~ "редактиран от <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "<a href=\"/MailingLists/disclaimer\">публични пощенски списъци</a> за "
+#~ "англоговорящи отностно CDs/DVDs:"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Този текст бе преведен от %s."
+#~ msgid "Date"
+#~ msgstr "Дата"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Този текст бе преведен от %s."
+#~ msgid "Time Line"
+#~ msgstr "Времева линия"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Този текст бе преведен от %s."
+#~ msgid "Nominations"
+#~ msgstr "Номинации"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Този текст бе преведен от %s."
+#~ msgid "Debate"
+#~ msgstr "Дебат"
-#~ msgid "List of Speakers"
-#~ msgstr "Списък на Лекторите"
+#~ msgid "Platforms"
+#~ msgstr "Платформи"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Обратно към <a href=\"./\">страницата за Debian лекторите</a>."
+#~ msgid "Proposer"
+#~ msgstr "Инициатор"
-#~ 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 ""
-#~ "За да получавате това писмо с новини всяка седмица на Вашият e-mail, <a "
-#~ "href=\"https://lists.debian.org/debian-news/\">запишете се в debian-news "
-#~ "пощенския списък</a>."
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Предложение А Инициатор"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian седмични новини се редактира от <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Предложение Б Инициатор"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian седмични новини се радактира от <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Предложение В Инициатор"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian седмични новини бяха редактирани от <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Предложение Г Инициатор"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian седмични новини се радактира от <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Предложение Д Инициатор"
-#~ msgid "No requests for adoption"
-#~ msgstr "Няма заявления за адаптиране"
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Предложение Е Предложител"
-#~ msgid "No orphaned packages"
-#~ msgstr "Няма изоставени пакети"
+#~ msgid "Seconds"
+#~ msgstr "Арбитри"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Няма пакети, чакащи за адаптиране"
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Предложение А Арбитри"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Няма пакети, чакащи да бъдат пакетирани"
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Предложение Б Арбитри"
-#~ msgid "No Requested packages"
-#~ msgstr "Няма заявени пакети"
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Предложение В Арбитри"
-#~ msgid "No help requested"
-#~ msgstr "Няма проявявено желание за помощ"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Предложение В Арбитри"
-#~ msgid "in adoption since today."
-#~ msgstr "в процес на адаптиране от днес."
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Предложение Г Арбитри"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "в процес на адаптиране от вчера."
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Предложение Д Арбитри"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s дни в процес на адаптиране."
+#~ msgid "Opposition"
+#~ msgstr "Опозиция"
-#~ msgid "in preparation since today."
-#~ msgstr "в процес на подготовка от днес."
+#~ msgid "Text"
+#~ msgstr "Текст"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "в процес на подготовка от вчера."
+#~ msgid "Proposal A"
+#~ msgstr "Предложение А"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s дни в процес на подготовка."
+#~ msgid "Proposal B"
+#~ msgstr "Предложение Б"
-#~ msgid "requested today."
-#~ msgstr "заявен днес."
+#~ msgid "Proposal C"
+#~ msgstr "Предложение В"
-#~ msgid "requested yesterday."
-#~ msgstr "заявен вчера."
+#~ msgid "Proposal D"
+#~ msgstr "Предложение Г"
-#~ msgid "requested %s days ago."
-#~ msgstr "заявен преди %s дни."
+#~ msgid "Proposal E"
+#~ msgstr "Предложение Д"
-#~ msgid "package info"
-#~ msgstr "инфо за пакета"
+#~ msgid "Proposal F"
+#~ msgstr "Предложение Е"
-#~ msgid "License Information"
-#~ msgstr "Информация за лиценза"
+#~ msgid "Choices"
+#~ msgstr "Възможности"
-#~ msgid "DLS Index"
-#~ msgstr "DLS Индекс"
+#~ msgid "Amendment Proposer"
+#~ msgstr "Предложил Изменение"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Amendment Seconds"
+#~ msgstr "Арбитри по изменението"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG FAQ"
+#~ msgid "Amendment Text"
+#~ msgstr "Текст на изменението"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Debian-Legal Архив"
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Предложител за Изменение A"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Арбитри по изменението A"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Версия %s: %s"
+#~ msgid "Amendment Text A"
+#~ msgstr "Текст на изменението A"
-#~ msgid "Date published"
-#~ msgstr "Дата на публикуване"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Предложител за Изменение B"
-#~ msgid "License"
-#~ msgstr "Лиценз"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Арбитри по изменението B"
-#~ msgid "Version"
-#~ msgstr "Версия"
+#~ msgid "Amendment Text B"
+#~ msgstr "Текст на изменението B"
-#~ msgid "Summary"
-#~ msgstr "Резюме"
+#~ msgid "Amendments"
+#~ msgstr "Вносители на изменението"
-#~ msgid "Justification"
-#~ msgstr "Подравнение"
+#~ msgid "Proceedings"
+#~ msgstr "В процес"
-#~ msgid "Discussion"
-#~ msgstr "Дискусия"
+#~ msgid "Majority Requirement"
+#~ msgstr "Изискване за мнозинство"
-#~ msgid "Original Summary"
-#~ msgstr "Оригинално резюме"
+#~ msgid "Data and Statistics"
+#~ msgstr "Данни и Статистики"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "Оригиналното резюме на <summary-author/> може да бъде прочетено в <a href="
-#~ "\"<summary-url/>\">архива на списъците</a>."
+#~ msgid "Quorum"
+#~ msgstr "Кворум"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Това резюме бе подготвено от <summary-author/>."
+#~ msgid "Minimum Discussion"
+#~ msgstr "Минимум Дискусия"
-#~ msgid "License text (translated)"
-#~ msgstr "Текст на лиценза (преведен)"
+#~ msgid "Ballot"
+#~ msgstr "Балотаж"
-#~ msgid "License text"
-#~ msgstr "Текст на лиценза"
+#~ msgid "Forum"
+#~ msgstr "Форум"
-#~ msgid "free"
-#~ msgstr "свободен"
+#~ msgid "Outcome"
+#~ msgstr "Решение"
-#~ msgid "non-free"
-#~ msgstr "не-свободен"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Чака&nbsp;за&nbsp;спонсори"
-#~ msgid "not redistributable"
-#~ msgstr "не може да се разпространява"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "В&nbsp;дискусия"
-#~ msgid "Free"
-#~ msgstr "Свободен"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Отворен за&nbsp;гласуване"
-#~ msgid "Non-Free"
-#~ msgstr "Не-свободен"
+#~ msgid "Decided"
+#~ msgstr "Решен"
-#~ msgid "Not Redistributable"
-#~ msgstr "Не може да се разпространява"
+#~ msgid "Withdrawn"
+#~ msgstr "Върнат"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Прочетете страницата с <a href=\"./\">информация за лиценза</a> за "
-#~ "обобщен поглед върху лицензните споразумения на Debian - Debian License "
-#~ "Summaries (DLS)."
+#~ msgid "Other"
+#~ msgstr "Друг"
-#~ msgid "Vote"
-#~ msgstr "Гласуване"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Главна&nbsp;страница&nbsp;за гласуване"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Прочитане на&nbsp;резултат"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Стъпка по&nbsp;стъпка"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Проследяване на&nbsp;предложение"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Изпращане на&nbsp;предложение"
#~ msgid "Amend&nbsp;a&nbsp;Proposal"
#~ msgstr "Редактиране на&nbsp;предложение"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Изпращане на&nbsp;предложение"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Проследяване на&nbsp;предложение"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Стъпка по&nbsp;стъпка"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Прочитане на&nbsp;резултат"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Главна&nbsp;страница&nbsp;за гласуване"
+#~ msgid "Vote"
+#~ msgstr "Гласуване"
-#~ msgid "Other"
-#~ msgstr "Друг"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Прочетете страницата с <a href=\"./\">информация за лиценза</a> за "
+#~ "обобщен поглед върху лицензните споразумения на Debian - Debian License "
+#~ "Summaries (DLS)."
-#~ msgid "Withdrawn"
-#~ msgstr "Върнат"
+#~ msgid "Not Redistributable"
+#~ msgstr "Не може да се разпространява"
-#~ msgid "Decided"
-#~ msgstr "Решен"
+#~ msgid "Non-Free"
+#~ msgstr "Не-свободен"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Отворен за&nbsp;гласуване"
+#~ msgid "Free"
+#~ msgstr "Свободен"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "В&nbsp;дискусия"
+#~ msgid "not redistributable"
+#~ msgstr "не може да се разпространява"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Чака&nbsp;за&nbsp;спонсори"
+#~ msgid "non-free"
+#~ msgstr "не-свободен"
-#~ msgid "Outcome"
-#~ msgstr "Решение"
+#~ msgid "free"
+#~ msgstr "свободен"
-#~ msgid "Forum"
-#~ msgstr "Форум"
+#~ msgid "License text"
+#~ msgstr "Текст на лиценза"
-#~ msgid "Ballot"
-#~ msgstr "Балотаж"
+#~ msgid "License text (translated)"
+#~ msgstr "Текст на лиценза (преведен)"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Минимум Дискусия"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Това резюме бе подготвено от <summary-author/>."
-#~ msgid "Quorum"
-#~ msgstr "Кворум"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "Оригиналното резюме на <summary-author/> може да бъде прочетено в <a href="
+#~ "\"<summary-url/>\">архива на списъците</a>."
-#~ msgid "Data and Statistics"
-#~ msgstr "Данни и Статистики"
+#~ msgid "Original Summary"
+#~ msgstr "Оригинално резюме"
-#~ msgid "Majority Requirement"
-#~ msgstr "Изискване за мнозинство"
+#~ msgid "Discussion"
+#~ msgstr "Дискусия"
-#~ msgid "Proceedings"
-#~ msgstr "В процес"
+#~ msgid "Justification"
+#~ msgstr "Подравнение"
-#~ msgid "Amendments"
-#~ msgstr "Вносители на изменението"
+#~ msgid "Summary"
+#~ msgstr "Резюме"
-#~ msgid "Amendment Text B"
-#~ msgstr "Текст на изменението B"
+#~ msgid "Version"
+#~ msgstr "Версия"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Арбитри по изменението B"
+#~ msgid "License"
+#~ msgstr "Лиценз"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Предложител за Изменение B"
+#~ msgid "Date published"
+#~ msgstr "Дата на публикуване"
-#~ msgid "Amendment Text A"
-#~ msgstr "Текст на изменението A"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Версия %s: %s"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Арбитри по изменението A"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Предложител за Изменение A"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Debian-Legal Архив"
-#~ msgid "Amendment Text"
-#~ msgstr "Текст на изменението"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG FAQ"
-#~ msgid "Amendment Seconds"
-#~ msgstr "Арбитри по изменението"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Amendment Proposer"
-#~ msgstr "Предложил Изменение"
+#~ msgid "DLS Index"
+#~ msgstr "DLS Индекс"
-#~ msgid "Choices"
-#~ msgstr "Възможности"
+#~ msgid "License Information"
+#~ msgstr "Информация за лиценза"
-#~ msgid "Proposal F"
-#~ msgstr "Предложение Е"
+#~ msgid "package info"
+#~ msgstr "инфо за пакета"
-#~ msgid "Proposal E"
-#~ msgstr "Предложение Д"
+#~ msgid "requested %s days ago."
+#~ msgstr "заявен преди %s дни."
-#~ msgid "Proposal D"
-#~ msgstr "Предложение Г"
+#~ msgid "requested yesterday."
+#~ msgstr "заявен вчера."
-#~ msgid "Proposal C"
-#~ msgstr "Предложение В"
+#~ msgid "requested today."
+#~ msgstr "заявен днес."
-#~ msgid "Proposal B"
-#~ msgstr "Предложение Б"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s дни в процес на подготовка."
-#~ msgid "Proposal A"
-#~ msgstr "Предложение А"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "в процес на подготовка от вчера."
-#~ msgid "Text"
-#~ msgstr "Текст"
+#~ msgid "in preparation since today."
+#~ msgstr "в процес на подготовка от днес."
-#~ msgid "Opposition"
-#~ msgstr "Опозиция"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s дни в процес на адаптиране."
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Предложение Д Арбитри"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "в процес на адаптиране от вчера."
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Предложение Г Арбитри"
+#~ msgid "in adoption since today."
+#~ msgstr "в процес на адаптиране от днес."
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Предложение В Арбитри"
+#~ msgid "No help requested"
+#~ msgstr "Няма проявявено желание за помощ"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Предложение В Арбитри"
+#~ msgid "No Requested packages"
+#~ msgstr "Няма заявени пакети"
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Предложение Б Арбитри"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Няма пакети, чакащи да бъдат пакетирани"
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Предложение А Арбитри"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Няма пакети, чакащи за адаптиране"
-#~ msgid "Seconds"
-#~ msgstr "Арбитри"
+#~ msgid "No orphaned packages"
+#~ msgstr "Няма изоставени пакети"
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Предложение Е Предложител"
+#~ msgid "No requests for adoption"
+#~ msgstr "Няма заявления за адаптиране"
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Предложение Д Инициатор"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian седмични новини се радактира от <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Предложение Г Инициатор"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian седмични новини бяха редактирани от <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Предложение В Инициатор"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian седмични новини се радактира от <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Предложение Б Инициатор"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian седмични новини се редактира от <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Предложение А Инициатор"
+#~ 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 ""
+#~ "За да получавате това писмо с новини всяка седмица на Вашият e-mail, <a "
+#~ "href=\"https://lists.debian.org/debian-news/\">запишете се в debian-news "
+#~ "пощенския списък</a>."
-#~ msgid "Proposer"
-#~ msgstr "Инициатор"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Обратно към <a href=\"./\">страницата за Debian лекторите</a>."
-#~ msgid "Platforms"
-#~ msgstr "Платформи"
+#~ msgid "List of Speakers"
+#~ msgstr "Списък на Лекторите"
-#~ msgid "Debate"
-#~ msgstr "Дебат"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Този текст бе преведен от %s."
-#~ msgid "Nominations"
-#~ msgstr "Номинации"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Този текст бе преведен от %s."
-#~ msgid "Time Line"
-#~ msgstr "Времева линия"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Този текст бе преведен от %s."
-#~ msgid "Date"
-#~ msgstr "Дата"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Този текст бе преведен от %s."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "<a href=\"/MailingLists/disclaimer\">публични пощенски списъци</a> за "
-#~ "англоговорящи отностно CDs/DVDs:"
-
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />други"
-
-#~ msgid "net_install"
-#~ msgstr "net_install"
+#~ "<void id=\"plural\" />Този брой на новините за Debian Проекта бе "
+#~ "редактиран от <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "buy"
-#~ msgstr "купи"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Този брой на новините за Debian Проекта бе "
+#~ "редактиран от <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Новините на Проекта се редактират от <a href="
+#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Новините на Проекта се редактират от <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "Налични са <a href=\"../../\">по-стари броеве</a> от това писмо с новини."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_на_cd"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "За да получавате това писмо с новини всяка седмица, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">абонирайте се за debian-news пощенския "
+#~ "списък</a>."
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD екип"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (несъществуваща връзка)"
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Инфо за версията на image файловете"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Обратно към: други <a href=\"./\">Debian новини</a> || <a href=\"m4_HOME/"
+#~ "\">началната страница на Debian проекта</a>."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Сваляне чрез Torrent"
+#~ msgid "Download calendar entry"
+#~ msgstr "Сваляне на събитията по дата"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync Огледала"
+#~ msgid "Latest News"
+#~ msgstr "Последни новини"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Огледала"
+#~ msgid "Related Links"
+#~ msgstr "Връзки към тази тема"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Картинки"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Координатор на</th><th>проекта</th>"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Други"
+#~ msgid "Main Coordinator"
+#~ msgstr "Главен координатор"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Сваляне"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debian Инициативи"
-#~ msgid "Network Install"
-#~ msgstr "Мрежова инсталация"
+#~ msgid "More Info"
+#~ msgstr "Повече инфо"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Купуване на CD и DVD дискове"
+#~ msgid "Where"
+#~ msgstr "Къде"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Сваляне чрез HTTP/FTP"
+#~ msgid "When"
+#~ msgstr "Кога"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Сваляне чрез Jigdo"
+#~ msgid "link may no longer be valid"
+#~ msgstr "връзката може да не е валидна вече"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Предстоящи събития"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Обратно към страницата на консултантите на Debian"
+#~ msgid "More information"
+#~ msgstr "Повече информация"
-#~ msgid "List of Consultants"
-#~ msgstr "Списък на консултантите"
+#~ msgid "Rating:"
+#~ msgstr "Оценка:"
-#~ msgid "Report it!"
-#~ msgstr "Съобщаване"
+#~ msgid "Nobody"
+#~ msgstr "Никого"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Страницата изглежда странно?"
+#~ msgid "Taken by:"
+#~ msgstr "Взет от:"
-#~ msgid "Select a server near you"
-#~ msgstr "Изберете сървър близо до вас"
+#~ msgid "More information:"
+#~ msgstr "Повече информация:"
diff --git a/bulgarian/po/vendors.bg.po b/bulgarian/po/vendors.bg.po
index 0014b06f350..78e6fb1f83b 100644
--- a/bulgarian/po/vendors.bg.po
+++ b/bulgarian/po/vendors.bg.po
@@ -13,92 +13,85 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Търговец:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "Връзка към страницата за Дебиан:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Позволява подпомагането на Дебиан:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Държава:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Доставя за целия свят:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "email:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Компактдиск:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "DVD носител:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Архитектури:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Търговец"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Позволява дарения"
-#: ../../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 "Архитектури"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Доставя в цял свят"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Контакт"
#. ###################
#. 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 "Сайт на търговеца"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "страница"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "email"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "в рамките на Европа"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "В някои държави"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "източник"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "и"
+
+#~ msgid "Architectures:"
+#~ msgstr "Архитектури:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD носител:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Компактдиск:"
+
+#~ msgid "email:"
+#~ msgstr "email:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Доставя за целия свят:"
+
+#~ msgid "Country:"
+#~ msgstr "Държава:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Позволява подпомагането на Дебиан:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Връзка към страницата за Дебиан:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Търговец:"
diff --git a/bulgarian/po/vote.bg.po b/bulgarian/po/vote.bg.po
index bcb6da55547..539eaf7e406 100644
--- a/bulgarian/po/vote.bg.po
+++ b/bulgarian/po/vote.bg.po
@@ -22,229 +22,251 @@ msgid "Time Line"
msgstr "График"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Номинации"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Дебат"
-#: ../../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
msgid "Proposer"
msgstr "Автор"
-#: ../../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 "Автор на поправка A"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "Подкрепящи поправка A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "Текст на поправка A"
-#: ../../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
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "Автор на поправка A"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "Подкрепящи поправка A"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "Текст на поправка A"
+
+#: ../../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
msgid "Minimum Discussion"
msgstr "Минимален период за дискусия"
-#: ../../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 "Чака&nbsp;за&nbsp;подкрепа"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "В&nbsp;дискусия"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Гласуване"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Решен"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Изтеглен"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Друг"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Главна страница за гласуване"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Стъпка по стъпка"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Изпращане на предложение"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Изпращане на поправка"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Проследяване на предложение"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Разчитане на резултата"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Гласуване"
diff --git a/catalan/po/bugs.ca.po b/catalan/po/bugs.ca.po
index f5a2892e681..c52725b1403 100644
--- a/catalan/po/bugs.ca.po
+++ b/catalan/po/bugs.ca.po
@@ -160,152 +160,152 @@ msgstr "Arxivats"
msgid "Archived and Unarchived"
msgstr "Arxivats i desarxivats"
-#~ msgid "Exclude tag:"
-#~ msgstr "Exclou la etiqueta:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Inclou la etiqueta:"
+#~ msgid "Flags:"
+#~ msgstr "Opcions:"
-#~ msgid "lfs"
-#~ msgstr "lfs (sistema de fitxers gran)"
+#~ msgid "active bugs"
+#~ msgstr "errors actius"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "mostra els errors fusionats només una vegada"
-#~ msgid "wontfix"
-#~ msgstr "wontfix (no s'arreglarà)"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "no ordena pel seu estat de gravetat"
-#~ msgid "upstream"
-#~ msgstr "upstream (responsable autor original)"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "no ensenya taula de continguts a la capçalera"
-#~ msgid "unreproducible"
-#~ msgstr "unreproducible (no reproduïble)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "no ensenya estadístiques al peu de pàgina"
-#~ msgid "security"
-#~ msgstr "security (seguretat)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates (actualitzacions proposades)"
-#~ msgid "patch"
-#~ msgstr "patch (pedaç)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates (actualitzacions proposades de testing)"
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo (més informació)"
+#~ msgid "Package version:"
+#~ msgstr "Versió del paquet:"
-#~ msgid "l10n"
-#~ msgstr "l10n (localització)"
+#~ msgid "Distribution:"
+#~ msgstr "Distribució:"
-#~ msgid "help"
-#~ msgstr "help (ajuda)"
+#~ msgid "bugs"
+#~ msgstr "errors"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream (arreglat per l'autor original)"
+#~ msgid "open"
+#~ msgstr "obert"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixed-in-experimental (arreglat a experimental)"
+#~ msgid "forwarded"
+#~ msgstr "enviat"
-#~ msgid "d-i"
-#~ msgstr "d-i (instal·lador)"
+#~ msgid "pending"
+#~ msgstr "pendent"
-#~ msgid "confirmed"
-#~ msgstr "confirmed (confirmat)"
+#~ msgid "fixed"
+#~ msgstr "fixat"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "tancat"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore"
+#~ msgid "Include status:"
+#~ msgstr "Inclou l'estat:"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "Exclude status:"
+#~ msgstr "Exclou l'estat:"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "crític"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "greu"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "seriós"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "important"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "menor"
-#~ msgid "Exclude severity:"
-#~ msgstr "Exclou la gravetat:"
+#~ msgid "wishlist"
+#~ msgstr "desig"
#~ msgid "Include severity:"
#~ msgstr "Inclou la gravetat:"
-#~ msgid "wishlist"
-#~ msgstr "desig"
+#~ msgid "Exclude severity:"
+#~ msgstr "Exclou la gravetat:"
-#~ msgid "minor"
-#~ msgstr "menor"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "important"
-#~ msgstr "important"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "serious"
-#~ msgstr "seriós"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "grave"
-#~ msgstr "greu"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "critical"
-#~ msgstr "crític"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "Exclou l'estat:"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "Include status:"
-#~ msgstr "Inclou l'estat:"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore"
-#~ msgid "done"
-#~ msgstr "tancat"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "fixat"
+#~ msgid "confirmed"
+#~ msgstr "confirmed (confirmat)"
-#~ msgid "pending"
-#~ msgstr "pendent"
+#~ msgid "d-i"
+#~ msgstr "d-i (instal·lador)"
-#~ msgid "forwarded"
-#~ msgstr "enviat"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixed-in-experimental (arreglat a experimental)"
-#~ msgid "open"
-#~ msgstr "obert"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream (arreglat per l'autor original)"
-#~ msgid "bugs"
-#~ msgstr "errors"
+#~ msgid "help"
+#~ msgstr "help (ajuda)"
-#~ msgid "Distribution:"
-#~ msgstr "Distribució:"
+#~ msgid "l10n"
+#~ msgstr "l10n (localització)"
-#~ msgid "Package version:"
-#~ msgstr "Versió del paquet:"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo (més informació)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates (actualitzacions proposades de testing)"
+#~ msgid "patch"
+#~ msgstr "patch (pedaç)"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates (actualitzacions proposades)"
+#~ msgid "security"
+#~ msgstr "security (seguretat)"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "no ensenya estadístiques al peu de pàgina"
+#~ msgid "unreproducible"
+#~ msgstr "unreproducible (no reproduïble)"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "no ensenya taula de continguts a la capçalera"
+#~ msgid "upstream"
+#~ msgstr "upstream (responsable autor original)"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "no ordena pel seu estat de gravetat"
+#~ msgid "wontfix"
+#~ msgstr "wontfix (no s'arreglarà)"
-#~ msgid "display merged bugs only once"
-#~ msgstr "mostra els errors fusionats només una vegada"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "errors actius"
+#~ msgid "lfs"
+#~ msgstr "lfs (sistema de fitxers gran)"
-#~ msgid "Flags:"
-#~ msgstr "Opcions:"
+#~ msgid "Include tag:"
+#~ msgstr "Inclou la etiqueta:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Exclou la etiqueta:"
diff --git a/catalan/po/cdimage.ca.po b/catalan/po/cdimage.ca.po
index b1a1ccf667d..82c28eba562 100644
--- a/catalan/po/cdimage.ca.po
+++ b/catalan/po/cdimage.ca.po
@@ -15,18 +15,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 " Empremta digital"
-#: ../../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/catalan/po/distrib.ca.po b/catalan/po/distrib.ca.po
index bcb3e85d93a..bd20ca989f4 100644
--- a/catalan/po/distrib.ca.po
+++ b/catalan/po/distrib.ca.po
@@ -133,113 +133,123 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
+#, fuzzy
+#| msgid "64-bit PC (amd64)"
+msgid "64-bit ARM (AArch64)"
+msgstr "PC de 64 bits (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 PC de 32 bits (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr "PC de 32 bits (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 PC de 32 bits (i386)"
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr "kFreeBSD PC de 64 bits (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 (terminació gran)"
-#: ../../english/releases/arches.data:21
+#: ../../english/releases/arches.data:22
msgid "MIPS (little endian)"
msgstr "MIPS (terminació petita)"
-#: ../../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 "packages that contain files or directories named like this"
-#~ msgstr ""
-#~ "paquets que contenen fitxers o directoris anomenats d'aquesta manera"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "all files in this package"
-#~ msgstr "tots els fitxers d'aquest paquet"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Case sensitive"
-#~ msgstr "Distingeix entre majúscules i minúscules"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "no"
-#~ msgstr "no"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "yes"
-#~ msgstr "sí"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Permet la cerca en subparaules"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Search case sensitive"
-#~ msgstr "Cerca tenint en compte la diferència entre majúscules i minúscules"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
#~ msgid "MIPS (DEC)"
#~ msgstr "MIPS (DEC)"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Search case sensitive"
+#~ msgstr "Cerca tenint en compte la diferència entre majúscules i minúscules"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Permet la cerca en subparaules"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "yes"
+#~ msgstr "sí"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "no"
+#~ msgstr "no"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "Case sensitive"
+#~ msgstr "Distingeix entre majúscules i minúscules"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "all files in this package"
+#~ msgstr "tots els fitxers d'aquest paquet"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr ""
+#~ "paquets que contenen fitxers o directoris anomenats d'aquesta manera"
diff --git a/catalan/po/doc.ca.po b/catalan/po/doc.ca.po
index a8f7966ae39..b52f6965a14 100644
--- a/catalan/po/doc.ca.po
+++ b/catalan/po/doc.ca.po
@@ -13,7 +13,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"
@@ -28,7 +45,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"
@@ -37,15 +54,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"
@@ -54,13 +71,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"
@@ -75,7 +92,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 -- "
@@ -85,11 +102,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, "
@@ -109,7 +126,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"
@@ -117,11 +134,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"
@@ -129,11 +146,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"
@@ -145,24 +162,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 "
@@ -171,13 +191,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"
@@ -193,24 +213,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"
@@ -221,11 +241,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"
@@ -235,11 +255,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 "
@@ -250,11 +270,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"
@@ -264,11 +284,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"
@@ -276,7 +296,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 "
@@ -292,7 +312,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 "
@@ -322,49 +342,73 @@ msgstr "CD Inclós:"
msgid "Publisher:"
msgstr "Editorial:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Autors:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Editors:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Mantenidor:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "Estat:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "Disponibilitat:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "Última versió:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(versió <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 "text pla"
-#. 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 ""
-"Useu <a href=\"cvs\">SVN</a> per a descarregar el text font en SGML per a "
-"<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"
@@ -374,25 +418,32 @@ msgstr ""
"a <kbd>:ext:<var>idusuari</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
"i descarregueu el mòdul <kbd>boot-floppies/documentation</kbd>."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "CVS per web"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Paquet Debian"
-#: ../../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 "Paquet Debian (arxivat)"
-#: ../../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 "Idioma:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Useu <a href=\"cvs\">SVN</a> per a descarregar el text font en SGML per a "
+#~ "<get-var ddp_pkg_loc />."
diff --git a/catalan/po/l10n.ca.po b/catalan/po/l10n.ca.po
index 8fd8c2f2712..256d95283de 100644
--- a/catalan/po/l10n.ca.po
+++ b/catalan/po/l10n.ca.po
@@ -101,8 +101,8 @@ msgstr "fitxers POT"
msgid "Hints for translators"
msgstr "Consells per als traductors"
-#~ msgid "Original templates"
-#~ msgstr "Plantilla original"
-
#~ msgid "Translated templates"
#~ msgstr "Plantilla traduïda"
+
+#~ msgid "Original templates"
+#~ msgstr "Plantilla original"
diff --git a/catalan/po/mailinglists.ca.po b/catalan/po/mailinglists.ca.po
index 62563999065..ca67446a854 100644
--- a/catalan/po/mailinglists.ca.po
+++ b/catalan/po/mailinglists.ca.po
@@ -130,9 +130,9 @@ msgstr "oberta"
msgid "closed"
msgstr "tancada"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Si us plau, seleccioneu a quines llistes us desitgeu donar d'alta:"
+
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
#~ "Si us plau, seleccioneu a quines llistes us desitgeu donar-vos de baixa:"
-
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Si us plau, seleccioneu a quines llistes us desitgeu donar d'alta:"
diff --git a/catalan/po/newsevents.ca.po b/catalan/po/newsevents.ca.po
index 785a504e9a9..8b491ae0e7e 100644
--- a/catalan/po/newsevents.ca.po
+++ b/catalan/po/newsevents.ca.po
@@ -32,27 +32,27 @@ msgstr "p<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 "Nom:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "Correu:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Conferencies prèvies:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Llenguatge:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Localització:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Temes:"
@@ -340,13 +340,18 @@ 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 ""
-"Per a rebre aquest butlletí quinzenalment en la vostra bústia, <a href="
-"\"m4_HOME/MailingLists/subscribe#debian-news\">subscriviu-vos a la llista de "
-"correu debian-news.</a>"
+"Per a rebre aquest butlletí setmanal en la vostra bústia, <a href=\"m4_HOME/"
+"MailingLists/subscribe#debian-news\">subscriviu-vos a la llista de correu "
+"debian-news.</a>"
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
@@ -473,3 +478,12 @@ msgid ""
msgstr ""
"<void id=\"plural\" />Els editors d'aquest número de les notícies setmanals "
"de Debian són <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 ""
+#~ "Per a rebre aquest butlletí quinzenalment en la vostra bústia, <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscriviu-vos a la llista "
+#~ "de correu debian-news.</a>"
diff --git a/catalan/po/organization.ca.po b/catalan/po/organization.ca.po
index 356634e34a7..a2e342a5daa 100644
--- a/catalan/po/organization.ca.po
+++ b/catalan/po/organization.ca.po
@@ -76,7 +76,7 @@ msgid "Officers"
msgstr "Directors"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribució"
@@ -86,11 +86,11 @@ msgid "Publicity"
msgstr "Publicitat"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Suport i infraestructura"
-#. 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 "Barreges pures de Debian"
@@ -103,101 +103,101 @@ msgstr "Líder"
msgid "Technical Committee"
msgstr "Comitè tècnic"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Secretari"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Projectes de desenvolupament"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Arxius FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "Mestres de FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Assistents de FTP"
-#: ../../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 "Paquets individuals"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Gestió de llançaments"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Equip de llançament"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Control de qualitat"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Equip del sistema d'instal·lació"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Notes de la versió"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Imatges de CD"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Producció"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Proves"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Infraestructura d'autocompilació"
-#: ../../english/intro/organization.data:140
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Equip de wanna-build"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Administració dels dimonis de compilació"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Documentació"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Llista de paquets en perspectiva o en falta de feina"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Equip del sistema autònom"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Arquitectures"
@@ -225,83 +225,75 @@ msgstr "Contacte de premsa"
msgid "Partner Program"
msgstr "Programa de socis"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Esdeveniments"
-#: ../../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 "Suport d'usuari"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Sistema de Seguiment d'Errors"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administració i arxius de les llistes de correu"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Recepció de nous mantenidors"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Administradors dels comptes de Debian"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Mantenidors de l'anell de claus (PGP i GPG)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
#, fuzzy
#| msgid "Debian Maintainer Keyring Team"
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Equip de l'anell de claus dels mantenidors de Debian"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Equip de seguretat"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "Equip de seguretat de Proves"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Projecte d'auditoria de seguretat"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Pàgines web"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Pàgina de consultors"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Pàgina de venedors de CD"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Planeta Debian"
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Política"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Administració del sistema"
-#: ../../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."
@@ -310,7 +302,7 @@ msgstr ""
"Debian, incloent problemes amb contrasenyes o si necessiteu la instal·lació "
"d'un paquet."
-#: ../../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 "
@@ -320,156 +312,163 @@ msgstr ""
"pàgina de <a href=\"https://db.debian.org/machines.cgi\">Màquines de Debian</"
"a>, hauria de contenir informació de l'administrador de cada màquina."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Administrador del directori LDAP de desenvolupadors"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Rèpliques"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Mantenidor del DNS"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Sistema de seguiment de paquets"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Coordinació de donacions de maquinari"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Auditor"
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Administració d'Alioth"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Projecte Debian dona"
-#: ../../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 per a nens de 1 a 99"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian per a la pràctica i recerca medica"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian per a l'educació"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian a les oficines de dret"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian per a gent amb discapacitats"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian per a la pràctica i recerca medica"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Distribució de Debian adaptada"
+#~ msgid "Volatile Team"
+#~ msgstr "Equip de llançament da la versió volàtil"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Equip de llançaments per a «stable»"
+#~ msgid "Vendors"
+#~ msgstr "Venedors"
-#~ msgid "Handhelds"
-#~ msgstr "Ordinadors de ma"
+#~ msgid "APT Team"
+#~ msgstr "Equip APT"
-#~ msgid "Marketing Team"
-#~ msgstr "Equip de màrqueting"
+#~ msgid "Release Assistants"
+#~ msgstr "Assistents de llançament"
-#~ 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 ""
-#~ "Els administradors responsables dels dimonis de compilació per a una "
-#~ "arquitectura particular, es poden contactar a <genericemail arch@buildd."
-#~ "debian.org>, per exemple <genericemail i386@buildd.debian.org>."
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "Assistents de llançaments per a «stable»"
+
+#~ msgid "Release Wizard"
+#~ msgstr "Mag de llançaments"
+
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Distribució multimedia de Debian"
#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
#~ msgstr ""
-#~ "Els noms individuals dels administradors dels dimonis de compilació es "
-#~ "poden trobar a <a href=\"http://www.buildd.net\">http://www.buildd.net</"
-#~ "a>. Seleccioneu una arquitecture i una distribució per veure els dimonis "
-#~ "de compilació disponibles i els seus administradors."
+#~ "Aquest encara no és un projecte intern oficial de Debian però ha anunciat "
+#~ "la intenció de ser-ho."
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Coordinació de signatura de claus"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Arxius de les llistes de correu"
-#~ msgid "Accountant"
-#~ msgstr "Contable"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Sistema d'instal·lació per a «stable»"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "El sistema operatiu universal com el seu escriptori"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux per a la computació d'empreses"
#~ msgid "Debian for non-profit organisations"
#~ msgstr "Debian per organitzacions sense anim de lucre"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux per a la computació d'empreses"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "El sistema operatiu universal com el seu escriptori"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Sistema d'instal·lació per a «stable»"
+#~ msgid "Accountant"
+#~ msgstr "Contable"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Arxius de les llistes de correu"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Coordinació de signatura de claus"
#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
#~ msgstr ""
-#~ "Aquest encara no és un projecte intern oficial de Debian però ha anunciat "
-#~ "la intenció de ser-ho."
+#~ "Els noms individuals dels administradors dels dimonis de compilació es "
+#~ "poden trobar a <a href=\"http://www.buildd.net\">http://www.buildd.net</"
+#~ "a>. Seleccioneu una arquitecture i una distribució per veure els dimonis "
+#~ "de compilació disponibles i els seus administradors."
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Distribució multimedia de Debian"
+#~ 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 ""
+#~ "Els administradors responsables dels dimonis de compilació per a una "
+#~ "arquitectura particular, es poden contactar a <genericemail arch@buildd."
+#~ "debian.org>, per exemple <genericemail i386@buildd.debian.org>."
-#~ msgid "Release Wizard"
-#~ msgstr "Mag de llançaments"
+#~ msgid "Marketing Team"
+#~ msgstr "Equip de màrqueting"
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "Assistents de llançaments per a «stable»"
+#~ msgid "Handhelds"
+#~ msgstr "Ordinadors de ma"
-#~ msgid "Release Assistants"
-#~ msgstr "Assistents de llançament"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Equip de llançaments per a «stable»"
-#~ msgid "APT Team"
-#~ msgstr "Equip APT"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Distribució de Debian adaptada"
-#~ msgid "Vendors"
-#~ msgstr "Venedors"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projecte d'auditoria de seguretat"
-#~ msgid "Volatile Team"
-#~ msgstr "Equip de llançament da la versió volàtil"
+#~ msgid "Testing Security Team"
+#~ msgstr "Equip de seguretat de Proves"
diff --git a/catalan/po/others.ca.po b/catalan/po/others.ca.po
index 6c1caf8950b..791009c8648 100644
--- a/catalan/po/others.ca.po
+++ b/catalan/po/others.ca.po
@@ -120,8 +120,8 @@ msgid ""
"See <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</"
"a> (only available in Spanish) for more information."
msgstr ""
-"Vegeu <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</"
-"a> (només disponible en castellà) per a més informació."
+"Vegeu <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/"
+"</a> (només disponible en castellà) per a més informació."
#: ../../english/distrib/pre-installed.defs:18
#, fuzzy
@@ -173,26 +173,6 @@ msgstr "[Debian] (botó petit)"
msgid "same as the above"
msgstr "igual que l'anterior"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Sol·licitat:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Qui:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Arquitectura:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Especificacions:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "A on:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Productes"
@@ -237,24 +217,36 @@ msgstr "insignies"
msgid "basketball goals"
msgstr "cistelles de bàsket"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "arracades"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "maletins"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
#, fuzzy
#| msgid "suitcases"
msgid "pillowcases"
msgstr "maletins"
+#: ../../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 ""
@@ -330,70 +322,68 @@ msgstr "Versió"
msgid "URL"
msgstr "URL"
-#~ msgid "Name:"
-#~ msgstr "Nom:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
-#~ msgid "Company:"
-#~ msgstr "Companyia:"
+#~ msgid "Previous Talks:"
+#~ msgstr "Conferencies prèvies:"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Languages:"
+#~ msgstr "Llenguatge:"
-#~ msgid "or"
-#~ msgstr "o"
+#~ msgid "Location:"
+#~ msgstr "Localització:"
-#~ msgid "Email:"
-#~ msgstr "Correu:"
+#~ msgid "Topics:"
+#~ msgstr "Temes:"
-#~ msgid "Rates:"
-#~ msgstr "Tarifa:"
+#~ msgid "closed"
+#~ msgstr "tancada"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Disponible sense límit geogràfic"
+#~ msgid "open"
+#~ msgstr "oberta"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "<total_consultant> consultors de Debian llistats en <total_country> "
-#~ "païssos per tot el món."
+#~ msgid "Unsubscribe"
+#~ msgstr "Dóna'm de baixa"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Subscripció a les llistes de correu"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr ""
+#~ "Si us plau, seleccioneu a quines llistes us desitgeu donar-vos de baixa:"
#~ 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 ""
#~ "Mireu la pàgina de les <a href=\"./#subunsub\">llistes de correu</a> per "
-#~ "a informació de com us podeu subscriure usant el correu. També hi ha "
-#~ "disponible un <a href=\"unsubscribe\">formulari web per a donar-vos de "
-#~ "baixa</a> d'aquestes llistes de correu. "
+#~ "a informació de com us podeu dessubscriure usant el correu. També hi ha "
+#~ "disponible un <a href=\"subscribe\">formulari web per a donar-vos d'alta</"
+#~ "a> d'aquestes llistes de correu. "
+
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Desubscripció de les llistes de correu"
#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Tingueu en compte que la major part de les llistes de correu de Debian, "
-#~ "són forums publics. Qualsevol correu que s'hi envíi es publicarà als "
-#~ "arxius publics de les llistes de correu i s'indexarà pels motors de "
-#~ "cerques. Us haurieu de suscriure a les llistes de correu de Debian "
-#~ "emprant una adreça de correu que no us importi es façi publica."
+#~ "Si us plau respecteu la <a href=\"./#ads\">política d'anuncis en les "
+#~ "llistes de correu Debian</a>."
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Si us plau, seleccioneu a quines llistes us desitgeu donar d'alta:"
+#~ msgid "Clear"
+#~ msgstr "Netejar"
-#~ msgid "No description given"
-#~ msgstr "Descripció no disponible"
+#~ msgid "Subscribe"
+#~ msgstr "Subscriu-m'hi"
-#~ msgid "Moderated:"
-#~ msgstr "Moderada:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "La vostra direcció de correu:"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Enviament de missatges només permés a subscriptors."
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "és de sols lectura, versió resumida."
+
+#~ msgid "Subscription:"
+#~ msgstr "Subscripció:"
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -401,65 +391,82 @@ msgstr "URL"
#~ "Aquesta llista de correu només acceptarà missatges signats per un "
#~ "desenvolupador de Debian."
-#~ msgid "Subscription:"
-#~ msgstr "Subscripció:"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "és de sols lectura, versió resumida."
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Enviament de missatges només permés a subscriptors."
-#~ msgid "Your E-Mail address:"
-#~ msgstr "La vostra direcció de correu:"
+#~ msgid "Moderated:"
+#~ msgstr "Moderada:"
-#~ msgid "Subscribe"
-#~ msgstr "Subscriu-m'hi"
+#~ msgid "No description given"
+#~ msgstr "Descripció no disponible"
-#~ msgid "Clear"
-#~ msgstr "Netejar"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Si us plau, seleccioneu a quines llistes us desitgeu donar d'alta:"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
#~ msgstr ""
-#~ "Si us plau respecteu la <a href=\"./#ads\">política d'anuncis en les "
-#~ "llistes de correu Debian</a>."
-
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Desubscripció de les llistes de correu"
+#~ "Tingueu en compte que la major part de les llistes de correu de Debian, "
+#~ "són forums publics. Qualsevol correu que s'hi envíi es publicarà als "
+#~ "arxius publics de les llistes de correu i s'indexarà pels motors de "
+#~ "cerques. Us haurieu de suscriure a les llistes de correu de Debian "
+#~ "emprant una adreça de correu que no us importi es façi publica."
#~ 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. "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
#~ "Mireu la pàgina de les <a href=\"./#subunsub\">llistes de correu</a> per "
-#~ "a informació de com us podeu dessubscriure usant el correu. També hi ha "
-#~ "disponible un <a href=\"subscribe\">formulari web per a donar-vos d'alta</"
-#~ "a> d'aquestes llistes de correu. "
+#~ "a informació de com us podeu subscriure usant el correu. També hi ha "
+#~ "disponible un <a href=\"unsubscribe\">formulari web per a donar-vos de "
+#~ "baixa</a> d'aquestes llistes de correu. "
-#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Subscripció a les llistes de correu"
+
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "Si us plau, seleccioneu a quines llistes us desitgeu donar-vos de baixa:"
+#~ "<total_consultant> consultors de Debian llistats en <total_country> "
+#~ "païssos per tot el món."
-#~ msgid "Unsubscribe"
-#~ msgstr "Dóna'm de baixa"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Disponible sense límit geogràfic"
-#~ msgid "open"
-#~ msgstr "oberta"
+#~ msgid "Rates:"
+#~ msgstr "Tarifa:"
-#~ msgid "closed"
-#~ msgstr "tancada"
+#~ msgid "Email:"
+#~ msgstr "Correu:"
-#~ msgid "Topics:"
-#~ msgstr "Temes:"
+#~ msgid "or"
+#~ msgstr "o"
-#~ msgid "Location:"
-#~ msgstr "Localització:"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "Languages:"
-#~ msgstr "Llenguatge:"
+#~ msgid "Company:"
+#~ msgstr "Companyia:"
-#~ msgid "Previous Talks:"
-#~ msgstr "Conferencies prèvies:"
+#~ msgid "Name:"
+#~ msgstr "Nom:"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Where:"
+#~ msgstr "A on:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Especificacions:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Arquitectura:"
+
+#~ msgid "Who:"
+#~ msgstr "Qui:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Sol·licitat:"
diff --git a/catalan/po/ports.ca.po b/catalan/po/ports.ca.po
index 351d7554bbd..7f3cc4b58e8 100644
--- a/catalan/po/ports.ca.po
+++ b/catalan/po/ports.ca.po
@@ -118,134 +118,134 @@ msgstr "Debian per a PowerPC"
msgid "Debian for Sparc"
msgstr "Debian per a Sparc"
-#~ msgid "Vendor/Name"
-#~ msgstr "Venedor/Nom"
-
-#~ msgid "Date announced"
-#~ msgstr "Data d'anunci"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian per a portàtils"
-#~ msgid "Clock"
-#~ msgstr "Rellotge"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian per a AMD64"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian per a ARM"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian per a Beowulf"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "Main"
+#~ msgstr "Principal"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Specials"
-#~ msgstr "Especials"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian per a Motorola 680x0"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "Sense FPU (R2010), memòries cau externes"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian per a MIPS"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "Sense FPU (R3010)"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian per a S/390"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Memòria cau L1 indexada virtualment, controladora de memòria cau L2"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian per a Sparc64"
-#~ msgid "External L1 cache"
-#~ msgstr "Memòria cau L1 externa"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, controladora LCD, Compact Flash, UART, port paral·lel, RTC, "
+#~ "Keyboard, USB, Touchpad, Audio"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "CPU amb múltiples xips"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Compact Flash, UART, port paral·lel, RTC, Audio, PCIC"
#~ msgid ""
-#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
-#~ "I2C, Watchdog"
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
#~ msgstr ""
-#~ "Mips16 amb extensions isa, sense FPU, 512k flash, 16k ram, DMAC, UART, "
-#~ "Timer, I2C, Watchdog"
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, port "
+#~ "paral·lel"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, controladora LCD"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 memòria cau L2 en placa"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, bus extern de 64 bits, memòria cau L2 externa"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "Sense FPU, SDRAMC, ROMC, Timer, PCMCIA, controladora LCD, IrDA"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, bus extern de 64 bits"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr ""
-#~ "Sense FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, controladora LCD, IrDA"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, bus extern de 32 bits"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "Sense FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 ethernet 10/100, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
#~ msgstr "Sense FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 ethernet 10/100, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "Sense FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, bus extern de 32 bits"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr ""
+#~ "Sense FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, controladora LCD, IrDA"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, bus extern de 64 bits"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "Sense FPU, SDRAMC, ROMC, Timer, PCMCIA, controladora LCD, IrDA"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, bus extern de 64 bits, memòria cau L2 externa"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 memòria cau L2 en placa"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "Sense FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, controladora LCD"
#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
+#~ "I2C, Watchdog"
#~ msgstr ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, port "
-#~ "paral·lel"
+#~ "Mips16 amb extensions isa, sense FPU, 512k flash, 16k ram, DMAC, UART, "
+#~ "Timer, I2C, Watchdog"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Compact Flash, UART, port paral·lel, RTC, Audio, PCIC"
+#~ msgid "Multiple chip CPU"
+#~ msgstr "CPU amb múltiples xips"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, controladora LCD, Compact Flash, UART, port paral·lel, RTC, "
-#~ "Keyboard, USB, Touchpad, Audio"
+#~ msgid "External L1 cache"
+#~ msgstr "Memòria cau L1 externa"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian per a Sparc64"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Memòria cau L1 indexada virtualment, controladora de memòria cau L2"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian per a S/390"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "Sense FPU (R3010)"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian per a MIPS"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "Sense FPU (R2010), memòries cau externes"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian per a Motorola 680x0"
+#~ msgid "Specials"
+#~ msgstr "Especials"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "Main"
-#~ msgstr "Principal"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian per a Beowulf"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian per a ARM"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian per a AMD64"
+#~ msgid "Clock"
+#~ msgstr "Rellotge"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian per a portàtils"
+#~ msgid "Date announced"
+#~ msgstr "Data d'anunci"
+
+#~ msgid "Vendor/Name"
+#~ msgstr "Venedor/Nom"
diff --git a/catalan/po/templates.ca.po b/catalan/po/templates.ca.po
index 66eb28b7c7a..be318d5f45c 100644
--- a/catalan/po/templates.ca.po
+++ b/catalan/po/templates.ca.po
@@ -72,7 +72,7 @@ msgstr ""
"Tornar a la pàgina principal del <a href=\"m4_HOME/\">Projecte Debian</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 "Pàgina principal"
@@ -113,7 +113,7 @@ msgid "Support"
msgstr "Suport"
#: ../../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 "Racó del desenvolupador"
@@ -150,7 +150,7 @@ msgid "Miscellaneous"
msgstr "Miscel·lània"
#: ../../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 "Obtenir Debian"
@@ -206,7 +206,7 @@ msgstr "en la versió 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -225,25 +225,25 @@ msgstr ""
"a>.Per a altre informació de contacte, vegeu la <a href=\"m4_HOME/contact"
"\">pàgina de contacte</a> de Debian."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Última modificació"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Copyright"
-#: ../../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 ""
-#: ../../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 ""
"Vegeu <a href=\"m4_HOME/license\" rel=\"copyright\">els termes de la "
"llicència</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."
@@ -307,140 +307,150 @@ msgid "Debian Books"
msgstr "Llibres sobre Debian"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "Ajudeu a Debian"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Arxius de llistes de correu"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Llistes de correu"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Contracte social"
-#: ../../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 "Visiteu el lloc del patrocinador"
-#: ../../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 - El sistema operatiu universal"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Mapa de les pàgines al lloc de Debian"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Base de dades dels desenvolupadors"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Llibres sobre Debian"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Manual de normes de Debian"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Referència per a desenvolupadors de Debian"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Guia per a nous Desenvolupadors"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Errors crítics per a la publicació de noves versions"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Informes de Lintian"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Arxius de llistes de correu per a usuaris"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Arxius de llistes de correu per a desenvolupadors"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Arxius de llistes de correu per a i18n/l10n"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Arxius de llistes de correu per als ports"
-#: ../../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 "Arxius de llistes de correu del sistema de seguiment d'errors"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Arxius de llistes de correu variades"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Programari lliure"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Desenvolupament"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Ajudeu a Debian"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Informes d'error"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Ports/Arquitectures"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Manual d'instal·lació"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Venedors de CD"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "Imatges ISO de CD/USB"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Instal·lació per xarxa"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Preinstal·lat"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Projecte Debian-Edu"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr "Alioth &ndash; GForge de Debian"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "Control de qualitat"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Sistema de seguiment de paquets"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Inspecció rapida dels paquets dels desenvolupadors de Debian"
@@ -526,570 +536,570 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Tornar a la <a href=\"./\">pàgina de Qui fa servir Debian?</a>."
-#~ msgid "More information"
-#~ msgstr "Més informació"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Properes atraccions"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Heu trobat algun problema amb el disseny del lloc web?"
-#~ msgid "link may no longer be valid"
-#~ msgstr "potser l'enllaç ja no és vàlid"
+#~ msgid "Report it!"
+#~ msgstr "Informa'n!"
-#~ msgid "When"
-#~ msgstr "Quan"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Tria un servidor a prop teu: &nbsp;"
-#~ msgid "Where"
-#~ msgstr "On"
+#~ msgid "More information:"
+#~ msgstr "Més informació:"
-#~ msgid "More Info"
-#~ msgstr "Més informació"
+#~ msgid "Taken by:"
+#~ msgstr "Agafat per:"
-#~ msgid "Debian Involvement"
-#~ msgstr "Participació de Debian"
+#~ msgid "Nobody"
+#~ msgstr "Ningú"
-#~ msgid "Main Coordinator"
-#~ msgstr "Coordinador principal"
+#~ msgid "Rating:"
+#~ msgstr "Puntuació:"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Coordinador del</th><th>Projecte</th>"
+#~ msgid "List of Consultants"
+#~ msgstr "Llista de consultors"
-#~ msgid "Related Links"
-#~ msgstr "Enllaços relacionats"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Tornar a la <a href=\"./\">pàgina de consultors de Debian</a>."
-#~ msgid "Latest News"
-#~ msgstr "Darreres notícies"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Download calendar entry"
-#~ msgstr "Descarrega l'entrada del calendari"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Descàrrega amb Jigdo"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Tornar a: altres <a href=\"./\">notícies de Debian</a> || la <a href="
-#~ "\"m4_HOME/\">pàgina principal del projecte Debian</a>."
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Descàrrega per HTTP/FTP"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (enllaç trencat)"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Compra CD o DVD"
-#, 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>."
-#~ msgstr ""
-#~ "Per a rebre aquest butlletí setmanal en la vostra bústia, <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscriviu-vos a la llista "
-#~ "de correu debian-news.</a>"
+#~ msgid "Network Install"
+#~ msgstr "Instal·lació per xarxa"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "Els <a href=\"../../\">números anteriors</a> d'aquest butlletí estan "
-#~ "disponibles."
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Descàrrega"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />L'editor de les notícies setmanals de Debian és "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Misc"
-#, 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>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Els editors de les notícies setmanals de Debian són "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Treball artístic"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
-#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />L'editor d'aquest número de les notícies "
-#~ "setmanals de Debian és <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Replicant"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~| "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Els editors d'aquest número de les notícies "
-#~ "setmanals de Debian són <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Repliques rsync"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Ha estat traduït per %s."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Descàrrega amb Torrent"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Ha estat traduït per %s."
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Informació de llançament d'imatge"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Ha estat traduït per %s."
+#~ msgid "Debian CD team"
+#~ msgstr "Equip de CD de Debian"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Ha estat traduït per %s."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_en_cd"
-#~ msgid "List of Speakers"
-#~ msgstr "Llista de conferenciants"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />pmf"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Tornar a la <a href=\"./\">pàgina de conferenciants de Debian</a>."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ 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 ""
-#~ "Per a rebre aquest butlletí setmanal en la vostra bústia, <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscriviu-vos a la llista "
-#~ "de correu debian-news.</a>"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />L'editor de les notícies setmanals de Debian és "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "buy"
+#~ msgstr "compra"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Els editors de les notícies setmanals de Debian són "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "net_install"
+#~ msgstr "instal·lació_per_xarxa"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />L'editor d'aquest número de les notícies "
-#~ "setmanals de Debian és <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />misc"
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"plural\" />Els editors d'aquest número de les notícies "
-#~ "setmanals de Debian són <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<a href=\"/MailingLists/disclaimer\">Llista de correu publica</a> en "
+#~ "anglès per a CDs/DVDs:"
-#~ msgid "No requests for adoption"
-#~ msgstr "Sense demandes d'adopció"
+#~ msgid "Date"
+#~ msgstr "Data"
-#~ msgid "No orphaned packages"
-#~ msgstr "Sense paquets deixats orfes"
+#~ msgid "Time Line"
+#~ msgstr "Línia temporal"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Sense paquets esperant ser adoptats"
+#~ msgid "Nominations"
+#~ msgstr "Nominacions"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Sense paquets esperant ser empaquetats"
+#~ msgid "Debate"
+#~ msgstr "Debat"
-#~ msgid "No Requested packages"
-#~ msgstr "Sense paquets demanats"
+#~ msgid "Platforms"
+#~ msgstr "Plataformes"
-#~ msgid "No help requested"
-#~ msgstr "Sense demandes d'ajuda"
+#~ msgid "Proposer"
+#~ msgstr "Proponent"
-#~ msgid "in adoption since today."
-#~ msgstr "en adopció des de avui."
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Proponent de la proposta A"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "en adopció des de ahir."
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Proponent de la proposta B"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s dies en adopció."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Proponent de la proposta C"
-#~ msgid "in preparation since today."
-#~ msgstr "en preparació des de avui."
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Proponent de la proposta D"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "en preparació des de ahir."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Proponent de la proposta E"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s dies en preparació."
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Proponent de la proposta F"
-#~ msgid "requested today."
-#~ msgstr "demanat avui."
+#~ msgid "Seconds"
+#~ msgstr "Els que secunden"
-#~ msgid "requested yesterday."
-#~ msgstr "demanat ahir."
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Els que secunden la proposta A"
-#~ msgid "requested %s days ago."
-#~ msgstr "demanat %s dies enrere."
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Els que secunden la proposta B"
-#~ msgid "package info"
-#~ msgstr "informació del paquet"
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Els que secunden la proposta C"
-#~ msgid "License Information"
-#~ msgstr "Informació de llicències"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Els que secunden la proposta D"
-#~ msgid "DLS Index"
-#~ msgstr "Index DLS"
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Els que secunden la proposta E"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Els que secunden la proposta F"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG PMF"
+#~ msgid "Opposition"
+#~ msgstr "Oposició"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Arxiu de debian-legal"
+#~ msgid "Text"
+#~ msgstr "Text"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Proposal A"
+#~ msgstr "Proposta A"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, versió %s: %s"
+#~ msgid "Proposal B"
+#~ msgstr "Proposta B"
-#~ msgid "Date published"
-#~ msgstr "Data de publicació"
+#~ msgid "Proposal C"
+#~ msgstr "Proposta C"
-#~ msgid "License"
-#~ msgstr "Llicència"
+#~ msgid "Proposal D"
+#~ msgstr "Proposta D"
-#~ msgid "Version"
-#~ msgstr "Versió"
+#~ msgid "Proposal E"
+#~ msgstr "Proposta E"
-#~ msgid "Summary"
-#~ msgstr "Resum"
+#~ msgid "Proposal F"
+#~ msgstr "Proposta F"
-#~ msgid "Justification"
-#~ msgstr "Justificació"
+#~ msgid "Choices"
+#~ msgstr "Opcions"
-#~ msgid "Discussion"
-#~ msgstr "Discussió"
+#~ msgid "Amendment Proposer"
+#~ msgstr "Proponent de l'esmena"
-#~ msgid "Original Summary"
-#~ msgstr "Resum original"
+#~ msgid "Amendment Seconds"
+#~ msgstr "Els que secunden l'esmena"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "El resum original de <summary-author/> es pot trobar en els <a href="
-#~ "\"<summary-url/>\">arxius de la llista</a>."
+#~ msgid "Amendment Text"
+#~ msgstr "Text de l'esmena"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Aquest resum va ser preparat per <summary-author/>."
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Proponent de l'esmena A"
-#~ msgid "License text (translated)"
-#~ msgstr "Text de la llicència (traduït)"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Els que secunden l'esmena A"
-#~ msgid "License text"
-#~ msgstr "Text de la llicència"
+#~ msgid "Amendment Text A"
+#~ msgstr "Text de l'esmena A"
-#~ msgid "free"
-#~ msgstr "lliure"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Proponent de l'esmena B"
-#~ msgid "non-free"
-#~ msgstr "no-lliure"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Els que secunden l'esmena B"
-#~ msgid "not redistributable"
-#~ msgstr "no redistribuïble"
+#~ msgid "Amendment Text B"
+#~ msgstr "Text de l'esmena B"
-#~ msgid "Free"
-#~ msgstr "Lliure"
+#~ msgid "Amendments"
+#~ msgstr "Esmenes"
-#~ msgid "Non-Free"
-#~ msgstr "No-lliure"
+#~ msgid "Proceedings"
+#~ msgstr "Actes"
-#~ msgid "Not Redistributable"
-#~ msgstr "No redistribuïble"
+#~ msgid "Majority Requirement"
+#~ msgstr "Requeriments de majoria"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Vegeu la pagina d'<a href=\"./\">informació de llicències</a> per tal a "
-#~ "tenir una idea dels Resums de Llicències de Debian (DLS)."
+#~ msgid "Data and Statistics"
+#~ msgstr "Dades i estadístiques"
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Kit de pseudo imatge"
+#~ msgid "Quorum"
+#~ msgstr "Quòrum"
-#~ msgid "Vote"
-#~ msgstr "Votar"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Discussió mínima"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Llegir un resultat"
+#~ msgid "Ballot"
+#~ msgstr "Butlleta"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Donar&nbsp;suport&nbsp;a&nbsp;una&nbsp;proposta"
+#~ msgid "Forum"
+#~ msgstr "Fòrum"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Esmenar&nbsp;una&nbsp;proposta"
+#~ msgid "Outcome"
+#~ msgstr "Resultat"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Enviar&nbsp;proposta"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "En&nbsp;espera&nbsp;de&nbsp;patrocinadors"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Com"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "En&nbsp;discussió"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Pàgina&nbsp;principal&nbsp;de&nbsp;votacions"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Votació&nbsp;en&nbsp;curs"
-#~ msgid "Other"
-#~ msgstr "Altres"
+#~ msgid "Decided"
+#~ msgstr "Decidida"
#~ msgid "Withdrawn"
#~ msgstr "Retirada"
-#~ msgid "Decided"
-#~ msgstr "Decidida"
+#~ msgid "Other"
+#~ msgstr "Altres"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Votació&nbsp;en&nbsp;curs"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Pàgina&nbsp;principal&nbsp;de&nbsp;votacions"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "En&nbsp;discussió"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Com"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "En&nbsp;espera&nbsp;de&nbsp;patrocinadors"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Enviar&nbsp;proposta"
-#~ msgid "Outcome"
-#~ msgstr "Resultat"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Esmenar&nbsp;una&nbsp;proposta"
-#~ msgid "Forum"
-#~ msgstr "Fòrum"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Donar&nbsp;suport&nbsp;a&nbsp;una&nbsp;proposta"
-#~ msgid "Ballot"
-#~ msgstr "Butlleta"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Llegir un resultat"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Discussió mínima"
+#~ msgid "Vote"
+#~ msgstr "Votar"
-#~ msgid "Quorum"
-#~ msgstr "Quòrum"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Kit de pseudo imatge"
-#~ msgid "Data and Statistics"
-#~ msgstr "Dades i estadístiques"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Vegeu la pagina d'<a href=\"./\">informació de llicències</a> per tal a "
+#~ "tenir una idea dels Resums de Llicències de Debian (DLS)."
-#~ msgid "Majority Requirement"
-#~ msgstr "Requeriments de majoria"
+#~ msgid "Not Redistributable"
+#~ msgstr "No redistribuïble"
-#~ msgid "Proceedings"
-#~ msgstr "Actes"
+#~ msgid "Non-Free"
+#~ msgstr "No-lliure"
-#~ msgid "Amendments"
-#~ msgstr "Esmenes"
+#~ msgid "Free"
+#~ msgstr "Lliure"
-#~ msgid "Amendment Text B"
-#~ msgstr "Text de l'esmena B"
+#~ msgid "not redistributable"
+#~ msgstr "no redistribuïble"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Els que secunden l'esmena B"
+#~ msgid "non-free"
+#~ msgstr "no-lliure"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Proponent de l'esmena B"
+#~ msgid "free"
+#~ msgstr "lliure"
-#~ msgid "Amendment Text A"
-#~ msgstr "Text de l'esmena A"
+#~ msgid "License text"
+#~ msgstr "Text de la llicència"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Els que secunden l'esmena A"
+#~ msgid "License text (translated)"
+#~ msgstr "Text de la llicència (traduït)"
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Proponent de l'esmena A"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Aquest resum va ser preparat per <summary-author/>."
-#~ msgid "Amendment Text"
-#~ msgstr "Text de l'esmena"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "El resum original de <summary-author/> es pot trobar en els <a href="
+#~ "\"<summary-url/>\">arxius de la llista</a>."
-#~ msgid "Amendment Seconds"
-#~ msgstr "Els que secunden l'esmena"
+#~ msgid "Original Summary"
+#~ msgstr "Resum original"
-#~ msgid "Amendment Proposer"
-#~ msgstr "Proponent de l'esmena"
+#~ msgid "Discussion"
+#~ msgstr "Discussió"
-#~ msgid "Choices"
-#~ msgstr "Opcions"
+#~ msgid "Justification"
+#~ msgstr "Justificació"
-#~ msgid "Proposal F"
-#~ msgstr "Proposta F"
+#~ msgid "Summary"
+#~ msgstr "Resum"
-#~ msgid "Proposal E"
-#~ msgstr "Proposta E"
+#~ msgid "Version"
+#~ msgstr "Versió"
-#~ msgid "Proposal D"
-#~ msgstr "Proposta D"
+#~ msgid "License"
+#~ msgstr "Llicència"
-#~ msgid "Proposal C"
-#~ msgstr "Proposta C"
+#~ msgid "Date published"
+#~ msgstr "Data de publicació"
-#~ msgid "Proposal B"
-#~ msgstr "Proposta B"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, versió %s: %s"
-#~ msgid "Proposal A"
-#~ msgstr "Proposta A"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Text"
-#~ msgstr "Text"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Arxiu de debian-legal"
-#~ msgid "Opposition"
-#~ msgstr "Oposició"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG PMF"
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Els que secunden la proposta F"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Els que secunden la proposta E"
+#~ msgid "DLS Index"
+#~ msgstr "Index DLS"
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Els que secunden la proposta D"
+#~ msgid "License Information"
+#~ msgstr "Informació de llicències"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Els que secunden la proposta C"
+#~ msgid "package info"
+#~ msgstr "informació del paquet"
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Els que secunden la proposta B"
+#~ msgid "requested %s days ago."
+#~ msgstr "demanat %s dies enrere."
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Els que secunden la proposta A"
+#~ msgid "requested yesterday."
+#~ msgstr "demanat ahir."
-#~ msgid "Seconds"
-#~ msgstr "Els que secunden"
+#~ msgid "requested today."
+#~ msgstr "demanat avui."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Proponent de la proposta F"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s dies en preparació."
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Proponent de la proposta E"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "en preparació des de ahir."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Proponent de la proposta D"
+#~ msgid "in preparation since today."
+#~ msgstr "en preparació des de avui."
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Proponent de la proposta C"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s dies en adopció."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Proponent de la proposta B"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "en adopció des de ahir."
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Proponent de la proposta A"
+#~ msgid "in adoption since today."
+#~ msgstr "en adopció des de avui."
-#~ msgid "Proposer"
-#~ msgstr "Proponent"
+#~ msgid "No help requested"
+#~ msgstr "Sense demandes d'ajuda"
-#~ msgid "Platforms"
-#~ msgstr "Plataformes"
+#~ msgid "No Requested packages"
+#~ msgstr "Sense paquets demanats"
-#~ msgid "Debate"
-#~ msgstr "Debat"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Sense paquets esperant ser empaquetats"
-#~ msgid "Nominations"
-#~ msgstr "Nominacions"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Sense paquets esperant ser adoptats"
-#~ msgid "Time Line"
-#~ msgstr "Línia temporal"
+#~ msgid "No orphaned packages"
+#~ msgstr "Sense paquets deixats orfes"
-#~ msgid "Date"
-#~ msgstr "Data"
+#~ msgid "No requests for adoption"
+#~ msgstr "Sense demandes d'adopció"
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "<a href=\"/MailingLists/disclaimer\">Llista de correu publica</a> en "
-#~ "anglès per a CDs/DVDs:"
+#~ "<void id=\"plural\" />Els editors d'aquest número de les notícies "
+#~ "setmanals de Debian són <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />misc"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />L'editor d'aquest número de les notícies "
+#~ "setmanals de Debian és <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "net_install"
-#~ msgstr "instal·lació_per_xarxa"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Els editors de les notícies setmanals de Debian són "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "buy"
-#~ msgstr "compra"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />L'editor de les notícies setmanals de Debian és "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ 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 ""
+#~ "Per a rebre aquest butlletí setmanal en la vostra bústia, <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscriviu-vos a la llista "
+#~ "de correu debian-news.</a>"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Tornar a la <a href=\"./\">pàgina de conferenciants de Debian</a>."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />pmf"
+#~ msgid "List of Speakers"
+#~ msgstr "Llista de conferenciants"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_en_cd"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Ha estat traduït per %s."
-#~ msgid "Debian CD team"
-#~ msgstr "Equip de CD de Debian"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Ha estat traduït per %s."
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Informació de llançament d'imatge"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Ha estat traduït per %s."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Descàrrega amb Torrent"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Ha estat traduït per %s."
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Repliques rsync"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~| "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Els editors d'aquest número de les notícies "
+#~ "setmanals de Debian són <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Replicant"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
+#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />L'editor d'aquest número de les notícies "
+#~ "setmanals de Debian és <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Treball artístic"
+#, 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>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Els editors de les notícies setmanals de Debian són "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Misc"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />L'editor de les notícies setmanals de Debian és "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Descàrrega"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "Els <a href=\"../../\">números anteriors</a> d'aquest butlletí estan "
+#~ "disponibles."
-#~ msgid "Network Install"
-#~ msgstr "Instal·lació per xarxa"
+#, 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>."
+#~ msgstr ""
+#~ "Per a rebre aquest butlletí setmanal en la vostra bústia, <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscriviu-vos a la llista "
+#~ "de correu debian-news.</a>"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Compra CD o DVD"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (enllaç trencat)"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Descàrrega per HTTP/FTP"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Tornar a: altres <a href=\"./\">notícies de Debian</a> || la <a href="
+#~ "\"m4_HOME/\">pàgina principal del projecte Debian</a>."
-#~ msgid "Download with Jigdo"
-#~ msgstr "Descàrrega amb Jigdo"
+#~ msgid "Download calendar entry"
+#~ msgstr "Descarrega l'entrada del calendari"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Latest News"
+#~ msgstr "Darreres notícies"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Tornar a la <a href=\"./\">pàgina de consultors de Debian</a>."
+#~ msgid "Related Links"
+#~ msgstr "Enllaços relacionats"
-#~ msgid "List of Consultants"
-#~ msgstr "Llista de consultors"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Coordinador del</th><th>Projecte</th>"
-#~ msgid "Rating:"
-#~ msgstr "Puntuació:"
+#~ msgid "Main Coordinator"
+#~ msgstr "Coordinador principal"
-#~ msgid "Nobody"
-#~ msgstr "Ningú"
+#~ msgid "Debian Involvement"
+#~ msgstr "Participació de Debian"
-#~ msgid "Taken by:"
-#~ msgstr "Agafat per:"
+#~ msgid "More Info"
+#~ msgstr "Més informació"
-#~ msgid "More information:"
-#~ msgstr "Més informació:"
+#~ msgid "Where"
+#~ msgstr "On"
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Tria un servidor a prop teu: &nbsp;"
+#~ msgid "When"
+#~ msgstr "Quan"
-#~ msgid "Report it!"
-#~ msgstr "Informa'n!"
+#~ msgid "link may no longer be valid"
+#~ msgstr "potser l'enllaç ja no és vàlid"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Heu trobat algun problema amb el disseny del lloc web?"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Properes atraccions"
+
+#~ msgid "More information"
+#~ msgstr "Més informació"
diff --git a/catalan/po/vendors.ca.po b/catalan/po/vendors.ca.po
index 2dc86c961b3..d20c508b21d 100644
--- a/catalan/po/vendors.ca.po
+++ b/catalan/po/vendors.ca.po
@@ -14,137 +14,130 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Venedor:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL de la pàgina sobre Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Permet contribucions a Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Estat:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Enviaments internacionals:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "correu-e:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Tipus de CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Tipus de DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Arquitectures:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Venedor"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Permet contribucions a Debian"
-#: ../../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 "Arquitectures"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Enviaments internacionals"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Contacte"
#. ###################
#. 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 "Pàgina del venedor"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "pàgina"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "correu-e"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "dins d'Europa"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "A algunes àrees"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "font"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "i"
-#~ msgid "Official CD"
-#~ msgstr "CD Oficial"
+#~ msgid "updated monthly"
+#~ msgstr "actualitzat mensualment"
-#~ msgid "Official DVD"
-#~ msgstr "DVD Oficial"
+#~ msgid "updated twice weekly"
+#~ msgstr "actualitzat dos vegades a la setmana"
-#~ msgid "Development Snapshot"
-#~ msgstr "Instantània de desenvolupament"
+#~ msgid "updated weekly"
+#~ msgstr "actualitzat semanalment"
-#~ msgid "Vendor Release"
-#~ msgstr "Versió del venedor"
+#~ msgid "reseller"
+#~ msgstr "revenedor"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Mùltiples distribucions"
+#~ msgid "reseller of $var"
+#~ msgstr "revenedor de $var"
-#~ msgid "non-US included"
-#~ msgstr "non-US inclòs"
+#~ msgid "Custom Release"
+#~ msgstr "Versió personalitzada"
-#~ msgid "non-free included"
-#~ msgstr "non-free inclòs"
+#~ msgid "vendor additions"
+#~ msgstr "afegiments del venedor"
#~ msgid "contrib included"
#~ msgstr "contrib inclòs"
-#~ msgid "vendor additions"
-#~ msgstr "afegiments del venedor"
+#~ msgid "non-free included"
+#~ msgstr "non-free inclòs"
-#~ msgid "Custom Release"
-#~ msgstr "Versió personalitzada"
+#~ msgid "non-US included"
+#~ msgstr "non-US inclòs"
-#~ msgid "reseller of $var"
-#~ msgstr "revenedor de $var"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Mùltiples distribucions"
-#~ msgid "reseller"
-#~ msgstr "revenedor"
+#~ msgid "Vendor Release"
+#~ msgstr "Versió del venedor"
-#~ msgid "updated weekly"
-#~ msgstr "actualitzat semanalment"
+#~ msgid "Development Snapshot"
+#~ msgstr "Instantània de desenvolupament"
-#~ msgid "updated twice weekly"
-#~ msgstr "actualitzat dos vegades a la setmana"
+#~ msgid "Official DVD"
+#~ msgstr "DVD Oficial"
-#~ msgid "updated monthly"
-#~ msgstr "actualitzat mensualment"
+#~ msgid "Official CD"
+#~ msgstr "CD Oficial"
+
+#~ msgid "Architectures:"
+#~ msgstr "Arquitectures:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Tipus de DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Tipus de CD:"
+
+#~ msgid "email:"
+#~ msgstr "correu-e:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Enviaments internacionals:"
+
+#~ msgid "Country:"
+#~ msgstr "Estat:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Permet contribucions a Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL de la pàgina sobre Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Venedor:"
diff --git a/catalan/po/vote.ca.po b/catalan/po/vote.ca.po
index 5512012b4a8..6bede2bef47 100644
--- a/catalan/po/vote.ca.po
+++ b/catalan/po/vote.ca.po
@@ -23,229 +23,251 @@ msgid "Time Line"
msgstr "Línia temporal"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Nominacions"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Debat"
-#: ../../english/template/debian/votebar.wml:25
+#: ../../english/template/debian/votebar.wml:28
msgid "Platforms"
msgstr "Plataformes"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Proposer"
msgstr "Proponent"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "Proponent de la proposta A"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "Proponent de la proposta B"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "Proponent de la proposta C"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "Proponent de la proposta D"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "Proponent de la proposta E"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "Proponent de la proposta F"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Seconds"
msgstr "Els que secunden"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
msgid "Proposal A Seconds"
msgstr "Els que secunden la proposta A"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "Els que secunden la proposta B"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "Els que secunden la proposta C"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "Els que secunden la proposta D"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "Els que secunden la proposta E"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "Els que secunden la proposta F"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
msgid "Opposition"
msgstr "Oposició"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
msgid "Text"
msgstr "Text"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal A"
msgstr "Proposta A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "Proposta B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "Proposta C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "Proposta D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "Proposta E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "Proposta F"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
msgid "Choices"
msgstr "Opcions"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
msgid "Amendment Proposer"
msgstr "Proponent de l'esmena"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
msgid "Amendment Seconds"
msgstr "Els que secunden l'esmena"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
msgid "Amendment Text"
msgstr "Text de l'esmena"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
msgid "Amendment Proposer A"
msgstr "Proponent de l'esmena A"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "Els que secunden l'esmena A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "Text de l'esmena A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "Proponent de l'esmena B"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "Els que secunden l'esmena B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "Text de l'esmena B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "Proponent de l'esmena A"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "Els que secunden l'esmena A"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "Text de l'esmena A"
+
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendments"
msgstr "Esmenes"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:139
msgid "Proceedings"
msgstr "Actes"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:142
msgid "Majority Requirement"
msgstr "Requeriments de majoria"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:145
msgid "Data and Statistics"
msgstr "Dades i estadístiques"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:148
msgid "Quorum"
msgstr "Quòrum"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:151
msgid "Minimum Discussion"
msgstr "Discussió mínima"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:154
msgid "Ballot"
msgstr "Butlleta"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:157
msgid "Forum"
msgstr "Fòrum"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:160
msgid "Outcome"
msgstr "Resultat"
-#: ../../english/template/debian/votebar.wml:152
+#: ../../english/template/debian/votebar.wml:164
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "En&nbsp;espera&nbsp;de&nbsp;patrocinadors"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "En&nbsp;discussió"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Votació&nbsp;en&nbsp;curs"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Decidida"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Retirada"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Altres"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Pàgina&nbsp;principal&nbsp;de&nbsp;votacions"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Com"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Enviar&nbsp;proposta"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Esmenar&nbsp;una&nbsp;proposta"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Donar&nbsp;suport&nbsp;a&nbsp;una&nbsp;proposta"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Llegir un resultat"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Votar"
diff --git a/chinese/po/bugs.zh.po b/chinese/po/bugs.zh.po
index 222dc747400..a07ca642127 100644
--- a/chinese/po/bugs.zh.po
+++ b/chinese/po/bugs.zh.po
@@ -156,146 +156,146 @@ msgstr "已歸檔"
msgid "Archived and Unarchived"
msgstr "已歸檔與未歸檔"
-#~ msgid "Flags:"
-#~ msgstr "標記:"
-
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "Exclude tag:"
+#~ msgstr "不包括標簽:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "已合並的報告只顯示一次"
+#~ msgid "Include tag:"
+#~ msgstr "包括標簽:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "不按狀態或者嚴重性排序"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "不在頁面開始處顯示目錄"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "不在頁腳處顯示統計結果"
+#~ msgid "wontfix"
+#~ msgstr "不予修正 (wontfix)"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "上遊 (upstream)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "不可再現 (unreproducible)"
-#~ msgid "Package version:"
-#~ msgstr "軟件包版本號:"
+#~ msgid "security"
+#~ msgstr "安全性 (security)"
-#~ msgid "Distribution:"
-#~ msgstr "發行版:"
+#~ msgid "patch"
+#~ msgstr "補丁 (patch)"
-#~ msgid "bugs"
-#~ msgstr "數量"
+#~ msgid "moreinfo"
+#~ msgstr "附加信息 (moreinfo)"
-#~ msgid "open"
-#~ msgstr "未解決"
+#~ msgid "l10n"
+#~ msgstr "本地化 (l10n)"
-#~ msgid "forwarded"
-#~ msgstr "已移交"
+#~ msgid "help"
+#~ msgstr "幫助文檔 (help)"
-#~ msgid "pending"
-#~ msgstr "待完工"
+#~ msgid "fixed-upstream"
+#~ msgstr "已修正于上遊 (fixed-upstream)"
-#~ msgid "fixed"
-#~ msgstr "已修正"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "已修正于 experimental (fixed-in-experimental)"
-#~ msgid "done"
-#~ msgstr "已完工"
+#~ msgid "d-i"
+#~ msgstr "安裝程序 (d-i)"
-#~ msgid "Include status:"
-#~ msgstr "包括狀態:"
+#~ msgid "confirmed"
+#~ msgstr "通過確認 (confirmed)"
-#~ msgid "Exclude status:"
-#~ msgstr "不包括狀態:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "致命"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "grave"
-#~ msgstr "危險"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "serious"
-#~ msgstr "嚴重"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "important"
-#~ msgstr "重要"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "minor"
-#~ msgstr "輕微"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "wishlist"
-#~ msgstr "[CN:小意思:][HKTW:心願:]"
+#~ msgid "Exclude severity:"
+#~ msgstr "不包括優先級:"
#~ msgid "Include severity:"
#~ msgstr "包括優先級:"
-#~ msgid "Exclude severity:"
-#~ msgstr "不包括優先級:"
+#~ msgid "wishlist"
+#~ msgstr "[CN:小意思:][HKTW:心願:]"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "輕微"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "重要"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "嚴重"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "危險"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "致命"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "不包括狀態:"
-#~ msgid "confirmed"
-#~ msgstr "通過確認 (confirmed)"
+#~ msgid "Include status:"
+#~ msgstr "包括狀態:"
-#~ msgid "d-i"
-#~ msgstr "安裝程序 (d-i)"
+#~ msgid "done"
+#~ msgstr "已完工"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "已修正于 experimental (fixed-in-experimental)"
+#~ msgid "fixed"
+#~ msgstr "已修正"
-#~ msgid "fixed-upstream"
-#~ msgstr "已修正于上遊 (fixed-upstream)"
+#~ msgid "pending"
+#~ msgstr "待完工"
-#~ msgid "help"
-#~ msgstr "幫助文檔 (help)"
+#~ msgid "forwarded"
+#~ msgstr "已移交"
-#~ msgid "l10n"
-#~ msgstr "本地化 (l10n)"
+#~ msgid "open"
+#~ msgstr "未解決"
-#~ msgid "moreinfo"
-#~ msgstr "附加信息 (moreinfo)"
+#~ msgid "bugs"
+#~ msgstr "數量"
-#~ msgid "patch"
-#~ msgstr "補丁 (patch)"
+#~ msgid "Distribution:"
+#~ msgstr "發行版:"
-#~ msgid "security"
-#~ msgstr "安全性 (security)"
+#~ msgid "Package version:"
+#~ msgstr "軟件包版本號:"
-#~ msgid "unreproducible"
-#~ msgstr "不可再現 (unreproducible)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "upstream"
-#~ msgstr "上遊 (upstream)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "wontfix"
-#~ msgstr "不予修正 (wontfix)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "不在頁腳處顯示統計結果"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "不在頁面開始處顯示目錄"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "不按狀態或者嚴重性排序"
-#~ msgid "Include tag:"
-#~ msgstr "包括標簽:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "已合並的報告只顯示一次"
-#~ msgid "Exclude tag:"
-#~ msgstr "不包括標簽:"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
+
+#~ msgid "Flags:"
+#~ msgstr "標記:"
diff --git a/chinese/po/cdimage.zh.po b/chinese/po/cdimage.zh.po
index 96faedbb553..c7fe345bccd 100644
--- a/chinese/po/cdimage.zh.po
+++ b/chinese/po/cdimage.zh.po
@@ -11,18 +11,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 "[CN:密钥指纹:][HKTW: 金鑰指紋:]"
-#: ../../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/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index 450053cf3dd..4ac20c6a797 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -422,8 +422,8 @@ msgstr "南非"
msgid "Zimbabwe"
msgstr "津巴布韦"
-#~ msgid "Great Britain"
-#~ msgstr "英國"
-
#~ msgid "Yugoslavia"
#~ msgstr "南斯拉夫"
+
+#~ msgid "Great Britain"
+#~ msgstr "英國"
diff --git a/chinese/po/distrib.zh.po b/chinese/po/distrib.zh.po
index c0407927b5a..6460835b981 100644
--- a/chinese/po/distrib.zh.po
+++ b/chinese/po/distrib.zh.po
@@ -130,61 +130,71 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
+#, fuzzy
+#| msgid "64-bit PC (amd64)"
+msgid "64-bit ARM (AArch64)"
+msgstr "64位 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位 PC (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr "32位 PC(i386)"
-#: ../../english/releases/arches.data:16
+#: ../../english/releases/arches.data:17
msgid "Intel Itanium IA-64"
msgstr "Intel 安騰 IA-64"
-#: ../../english/releases/arches.data:17
+#: ../../english/releases/arches.data:18
msgid "kFreeBSD 32-bit PC (i386)"
msgstr "kFreeBSD 32位 PC (i386)"
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr "kFreeBSD 64位 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 "IBM System z"
-#: ../../english/releases/arches.data:25
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr "SPARC"
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index 326139e15d0..6bc688b0705 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -10,7 +10,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"
@@ -25,7 +42,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"
@@ -34,15 +51,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"
@@ -51,13 +68,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"
@@ -72,7 +89,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 -- "
@@ -82,11 +99,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, "
@@ -106,7 +123,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"
@@ -114,11 +131,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"
@@ -126,11 +143,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"
@@ -142,24 +159,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 "
@@ -168,13 +188,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"
@@ -190,24 +210,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"
@@ -218,11 +238,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"
@@ -232,11 +252,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 "
@@ -247,11 +267,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"
@@ -261,11 +281,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"
@@ -273,7 +293,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 "
@@ -289,7 +309,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 "
@@ -319,48 +339,73 @@ msgstr "包括光碟:"
msgid "Publisher:"
msgstr "發行商:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "作者:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "編輯:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "維護者:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "狀態:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "取得難易度:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "最新版本:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(version <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 "純文字"
-#. 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 ""
+"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 ""
+
+#: ../../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 ""
-"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://packages.debian.org/git\">Git</a> repository."
msgstr ""
-"使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始檔。"
-#: ../../english/doc/manuals.defs:158
+#: ../../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,36 +415,30 @@ msgstr ""
" <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" 然後 check out <kbd>boot-floppies/documentation</kbd> module。"
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "網頁檢視 CVS"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Debian 套件"
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
#, fuzzy
#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Debian 套件"
-#: ../../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 ""
-#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
-#~ msgstr ""
-#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
-#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
-#~ "the SGML source text."
+#~ msgid "Language:"
+#~ msgstr "語言:"
#~ msgid ""
#~ "CVS sources working copy: <p>Login to the CVS server using the command:"
@@ -417,5 +456,18 @@ msgstr ""
#~ "check out the sources, use the command:<br><pre>cvs -d:pserver:"
#~ "anonymous@cvs.debian.org:/cvs/debian-policy co <get-var doc /></pre>"
-#~ msgid "Language:"
-#~ msgstr "語言:"
+#~ msgid ""
+#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
+#~ msgstr ""
+#~ "<p>You can visit the current<a href=\"manuals/<get-var doc />/"
+#~ "\">development version</a> here,use <a href=\"cvs\">CVS</a> to download "
+#~ "the SGML source text."
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "使用 <a href=\"cvs\">SVN</a> 來取得 <get-vard dp_pkg_loc /> 的 SGML 原始"
+#~ "檔。"
diff --git a/chinese/po/mailinglists.zh.po b/chinese/po/mailinglists.zh.po
index 67d43c709c6..38756c287f0 100644
--- a/chinese/po/mailinglists.zh.po
+++ b/chinese/po/mailinglists.zh.po
@@ -116,8 +116,8 @@ msgstr "公開"
msgid "closed"
msgstr "關閉"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "請選擇您要取消訂閱哪個列表:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "請選擇您想要訂閱的郵件列表:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "請選擇您要取消訂閱哪個列表:"
diff --git a/chinese/po/newsevents.zh.po b/chinese/po/newsevents.zh.po
index ce45d817205..d10628138ac 100644
--- a/chinese/po/newsevents.zh.po
+++ b/chinese/po/newsevents.zh.po
@@ -26,27 +26,27 @@ msgstr "p<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 "姓名:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "Email:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "前一次演講:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "語言:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "地點:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "主題:"
@@ -356,12 +356,17 @@ 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 ""
-"想每兩個星期都以電子郵件方式接收快訊嗎?請<a href=\"https://lists.debian.org/"
-"debian-news/\">訂閱</a> debian-news 郵件列表。"
+"想以電子郵件方式接收快訊嗎?請<a href=\"https://lists.debian.org/debian-news/"
+"\">訂閱</a> debian-news 郵件列表。"
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
@@ -483,3 +488,11 @@ msgid ""
msgstr ""
"<void id=\"plural\" />Debian 每周快訊 (Debian Weekly News) 由 <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 ""
+#~ "想每兩個星期都以電子郵件方式接收快訊嗎?請<a href=\"https://lists.debian."
+#~ "org/debian-news/\">訂閱</a> debian-news 郵件列表。"
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index 7f90eb2156c..4f99646de4c 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -74,7 +74,7 @@ msgid "Officers"
msgstr "總管"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "發行版"
@@ -84,11 +84,11 @@ msgid "Publicity"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "支援以及下級組織"
-#. 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 ""
@@ -101,105 +101,105 @@ msgstr "領袖"
msgid "Technical Committee"
msgstr "技術委員會"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "秘書"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "各項開發計劃"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP 庫存"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP 總管"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "FTP 助理"
-#: ../../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 "個別軟件包"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "釋出管理"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "釋出團隊"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "品質管理"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "安裝系統小組"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "釋出公告"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "光碟映像"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "產品"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "測試"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "支援以及下級組織"
-#: ../../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
#, fuzzy
#| msgid "Buildd Administration"
msgid "Buildd administration"
msgstr "Buildd 管理"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "文件"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "需要幫助的套件清單"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Live 系統小組"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "移植"
@@ -227,83 +227,75 @@ msgstr ""
msgid "Partner Program"
msgstr "合作計劃"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "活動"
-#: ../../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 "[CNHK:用戶:][TW:使用者:][HKTW:支援:][CN:支持:]"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "錯誤追縱系統"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "郵件列表管理與郵件列表庫存"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "新進開發人員櫃台"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Debian 帳號管理員"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Keyring (PGP 與 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 開發人員 Keyring 團隊"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "安全團隊"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "測試版安全團隊"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "安全稽查計劃"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "網頁"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "顧問網頁"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "CD 廠商網頁"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Debian 星球"
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "政策"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "系統管理"
-#: ../../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."
@@ -311,7 +303,7 @@ msgstr ""
"This is the address to use when encountering problems on one of Debian's "
"machines, including password problems or you need apackage installed."
-#: ../../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 "
@@ -321,100 +313,103 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">Debian Machines</a> page,it should "
"contain per-machine administrator information."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP 開發人員目錄管理"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "鏡像站台"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "DNS 管理"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "套件追蹤系統"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "協調硬體捐贈"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "監察"
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Alioth 管理"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Debian Women 計劃"
-#: ../../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 "給 1 到 99 歲小孩使用的 Debian"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "給醫藥界使用的 Debian"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "給教育界使用的 Debian"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "給法律界使用的 Debian"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "給殘障人士使用的 Debian"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "給醫藥界使用的 Debian"
-#~ msgid "APT Team"
-#~ msgstr "APT 小組"
-
-#~ msgid "Mailing List Archives"
-#~ msgstr "郵件列表歸檔"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "客製化 Debian 發行版"
-#~ msgid "Mailing list"
-#~ msgstr "郵件列表"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "穩定版的釋出團隊"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "給非營利組織用的 Debian"
+#~ msgid "Vendors"
+#~ msgstr "廠商"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "使用環球作業系統作為桌面環境"
+#~ msgid "Handhelds"
+#~ msgstr "手持式設備"
-#~ msgid "Accountant"
-#~ msgstr "帳號管理"
+#~ msgid "Marketing Team"
+#~ msgstr "行銷團隊"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Key Signing 協調"
+#~ 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 ""
+#~ "負責管理 buildd 的特定硬體架構的管理員可以透過<genericemail arch@buildd."
+#~ "debian.org> 聯絡,如 <genericemail i386@buildd.debian.org>。"
#~ msgid ""
#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -425,25 +420,29 @@ msgstr "給醫藥界使用的 Debian"
#~ "\">http://www.buildd.net</a> 找到。選擇特定硬體架構與發行版來查詢其 "
#~ "buildd 與管理員。"
-#~ 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 ""
-#~ "負責管理 buildd 的特定硬體架構的管理員可以透過<genericemail arch@buildd."
-#~ "debian.org> 聯絡,如 <genericemail i386@buildd.debian.org>。"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Key Signing 協調"
-#~ msgid "Marketing Team"
-#~ msgstr "行銷團隊"
+#~ msgid "Accountant"
+#~ msgstr "帳號管理"
-#~ msgid "Handhelds"
-#~ msgstr "手持式設備"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "使用環球作業系統作為桌面環境"
-#~ msgid "Vendors"
-#~ msgstr "廠商"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "給非營利組織用的 Debian"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "穩定版的釋出團隊"
+#~ msgid "Mailing list"
+#~ msgstr "郵件列表"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "客製化 Debian 發行版"
+#~ msgid "Mailing List Archives"
+#~ msgstr "郵件列表歸檔"
+
+#~ msgid "APT Team"
+#~ msgstr "APT 小組"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "安全稽查計劃"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "測試版安全團隊"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index c90fc2e60e8..e4b86bd2942 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -171,26 +171,6 @@ msgstr "[Debian] (mini button)"
msgid "same as the above"
msgstr "同上"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "希望:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "誰:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "硬體架構:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "詳細資訊:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "地點:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "產品"
@@ -235,22 +215,34 @@ msgstr "徽章"
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "耳環"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
msgstr ""
+#: ../../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 ""
@@ -326,59 +318,74 @@ msgstr "版本"
msgid "URL"
msgstr "網址"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "限於 Debian 技術委員會"
+#~ msgid "Name:"
+#~ msgstr "姓名:"
-#~ msgid "deity developers only"
-#~ msgstr "限於 deity 開發者"
+#~ msgid "Company:"
+#~ msgstr "公司:"
-#~ msgid "developers only"
-#~ msgstr "限於開發者"
+#~ msgid "URL:"
+#~ msgstr "網址:"
-#~ msgid "closed"
-#~ msgstr "關閉"
+#~ msgid "or"
+#~ msgstr "或"
-#~ msgid "open"
-#~ msgstr "公開"
+#~ msgid "Email:"
+#~ msgstr "Email:"
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "取消訂閱郵件列表"
+#~ msgid "Rates:"
+#~ msgstr "收費:"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
+#~ "Debian 顧問。"
-#~ msgid "Clear"
-#~ msgstr "清除"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "訂閱郵件列表"
#~ msgid "Your E-Mail address:"
#~ msgstr "您的 E-Mail 地址:"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "訂閱郵件列表"
+#~ msgid "Clear"
+#~ msgstr "清除"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
-#~ "Debian 顧問。"
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr "請尊重 <a href=\"./#ads\">Debian 郵件列表廣告政策</a>。"
-#~ msgid "Rates:"
-#~ msgstr "收費:"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "取消訂閱郵件列表"
-#~ msgid "Email:"
-#~ msgstr "Email:"
+#~ msgid "open"
+#~ msgstr "公開"
-#~ msgid "or"
-#~ msgstr "或"
+#~ msgid "closed"
+#~ msgstr "關閉"
-#~ msgid "URL:"
-#~ msgstr "網址:"
+#~ msgid "developers only"
+#~ msgstr "限於開發者"
-#~ msgid "Company:"
-#~ msgstr "公司:"
+#~ msgid "deity developers only"
+#~ msgstr "限於 deity 開發者"
-#~ msgid "Name:"
-#~ msgstr "姓名:"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "限於 Debian 技術委員會"
+
+#~ msgid "Where:"
+#~ msgstr "地點:"
+
+#~ msgid "Specifications:"
+#~ msgstr "詳細資訊:"
+
+#~ msgid "Architecture:"
+#~ msgstr "硬體架構:"
+
+#~ msgid "Who:"
+#~ msgstr "誰:"
+
+#~ msgid "Wanted:"
+#~ msgstr "希望:"
diff --git a/chinese/po/ports.zh.po b/chinese/po/ports.zh.po
index 1e76ef509af..2e75e2e85c5 100644
--- a/chinese/po/ports.zh.po
+++ b/chinese/po/ports.zh.po
@@ -114,32 +114,32 @@ msgstr "給 PowerPC 用的 Debian"
msgid "Debian for Sparc"
msgstr "給 Sparc 用的 Debian"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "給 Sparc64 用的 Debian"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "給 S/390 用的 Debian"
+#~ msgid "Debian for Laptops"
+#~ msgstr "給筆記型電腦用的 Debian"
-#~ msgid "Debian for MIPS"
-#~ msgstr "給 MIPS 用的 Debian"
+#~ msgid "Debian for AMD64"
+#~ msgstr "給 AMD64 用的 Debian"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "給 Motorola 680x0 用的 Debian"
+#~ msgid "Debian for ARM"
+#~ msgstr "給 ARM 用的 Debian"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "給 Beowulf 用的 Debian"
#~ msgid "Main"
#~ msgstr "主要"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "給 Beowulf 用的 Debian"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for ARM"
-#~ msgstr "給 ARM 用的 Debian"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "給 Motorola 680x0 用的 Debian"
-#~ msgid "Debian for AMD64"
-#~ msgstr "給 AMD64 用的 Debian"
+#~ msgid "Debian for MIPS"
+#~ msgstr "給 MIPS 用的 Debian"
-#~ msgid "Debian for Laptops"
-#~ msgstr "給筆記型電腦用的 Debian"
+#~ msgid "Debian for S/390"
+#~ msgstr "給 S/390 用的 Debian"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "給 Sparc64 用的 Debian"
diff --git a/chinese/po/stats.zh.po b/chinese/po/stats.zh.po
index aa2fd61c025..8ea2c4e4f1b 100644
--- a/chinese/po/stats.zh.po
+++ b/chinese/po/stats.zh.po
@@ -19,211 +19,211 @@ msgstr "一共有 %d [CN:字節:][HKTW:位元组:]需要翻譯。"
msgid "There are %d strings to translate."
msgstr "一共有 %d 個[CN:字符串:][HKTW:字串:]需要翻譯。"
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "此譯文太過時了"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "譯文版本錯誤"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "原文比此譯文新"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "原文不再存在"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr ""
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr ""
-#: ../../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 "翻譯概要 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 "未翻譯"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "過時"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "已翻譯"
-#: ../../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 "最新"
-#: ../../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 "個[CN:文件:][HKTW:檔案:]"
-#: ../../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 "[CN:字節:][HKTW:位元組:]"
-#: ../../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."
msgstr ""
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "過時的翻譯"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "[CN:文件:][HKTW:檔案:]"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr ""
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "備註"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr ""
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "日誌"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "譯文"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "維護者"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "狀態"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "翻譯者"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "日期"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "未翻譯的一般頁面"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "未翻譯的一般頁面"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "未翻譯的新聞"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "未翻譯的新聞"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "未翻譯的顧問/[CN:用戶:][HKTW:使用者:]頁面"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "未翻譯的國際頁面"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "未翻譯的國際頁面"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "已翻譯頁面 (最新)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "已翻譯模板 (PO [CN:文件:][HKTW:檔案:])"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "PO 翻譯統計"
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr "模糊"
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr "未翻譯"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
#, fuzzy
#| msgid "Total:"
msgid "Total"
msgstr "總數:"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "總數:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "此網頁創建工具:"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "已翻譯網頁"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "翻譯統計,按頁面數量"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "語言"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "翻譯"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "已翻譯網頁(按[CN:文件:][HKTW:檔案:]大小)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "翻譯統計,按頁面大小"
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index cacd74776e6..515e6b8e293 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -67,7 +67,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</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 "主頁"
@@ -108,7 +108,7 @@ msgid "Support"
msgstr "[CN:支持:][HKTW:支援:]"
#: ../../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 "開發者天地"
@@ -145,7 +145,7 @@ msgid "Miscellaneous"
msgstr "雜項"
#: ../../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 "取得 Debian"
@@ -200,7 +200,7 @@ msgstr "release 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -220,23 +220,23 @@ msgstr ""
"href=\"mailto:debian-l10n-chinese@lists.debian.org\">debian-l10n-"
"chinese@lists.debian.org</a>。"
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "最近修訂日期"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "版權所有"
-#: ../../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 ""
-#: ../../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 "查閱<a href=\"m4_HOME/license\" rel=\"copyright\">許可證條款</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."
@@ -298,140 +298,150 @@ msgid "Debian Books"
msgstr "Debian 書籍"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "協助 Debian"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "郵件列表"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "社群契約"
-#: ../../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 "[CN:訪問:][HKTW:拜訪:]本站贊助商"
-#: ../../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 - 通用操作系統"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Debian 網站地圖"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "開發人員[CN:數據:][HKTW:資料:]庫"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Debian 書籍"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Debian 政策[CN:文檔:][HKTW:文件:]"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "開發人員指引"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "新手上路"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "阻礙發行的嚴重問題"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Lintian 報告"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "[CNHK:用戶:][TW:使用者:][CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "開發人員[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "國際化/本土化 (i18n/l10n) [CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "移植平台[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../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 "臭蟲追蹤系統[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "其他[CN:郵件列表歸檔:][HKTW:論壇文件集:]"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "自由軟件"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "開發"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "協助 Debian"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "錯誤報告"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "移植平台/體系架構"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "安裝說明"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "CD 製造商"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "CD/USB ISO 映像檔"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "網絡安裝"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "預先安裝"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Debian-Edu 計劃"
-#: ../../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 "Quality Assurance"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "套件追蹤系統"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Debian Developers's 套件綜覽"
@@ -514,169 +524,94 @@ msgstr "網址"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "返回 <a href=\"./\">Who's using Debian? page</a>."
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
-
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "用 jigdo 下載"
-
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "透過 http/ftp 下載"
-
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "網絡安裝"
-
-#~ msgid "Debian CD team"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
-
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
-
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
-
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "捐款"
-
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
-
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "討論中"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "有待贊助"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "討論中"
-
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "接受投票中"
+#~ msgid "Select a server near you"
+#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
-#~ msgid "Decided"
-#~ msgstr "已決定"
+#~ msgid "More information:"
+#~ msgstr "更多訊息:"
-#~ msgid "Other"
-#~ msgstr "其他"
+#~ msgid "Taken by:"
+#~ msgstr "認領:"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "投票主頁"
+#~ msgid "Nobody"
+#~ msgstr "沒有人"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "提出議案"
+#~ msgid "Rating:"
+#~ msgstr "評分:"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "修正議案"
+#~ msgid "More information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "跟隨議案的進展"
+#~ msgid "Where"
+#~ msgstr "Where(何處*)"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "查看結果"
+#~ msgid "More Info"
+#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
-#~ msgid "Vote"
-#~ msgstr "投票"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>計劃</th><th>Coordinator</th>"
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
+#~ msgid "Related Links"
+#~ msgstr "相關網址"
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
+#~ msgid "Latest News"
+#~ msgstr "最新消息"
+#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
-#~ msgstr ""
-#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
-#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
-#~ "負責編輯。"
-
-#~ msgid "Fixed in"
-#~ msgstr "修改於"
-
-#~ msgid "Vulnerable"
-#~ msgstr "可被襲擊"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
+#, fuzzy
#~ 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 ""
-#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
-#~ "絡:]。"
-
-#~ msgid "download with pik"
-#~ msgstr "用 pik 下載"
-
-#~ msgid "buy pre-made images"
-#~ msgstr "購買預製映像"
-
-#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "無"
-
-#, fuzzy
-#~ msgid "Discussion"
-#~ msgstr "討論中"
-
-#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
-
-#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "受影響的軟件"
+#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</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=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />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 ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</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>."
@@ -685,88 +620,163 @@ msgstr "返回 <a href=\"./\">Who's using Debian? page</a>."
#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "返回 <a href=\"./\">Debian consultants page</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=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</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=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is 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 ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />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 ""
#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a> 負責編輯。"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+
+#, fuzzy
+#~ msgid "No Requested packages"
+#~ msgstr "受影響的軟件"
+
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
#, fuzzy
+#~ msgid "Discussion"
+#~ msgstr "討論中"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "無"
+
+#~ msgid "buy pre-made images"
+#~ msgstr "購買預製映像"
+
+#~ msgid "download with pik"
+#~ msgstr "用 pik 下載"
+
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
#~ msgstr ""
-#~ "想每個星期都以電子郵件方式接收「每週快訊」嗎?請<a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">訂閱</a> debian-news 郵件列表。"
+#~ "請參閱<a href=\"m4_HOME/contact\">聯繫方法</a>與我們[CN:取得聯繫:][HKTW:聯"
+#~ "絡:]。"
+
+#~ msgid "Vulnerable"
+#~ msgstr "可被襲擊"
+
+#~ msgid "Fixed in"
+#~ msgstr "修改於"
-#, fuzzy
#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "返回 <a href=\"m4_HOME/\">Debian 計劃主頁</a>"
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ msgstr ""
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary 和 Tollef Fog Heen</a> "
+#~ "負責編輯。"
-#~ msgid "Latest News"
-#~ msgstr "最新消息"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Debian 每週快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang 和 Martin 'Joey' Schulze</a> 負責編輯。"
-#~ msgid "Related Links"
-#~ msgstr "相關網址"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Debian 每周快訊 (Debian Weekly News) 由 <a href=\"mailto:dwn@debian.org"
+#~ "\">Martin 'Joey' Schulze</a> 負責編輯。"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>計劃</th><th>Coordinator</th>"
+#~ msgid "Vote"
+#~ msgstr "投票"
-#~ msgid "More Info"
-#~ msgstr "更多[CN:信息:][HKTW:資訊:]"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "查看結果"
-#~ msgid "Where"
-#~ msgstr "Where(何處*)"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "跟隨議案的進展"
-#~ msgid "More information"
-#~ msgstr "更詳盡的[CN:信息:][HKTW:資訊:]"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "修正議案"
-#~ msgid "Rating:"
-#~ msgstr "評分:"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "提出議案"
-#~ msgid "Nobody"
-#~ msgstr "沒有人"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "投票主頁"
-#~ msgid "Taken by:"
-#~ msgstr "認領:"
+#~ msgid "Other"
+#~ msgstr "其他"
-#~ msgid "More information:"
-#~ msgstr "更多訊息:"
+#~ msgid "Decided"
+#~ msgstr "已決定"
-#~ msgid "Select a server near you"
-#~ msgstr "請[CN:就近選擇服務器:][HKTW:選擇就近的伺服器:]"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "接受投票中"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "討論中"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "有待贊助"
+
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "討論中"
+
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "捐款"
+
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
+
+#~ msgid "Debian CD team"
+#~ msgstr "<span lang=\"en\">Debian </span>光碟小組"
+
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "網絡安裝"
+
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "透過 http/ftp 下載"
+
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "用 jigdo 下載"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
diff --git a/chinese/po/vendors.zh.po b/chinese/po/vendors.zh.po
index cd434d8bd1a..9b099126e67 100644
--- a/chinese/po/vendors.zh.po
+++ b/chinese/po/vendors.zh.po
@@ -10,137 +10,130 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "銷售商:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "為 Debian 而設的網址:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "有否捐贈給 Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "國家:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "是否接受國際訂購:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "電子郵箱:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "CD 種類:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "DVD 種類:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "硬體架構:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "銷售商"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "有否捐贈"
-#: ../../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 "硬體架構"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "是否接受國際訂購"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "聯絡方式"
#. ###################
#. 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 "銷售商網"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "頁"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "電子郵箱"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "只是歐洲以內"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "某些地區"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "源碼"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "和"
-#~ msgid "Official CD"
-#~ msgstr "正式 CD 光碟"
+#~ msgid "updated monthly"
+#~ msgstr "每月更新"
-#~ msgid "Official DVD"
-#~ msgstr "正式 DVD 光碟"
+#~ msgid "updated twice weekly"
+#~ msgstr "每兩週更新"
-#~ msgid "Development Snapshot"
-#~ msgstr "開發版快照"
+#~ msgid "updated weekly"
+#~ msgstr "每週更新"
-#~ msgid "Vendor Release"
-#~ msgstr "銷售商發行版本"
+#~ msgid "reseller"
+#~ msgstr "分銷商"
-#~ msgid "Multiple Distribution"
-#~ msgstr "多重發佈"
+#~ msgid "reseller of $var"
+#~ msgstr "$var 的分銷商"
-#~ msgid "non-US included"
-#~ msgstr "包括 non-US"
+#~ msgid "Custom Release"
+#~ msgstr "特別訂造"
-#~ msgid "non-free included"
-#~ msgstr "包括 non-free"
+#~ msgid "vendor additions"
+#~ msgstr "銷售商增添軟件"
#~ msgid "contrib included"
#~ msgstr "包括 contrib"
-#~ msgid "vendor additions"
-#~ msgstr "銷售商增添軟件"
+#~ msgid "non-free included"
+#~ msgstr "包括 non-free"
-#~ msgid "Custom Release"
-#~ msgstr "特別訂造"
+#~ msgid "non-US included"
+#~ msgstr "包括 non-US"
-#~ msgid "reseller of $var"
-#~ msgstr "$var 的分銷商"
+#~ msgid "Multiple Distribution"
+#~ msgstr "多重發佈"
-#~ msgid "reseller"
-#~ msgstr "分銷商"
+#~ msgid "Vendor Release"
+#~ msgstr "銷售商發行版本"
-#~ msgid "updated weekly"
-#~ msgstr "每週更新"
+#~ msgid "Development Snapshot"
+#~ msgstr "開發版快照"
-#~ msgid "updated twice weekly"
-#~ msgstr "每兩週更新"
+#~ msgid "Official DVD"
+#~ msgstr "正式 DVD 光碟"
-#~ msgid "updated monthly"
-#~ msgstr "每月更新"
+#~ msgid "Official CD"
+#~ msgstr "正式 CD 光碟"
+
+#~ msgid "Architectures:"
+#~ msgstr "硬體架構:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD 種類:"
+
+#~ msgid "CD Type:"
+#~ msgstr "CD 種類:"
+
+#~ msgid "email:"
+#~ msgstr "電子郵箱:"
+
+#~ msgid "Ship International:"
+#~ msgstr "是否接受國際訂購:"
+
+#~ msgid "Country:"
+#~ msgstr "國家:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "有否捐贈給 Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "為 Debian 而設的網址:"
+
+#~ msgid "Vendor:"
+#~ msgstr "銷售商:"
diff --git a/chinese/po/vote.zh.po b/chinese/po/vote.zh.po
index 09c180c22b2..45d25624fdd 100644
--- a/chinese/po/vote.zh.po
+++ b/chinese/po/vote.zh.po
@@ -19,229 +19,251 @@ msgid "Time Line"
msgstr "時間表"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "提名"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "辯論"
-#: ../../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
msgid "Proposer"
msgstr "提名人"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "提案 A 提名人"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "提案 B 提名人"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "提案 C 提名人"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "提案 D 提名人"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "提案 E 提名人"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "提案 F 提名人"
-#: ../../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 "提案 A 支持者"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "提案 B 支持者"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "提案 C 支持者"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "提案 D 支持者"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "提案 E 支持者"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "提案 F 支持者"
-#: ../../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 "提案 A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "提案 B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "提案 C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "提案 D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "提案 E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "提案 F"
-#: ../../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 "修正案 A 提名人"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "修正案 A 支持者"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "修正案 A 內文"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "修正案 B 提名人"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "修正案 B 支持者"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "修正案 B 內文"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "修正案 A 提名人"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "修正案 A 支持者"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "修正案 A 內文"
+
+#: ../../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
msgid "Minimum Discussion"
msgstr "最少量討論"
-#: ../../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 "有待贊助"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "討論中"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "接受投票中"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "已決定"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "撤銷"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "其他"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "投票主頁"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "How&nbsp;To"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "提出議案"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "修正議案"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "跟隨議案的進展"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "查看結果"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "投票"
diff --git a/croatian/po/cdimage.hr.po b/croatian/po/cdimage.hr.po
index dedb13235cb..63e461400ff 100644
--- a/croatian/po/cdimage.hr.po
+++ b/croatian/po/cdimage.hr.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 " Key fingerprint"
-#: ../../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/croatian/po/distrib.hr.po b/croatian/po/distrib.hr.po
index 0806f82c94e..5f3c429ffda 100644
--- a/croatian/po/distrib.hr.po
+++ b/croatian/po/distrib.hr.po
@@ -129,100 +129,108 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
+msgid "Hard Float ABI ARM"
+msgstr ""
+
+#: ../../english/releases/arches.data:14
#, fuzzy
#| msgid "HP PA/RISC"
msgid "HP PA-RISC"
msgstr "HP PA/RISC"
-#: ../../english/releases/arches.data:14
+#: ../../english/releases/arches.data:15
#, fuzzy
#| msgid "Hurd (i386)"
msgid "Hurd 32-bit PC (i386)"
msgstr "Hurd (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:16
+#: ../../english/releases/arches.data:17
#, fuzzy
#| msgid "Intel IA-64"
msgid "Intel Itanium IA-64"
msgstr "Intel IA-64"
-#: ../../english/releases/arches.data:17
+#: ../../english/releases/arches.data:18
msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
-#: ../../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 "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Search case sensitive"
-#~ msgstr "Ne mari za velika/mala slova"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "pakete koji sadrže datoteke ili direktorije s ovakvim imenom"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Dopusti pretraživanje podriječi"
+#~ msgid "all files in this package"
+#~ msgstr "sve datoteke u ovom paketu"
-#~ msgid "yes"
-#~ msgstr "da"
+#~ msgid "Case sensitive"
+#~ msgstr "Osjetljivo na velika/mala slova"
#~ msgid "no"
#~ msgstr "ne"
-#~ msgid "Case sensitive"
-#~ msgstr "Osjetljivo na velika/mala slova"
+#~ msgid "yes"
+#~ msgstr "da"
-#~ msgid "all files in this package"
-#~ msgstr "sve datoteke u ovom paketu"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Dopusti pretraživanje podriječi"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "pakete koji sadrže datoteke ili direktorije s ovakvim imenom"
+#~ msgid "Search case sensitive"
+#~ msgstr "Ne mari za velika/mala slova"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
diff --git a/croatian/po/doc.hr.po b/croatian/po/doc.hr.po
index 7a97e729133..b62b4bfc3d6 100644
--- a/croatian/po/doc.hr.po
+++ b/croatian/po/doc.hr.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 "Uključen CD:"
msgid "Publisher:"
msgstr "Izdavač:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Autori:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Urednici:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Održavatelj:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "Stanje:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "Dostupnost:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "Najnovija inačica:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(inačica <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 "običan 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 ""
-"Koristite <a href=\"cvs\">SVN</a> za prijenos izvornog teksta u SGML-u za "
-"<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"
@@ -371,27 +415,34 @@ msgstr ""
"kbd>,\n"
" i izvadite modul <kbd>boot-floppies/documentation</kbd>."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "CVS via web"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Debian paket"
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
#, fuzzy
#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Debian paket"
-#: ../../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 "Jezik:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Koristite <a href=\"cvs\">SVN</a> za prijenos izvornog teksta u SGML-u za "
+#~ "<get-var ddp_pkg_loc />."
diff --git a/croatian/po/mailinglists.hr.po b/croatian/po/mailinglists.hr.po
index 9ea8fb4bd88..cb0e3474de3 100644
--- a/croatian/po/mailinglists.hr.po
+++ b/croatian/po/mailinglists.hr.po
@@ -124,8 +124,8 @@ msgstr "otvorena"
msgid "closed"
msgstr "zatvorena"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Molimo odaberite liste za koje želite otkazati pretplatu:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Molimo odaberite liste na koje se želite pretplatiti:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Molimo odaberite liste za koje želite otkazati pretplatu:"
diff --git a/croatian/po/newsevents.hr.po b/croatian/po/newsevents.hr.po
index 8dd989700b6..f53dab73d91 100644
--- a/croatian/po/newsevents.hr.po
+++ b/croatian/po/newsevents.hr.po
@@ -27,27 +27,27 @@ msgstr "str. <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 "Ime:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "E-mail:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr ""
@@ -335,13 +335,18 @@ 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 ""
-"Kako bi dobili ove vijesti svako dva tjedna u svoj elektronski poštanski "
-"pretinac, <a href=\"https://lists.debian.org/debian-news/\">pretplatite se na "
-"debian-news mailing listu.</a>"
+"Kako bi dobili ove vijesti tjedno u svoj elektronski poštanski pretinac, <a "
+"href=\"https://lists.debian.org/debian-news/\">pretplatite se na debian-news "
+"mailing listu.</a>"
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
@@ -464,3 +469,12 @@ msgid ""
msgstr ""
"<void id=\"plural\" />Ovo izdanje Debian Weekly News su uredili <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 ""
+#~ "Kako bi dobili ove vijesti svako dva tjedna u svoj elektronski poštanski "
+#~ "pretinac, <a href=\"https://lists.debian.org/debian-news/\">pretplatite "
+#~ "se na debian-news mailing listu.</a>"
diff --git a/croatian/po/organization.hr.po b/croatian/po/organization.hr.po
index a415ac3fc42..7e5006cf7e6 100644
--- a/croatian/po/organization.hr.po
+++ b/croatian/po/organization.hr.po
@@ -73,7 +73,7 @@ msgid "Officers"
msgstr "Službenici"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribucija"
@@ -83,11 +83,11 @@ msgid "Publicity"
msgstr "Publicitet"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Podrška i infrastruktura"
-#. 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 ""
@@ -100,107 +100,107 @@ msgstr "Vođa"
msgid "Technical Committee"
msgstr "Tehnički odbor"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Tajnik"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Razvojni projekti"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP arhive"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP Master"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "FTP Assistants"
-#: ../../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 "Pojedini paketi"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Nadgledanje izdanja"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Tim za izdanja"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Osiguranje kvalitete"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Tim za instalacijski sustav"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Napomene izdanja"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD snimke"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Izrada"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Testiranje"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Podrška i infrastruktura"
-#: ../../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
#, fuzzy
#| msgid "Buildd Administration"
msgid "Buildd administration"
msgstr "Administracija buildda"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Dokumentacija"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Popis paketa koji zahtijevaju rad i paketi u prospektu"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
#, fuzzy
#| msgid "Installation System Team"
msgid "Live System Team"
msgstr "Tim za instalacijski sustav"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Portovi"
@@ -228,83 +228,75 @@ msgstr "Kontakt za tisak"
msgid "Partner Program"
msgstr "Program partnera"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Događaji"
-#: ../../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 "Podrška korisnicima"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Sustav praćenja bugova"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administracija mailing lista i arhiva mailing lista"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Front-desk za nove održavatelje"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Upravitelji korisničkih računa razvijatelja"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Održavatelji prstena ključeva (PGP i 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 Maintainer keyring tim"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Sigurnosni tim"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "Sigurnosni tim za <q>testing</q>"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Projekt Security Audit"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "WWW stranice"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Stranica za konzultante"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Stranica za distributere CD-a"
-#: ../../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 "Policy"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Administracija sustava"
-#: ../../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."
@@ -313,7 +305,7 @@ msgstr ""
"Debianovih strojeva, uključujući probleme sa lozinkama i potrebe za "
"instaliranjem paketa."
-#: ../../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 "
@@ -323,98 +315,107 @@ msgstr ""
"stranicu <a href=\"https://db.debian.org/machines.cgi\">Debian strojeva</a>, "
"koja bi trebala sadržavati informacije o administratorima pojedinih strojeva."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Administrator LDAP direktorija razvijatelja"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Mirrori"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Održavatelj DNS-a"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Sustav praćenja paketa"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Koordinacija donacija hardvera"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Revizor"
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Administratori Aliotha"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Debian Women projekt"
-#: ../../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 za djecu od 1 do 99"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian za medicinsku praksu i istraživanje"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian za obrazovanje"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian u pravnim uredima"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian za ljude sa invaliditetom"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian za medicinsku praksu i istraživanje"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Ovo još nije službeni interni projekt u Debianu ali su najavili namjeru "
-#~ "integracije."
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Prilagođene Debian distribucije"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian za neprofitne organizacije"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Tim za izdanje <q>stable</q>"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Univerzalni operativni sustav kao vaš desktop"
+#~ msgid "Vendors"
+#~ msgstr "Distributeri"
-#~ msgid "Accountant"
-#~ msgstr "Knjigovođa"
+#~ msgid "APT Team"
+#~ msgstr "APT tim"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinacija potpisivanja ključeva"
+#~ msgid "Handhelds"
+#~ msgstr "Ručna računala (dlanovnici)"
+
+#~ msgid "Marketing Team"
+#~ msgstr "Marketing tim"
+
+#~ 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 ""
+#~ "Administratori koji su odgovorni za builddove za pojedinu arhitekturu se "
+#~ "mogu dobiti na <genericemail arch@buildd.debian.org>, npr. <genericemail "
+#~ "i386@buildd.debian.org>."
#~ msgid ""
#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -426,29 +427,27 @@ msgstr "Debian za medicinsku praksu i istraživanje"
#~ "arhitekturu i distribuciju kako bi vidjeli dostupne builddove i njihove "
#~ "administratore."
-#~ 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 ""
-#~ "Administratori koji su odgovorni za builddove za pojedinu arhitekturu se "
-#~ "mogu dobiti na <genericemail arch@buildd.debian.org>, npr. <genericemail "
-#~ "i386@buildd.debian.org>."
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinacija potpisivanja ključeva"
-#~ msgid "Marketing Team"
-#~ msgstr "Marketing tim"
+#~ msgid "Accountant"
+#~ msgstr "Knjigovođa"
-#~ msgid "Handhelds"
-#~ msgstr "Ručna računala (dlanovnici)"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Univerzalni operativni sustav kao vaš desktop"
-#~ msgid "APT Team"
-#~ msgstr "APT tim"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian za neprofitne organizacije"
-#~ msgid "Vendors"
-#~ msgstr "Distributeri"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Ovo još nije službeni interni projekt u Debianu ali su najavili namjeru "
+#~ "integracije."
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Tim za izdanje <q>stable</q>"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projekt Security Audit"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Prilagođene Debian distribucije"
+#~ msgid "Testing Security Team"
+#~ msgstr "Sigurnosni tim za <q>testing</q>"
diff --git a/croatian/po/others.hr.po b/croatian/po/others.hr.po
index 59ea6e6bc11..ba1eda79414 100644
--- a/croatian/po/others.hr.po
+++ b/croatian/po/others.hr.po
@@ -168,26 +168,6 @@ msgstr "[Debian] (malo dugme)"
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Traži se:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Tko:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Arhitektura:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Specifikacije:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Gdje:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Proizvodi"
@@ -232,24 +212,36 @@ msgstr "bedževi"
msgid "basketball goals"
msgstr "koševi za košarku"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "naušnice"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "torbe"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
#, fuzzy
#| msgid "suitcases"
msgid "pillowcases"
msgstr "torbe"
+#: ../../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 ""
@@ -325,81 +317,76 @@ msgstr "Verzija"
msgid "URL"
msgstr "URL"
-#~ msgid "Name:"
-#~ msgstr "Ime:"
-
-#~ msgid "Company:"
-#~ msgstr "Poduzeće:"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "or"
-#~ msgstr "ili"
-
-#~ msgid "Email:"
-#~ msgstr "E-mail:"
-
-#~ msgid "Rates:"
-#~ msgstr "Cijene:"
+#~ msgid "p<get-var page />"
+#~ msgstr "str. <get-var page />"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Spremni putovati"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Pretplata na mailing liste"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ "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 ""
-#~ "<: if (<total_consultant> % 10 == 0 or <total_consultant> % 10 > 4 or "
-#~ "(<total_consultant> > 10 and <total_consultant> < 20)) { print \"Navedeno "
-#~ "je <total_consultant> Debian konzultanata\"; } elsif (<total_consultant> "
-#~ "% 10 == 1) { print \"Naveden je <total_consultant> Debian konzultant\"; } "
-#~ "else { print \"Navedena su <total_consultant> Debian konzultanta\"; } "
-#~ "print \" iz <total_country> \" . ((<total_country> % 10 == 0 or "
-#~ "<total_country> % 10 > 4 or (<total_country> > 10 and <total_country> < "
-#~ "20)) ? \"zemalja\" : \"zemlje\") . \" širom svijeta.\" . \"\\n\"; :>"
-
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "okomiti&nbsp;natpis"
+#~ "Pogledajte stranicu <a href=\"./#subunsub\">mailing lista</a> za "
+#~ "informacije o tome kako se pretplatiti koristeći e-mail. Dostupan je i <a "
+#~ "href=\"unsubscribe\">web formular za otkazivanje pretplate</a>, kako "
+#~ "biste prekinuli pretplatu s mailing lista. "
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "vodoravni&nbsp;natpis"
+#~ msgid ""
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
+#~ msgstr ""
+#~ "Primijetite da su većina Debian mailing lista javni forumi. Svi e-mailovi "
+#~ "koji se pošalju na njih će se objaviti na javnoj arhivi mailing lista i "
+#~ "indeksirat će ih internetski pretraživači. Na Debianove mailing liste se "
+#~ "trebate pretplatiti samo koristeći e-mail adresu za koju vam nije bitno "
+#~ "hoće li se objaviti."
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "animirani&nbsp;GIF&nbsp;natpis"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Molimo odaberite liste na koje se želite pretplatiti:"
-#~ msgid "Newer Debian banners"
-#~ msgstr "Noviji Debian natpisi"
+#~ msgid "No description given"
+#~ msgstr "Opis nije dan"
-#~ msgid "Debian: apt-get into it."
-#~ msgstr "Debian: apt-get into it."
+#~ msgid "Moderated:"
+#~ msgstr "Moderirana:"
-#~ msgid "Debian: the potato has landed. announcing version 2.2"
-#~ msgstr "Debian: the potato has landed. announcing version 2.2"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Slanje poruka dozvoljeno samo pretplatnicima."
-#~ msgid "Older Debian banners"
-#~ msgstr "Stariji Debian natpisi"
+#~ msgid ""
+#~ "Only messages signed by a Debian developer will be accepted by this list."
+#~ msgstr ""
+#~ "Samo poruke koje potpiše Debian razvijatelj će biti propuštene na ovu "
+#~ "listu."
-#~ msgid "Debian: The biggest is still the best."
-#~ msgstr "Debian: The biggest is still the best."
+#~ msgid "Subscription:"
+#~ msgstr "Pretplata:"
-#~ msgid "Debian: The Perfect OS"
-#~ msgstr "Debian: The biggest is still the best."
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "je digest inačica koju samo možete čitati."
-#~ msgid "Debian GNU/Linux: Your next Linux distribution."
-#~ msgstr "Debian GNU/Linux: Your next Linux distribution."
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Vaša e-mail adresa:"
-#~ msgid "closed"
-#~ msgstr "zatvorena"
+#~ msgid "Subscribe"
+#~ msgstr "Pretplata"
-#~ msgid "open"
-#~ msgstr "otvorena"
+#~ msgid "Clear"
+#~ msgstr "Isprazni"
-#~ msgid "Unsubscribe"
-#~ msgstr "Otkaži pretplatu"
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr ""
+#~ "Molimo poštujte <a href=\"./#ads\">načela oglašavanja na Debian mailing "
+#~ "listama</a>."
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Molimo odaberite liste za koje želite otkazati pretplatu:"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Otkazivanje pretplate na mailing liste"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
@@ -411,73 +398,93 @@ msgstr "URL"
#~ "i <a href=\"subscribe\">web formular za pretplatu</a>, kako biste se "
#~ "pretplatili na mailing liste. "
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Otkazivanje pretplate na mailing liste"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Molimo odaberite liste za koje želite otkazati pretplatu:"
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr ""
-#~ "Molimo poštujte <a href=\"./#ads\">načela oglašavanja na Debian mailing "
-#~ "listama</a>."
+#~ msgid "Unsubscribe"
+#~ msgstr "Otkaži pretplatu"
-#~ msgid "Clear"
-#~ msgstr "Isprazni"
+#~ msgid "open"
+#~ msgstr "otvorena"
-#~ msgid "Subscribe"
-#~ msgstr "Pretplata"
+#~ msgid "closed"
+#~ msgstr "zatvorena"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Vaša e-mail adresa:"
+#~ msgid "Debian GNU/Linux: Your next Linux distribution."
+#~ msgstr "Debian GNU/Linux: Your next Linux distribution."
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "je digest inačica koju samo možete čitati."
+#~ msgid "Debian: The Perfect OS"
+#~ msgstr "Debian: The biggest is still the best."
-#~ msgid "Subscription:"
-#~ msgstr "Pretplata:"
+#~ msgid "Debian: The biggest is still the best."
+#~ msgstr "Debian: The biggest is still the best."
-#~ msgid ""
-#~ "Only messages signed by a Debian developer will be accepted by this list."
-#~ msgstr ""
-#~ "Samo poruke koje potpiše Debian razvijatelj će biti propuštene na ovu "
-#~ "listu."
+#~ msgid "Older Debian banners"
+#~ msgstr "Stariji Debian natpisi"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Slanje poruka dozvoljeno samo pretplatnicima."
+#~ msgid "Debian: the potato has landed. announcing version 2.2"
+#~ msgstr "Debian: the potato has landed. announcing version 2.2"
-#~ msgid "Moderated:"
-#~ msgstr "Moderirana:"
+#~ msgid "Debian: apt-get into it."
+#~ msgstr "Debian: apt-get into it."
-#~ msgid "No description given"
-#~ msgstr "Opis nije dan"
+#~ msgid "Newer Debian banners"
+#~ msgstr "Noviji Debian natpisi"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Molimo odaberite liste na koje se želite pretplatiti:"
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "animirani&nbsp;GIF&nbsp;natpis"
-#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
-#~ msgstr ""
-#~ "Primijetite da su većina Debian mailing lista javni forumi. Svi e-mailovi "
-#~ "koji se pošalju na njih će se objaviti na javnoj arhivi mailing lista i "
-#~ "indeksirat će ih internetski pretraživači. Na Debianove mailing liste se "
-#~ "trebate pretplatiti samo koristeći e-mail adresu za koju vam nije bitno "
-#~ "hoće li se objaviti."
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "vodoravni&nbsp;natpis"
+
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "okomiti&nbsp;natpis"
#~ 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. "
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "Pogledajte stranicu <a href=\"./#subunsub\">mailing lista</a> za "
-#~ "informacije o tome kako se pretplatiti koristeći e-mail. Dostupan je i <a "
-#~ "href=\"unsubscribe\">web formular za otkazivanje pretplate</a>, kako "
-#~ "biste prekinuli pretplatu s mailing lista. "
+#~ "<: if (<total_consultant> % 10 == 0 or <total_consultant> % 10 > 4 or "
+#~ "(<total_consultant> > 10 and <total_consultant> < 20)) { print \"Navedeno "
+#~ "je <total_consultant> Debian konzultanata\"; } elsif (<total_consultant> "
+#~ "% 10 == 1) { print \"Naveden je <total_consultant> Debian konzultant\"; } "
+#~ "else { print \"Navedena su <total_consultant> Debian konzultanta\"; } "
+#~ "print \" iz <total_country> \" . ((<total_country> % 10 == 0 or "
+#~ "<total_country> % 10 > 4 or (<total_country> > 10 and <total_country> < "
+#~ "20)) ? \"zemalja\" : \"zemlje\") . \" širom svijeta.\" . \"\\n\"; :>"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Pretplata na mailing liste"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Spremni putovati"
-#~ msgid "p<get-var page />"
-#~ msgstr "str. <get-var page />"
+#~ msgid "Rates:"
+#~ msgstr "Cijene:"
+
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "or"
+#~ msgstr "ili"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "Company:"
+#~ msgstr "Poduzeće:"
+
+#~ msgid "Name:"
+#~ msgstr "Ime:"
+
+#~ msgid "Where:"
+#~ msgstr "Gdje:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Specifikacije:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Arhitektura:"
+
+#~ msgid "Who:"
+#~ msgstr "Tko:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Traži se:"
diff --git a/croatian/po/ports.hr.po b/croatian/po/ports.hr.po
index be61252d1a5..85162de8aa6 100644
--- a/croatian/po/ports.hr.po
+++ b/croatian/po/ports.hr.po
@@ -113,38 +113,38 @@ msgstr "Debian za PowerPC"
msgid "Debian for Sparc"
msgstr "Debian za Sparc"
-#~ msgid "Vendor/Name"
-#~ msgstr "Proizvođač/Ime"
-
-#~ msgid "Date announced"
-#~ msgstr "Datum najave"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian za prijenosnike"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian za Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian za AMD64"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian za S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian za ARM"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian za MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian za Beowulf"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian za Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Glavna stranica"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Main"
-#~ msgstr "Glavna stranica"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian za Motorola 680x0"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian za Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian za MIPS"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian za ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian za S/390"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian za AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian za Sparc64"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian za prijenosnike"
+#~ msgid "Date announced"
+#~ msgstr "Datum najave"
+
+#~ msgid "Vendor/Name"
+#~ msgstr "Proizvođač/Ime"
diff --git a/croatian/po/templates.hr.po b/croatian/po/templates.hr.po
index 258955f1f73..4239fdfcd6b 100644
--- a/croatian/po/templates.hr.po
+++ b/croatian/po/templates.hr.po
@@ -66,7 +66,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Natrag na <a href=\"m4_HOME/\">početnu stranicu Debian Projekta</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 "Početak"
@@ -107,7 +107,7 @@ msgid "Support"
msgstr "Podrška"
#: ../../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 "Kutak za razvijatelje"
@@ -144,7 +144,7 @@ msgid "Miscellaneous"
msgstr "Razno"
#: ../../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 "Nabavka Debiana"
@@ -199,7 +199,7 @@ msgstr "u verziji 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -219,24 +219,24 @@ msgstr ""
"kontaktirati, pogledajte Debianovu <a href=\"m4_HOME/contact\">kontaktnu "
"stranicu</a>."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Zadnji put promijenjeno"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Vlasnik autorskih prava"
-#: ../../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 ""
-#: ../../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 ""
"Pročitajte <a href=\"m4_HOME/license\" rel=\"copyright\">uvjete licence</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."
@@ -299,140 +299,150 @@ msgid "Debian Books"
msgstr "Knjige o Debianu"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "Pomozite Debianu"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Arhive mailing lista"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Mailing liste"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Društveni ugovor"
-#: ../../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 "Posjetite pokrovitelja stranica"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Pregled Debian web stranica"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Baza podataka o razvijateljima"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Knjige o Debianu"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Debian Policy Manual"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Developers' Reference"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "New Maintainers' Guide"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Bugovi kritični za izdanje"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Lintian izvještaji"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Arhive korisničkih mailing lista"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Arhive razvijateljskih mailing lista"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Arhive i18n/l10n mailing lista"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Arhive mailing lista portova"
-#: ../../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 "Arhive mailing lista sustava praćenja bugova"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Arhive raznih mailing lista"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Slobodni softver"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Razvoj"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Pomozite Debianu"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Bug izvještaji"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Portovi/Arhitekture"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Upute za instalaciju"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Prodavači CD-a"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "CD/USB ISO snimke"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Mrežna instalacija"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Pred-instaliran"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Debian-Edu projekt"
-#: ../../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 "Osiguranje kvalitete"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Sustav praćenja paketa"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Pregled paketa Debian razvijatelja"
@@ -517,490 +527,491 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Povratak na stranicu <a href=\"../\">Who's using Debian?</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "Popis konzultanata"
+#~ msgid "Select a server near you"
+#~ msgstr "Izaberite vama blizak poslužitelj"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Natrag na stranicu <a href=\"./\">Debian konzultanti</a>."
+#~ msgid "More information:"
+#~ msgstr "Više informacija:"
-#~ msgid "License Information"
-#~ msgstr "Informacije o licenci"
+#~ msgid "Taken by:"
+#~ msgstr "Zauzeo:"
-#~ msgid "DLS Index"
-#~ msgstr "DLS indeks"
+#~ msgid "Nobody"
+#~ msgstr "Nitko"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Rating:"
+#~ msgstr "Ocjena:"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG FAQ"
+#~ msgid "More information"
+#~ msgstr "Podrobnije informacije"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Debian-Legal arhiva"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Nadolazeće atrakcije"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "link may no longer be valid"
+#~ msgstr "veza možda više ne radi"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, inačica %s: %s"
+#~ msgid "When"
+#~ msgstr "Kada"
-#~ msgid "Date published"
-#~ msgstr "Datum objave"
+#~ msgid "Where"
+#~ msgstr "Gdje"
-#~ msgid "License"
-#~ msgstr "Licenca"
+#~ msgid "More Info"
+#~ msgstr "Podrobnije informacije"
-#~ msgid "Version"
-#~ msgstr "Inačica"
+#~ msgid "Debian Involvement"
+#~ msgstr "Upletenost Debiana"
-#~ msgid "Summary"
-#~ msgstr "Sažetak"
+#~ msgid "Main Coordinator"
+#~ msgstr "Glavni koordinator"
-#~ msgid "Justification"
-#~ msgstr "Opravdanje"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Projekt</th><th>Koordinator</th>"
-#~ msgid "Discussion"
-#~ msgstr "Rasprava"
+#~ msgid "Related Links"
+#~ msgstr "Srodne veze"
-#~ msgid "Original Summary"
-#~ msgstr "Originalni sažetak"
+#~ msgid "Latest News"
+#~ msgstr "Najnovije vijesti"
+
+#~ msgid "Download calendar entry"
+#~ msgstr "Prijenos unosa u kalendar"
#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
#~ msgstr ""
-#~ "Originalni sažetak kojeg je napisao <summary-author/> može se naći u <a "
-#~ "href=\"<summary-url/>\">arhivama mailing lista</a>."
-
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Ovaj sažetak je pripremio <summary-author/>."
-
-#~ msgid "License text (translated)"
-#~ msgstr "Tekst licence (preveden)"
-
-#~ msgid "License text"
-#~ msgstr "Tekst licence"
+#~ "Povratak na: druge <a href=\"./\">vijesti o Debianu</a> || <a href="
+#~ "\"m4_HOME/\">početnu stranicu Debian projekta</a>."
-#~ msgid "free"
-#~ msgstr "slobodan"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (mrtav link)"
-#~ msgid "non-free"
-#~ msgstr "neslobodan"
+#~ 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 ""
+#~ "Kako bi dobili ove vijesti svako dva tjedna u svoj elektronski poštanski "
+#~ "pretinac, <a href=\"https://lists.debian.org/debian-news/\">pretplatite "
+#~ "se na debian-news mailing listu.</a>"
-#~ msgid "not redistributable"
-#~ msgstr "ne može se redistribuirati"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "<a href=\"../../\">Prijašnja izdanja</a> ovih vijesti su dostupna."
-#~ msgid "Free"
-#~ msgstr "Slobodan"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Project News uređuje <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Non-Free"
-#~ msgstr "Neslobodan"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Project News uređuju <a href=\"mailto:debian-"
+#~ "publicity@lists.debian.org\">%s</a>."
-#~ msgid "Not Redistributable"
-#~ msgstr "Ne može se redistribuirati"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Ovo izdanje Debian Project News je uredio <a href="
+#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "Pogledajte stranicu <a href=\"./\">informacije o licencama</a> za pregled "
-#~ "Debian License Summaries (DLS)."
+#~ "<void id=\"plural\" />Ovo izdanje Debian Project News su uredili <a href="
+#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Vote"
-#~ msgstr "Glasovati"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Preveo %s."
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Pročitati&nbsp;rezultat"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Preveli %s."
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Slijediti&nbsp;prijedlog"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Prevela %s."
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Ispraviti&nbsp;prijedlog"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Prevele %s."
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Predati&nbsp;prijedlog"
+#~ msgid "List of Speakers"
+#~ msgstr "Popis govornika"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Kako"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Natrag na stranicu <a href=\"./\">Debian govornici</a>."
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Početna&nbsp;stranica&nbsp;glasovanja"
+#~ 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>."
+#~ msgstr ""
+#~ "Kako bi dobili ove vijesti tjedno u svoj elektronski poštanski pretinac, "
+#~ "<a href=\"https://lists.debian.org/debian-news/\">pretplatite se na "
+#~ "debian-news mailing listu.</a>"
-#~ msgid "Other"
-#~ msgstr "Ostalo"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Weekly News uređuje <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "Withdrawn"
-#~ msgstr "Povučeno"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Weekly News uređuju <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "Decided"
-#~ msgstr "Odlučeno"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Ovo izdanje Debian Weekly News je uredio <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Glasovanje&nbsp;otvoreno"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Ovo izdanje Debian Weekly News su uredili <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "U&nbsp;raspravi"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Čeka&nbsp;na&nbsp;pokrovitelje"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Download Jigdom"
-#~ msgid "Outcome"
-#~ msgstr "Rezultat"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Download HTTP-om/FTP-om"
-#~ msgid "Forum"
-#~ msgstr "Forum"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Kupi CD-e ili DVD-e"
-#~ msgid "Ballot"
-#~ msgstr "Glasački list"
+#~ msgid "Network Install"
+#~ msgstr "Mrežna instalacija"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Minimalna rasprava"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Download"
-#~ msgid "Quorum"
-#~ msgstr "Kvorum"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Razno"
-#~ msgid "Data and Statistics"
-#~ msgstr "Podaci i statistike"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Artwork"
-#~ msgid "Majority Requirement"
-#~ msgstr "Zahtjevi za većinu"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Mirroranje"
-#~ msgid "Proceedings"
-#~ msgstr "Postupak"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync mirrori"
-#~ msgid "Amendments"
-#~ msgstr "Amandmani"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Download Torrentom"
-#~ msgid "Amendment Text B"
-#~ msgstr "Tekst amandmana B"
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Informacije o izdanju snimki"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Amandman B podržavaju"
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD grupa"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Amandman B predlaže"
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_na_cdu"
-#~ msgid "Amendment Text A"
-#~ msgstr "Tekst amandmana A"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Amandman A podržavaju"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Amandman A predlaže"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid "Amendment Text"
-#~ msgstr "Tekst amandmana"
+#~ msgid "buy"
+#~ msgstr "kupi"
-#~ msgid "Amendment Seconds"
-#~ msgstr "Amandman podržavaju"
+#~ msgid "net_install"
+#~ msgstr "mrežni_instal"
-#~ msgid "Amendment Proposer"
-#~ msgstr "Predlagač amandmana"
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "razno"
-#~ msgid "Choices"
-#~ msgstr "Izbor"
+#~ msgid ""
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
+#~ msgstr ""
+#~ "<a href=\"/MailingLists/disclaimer\">Javna mailing lista</a> na engleskom "
+#~ "jeziku za CD-e/DVD-e:"
-#~ msgid "Proposal F"
-#~ msgstr "Prijedlog F"
+#~ msgid "Date"
+#~ msgstr "Datum"
-#~ msgid "Proposal E"
-#~ msgstr "Prijedlog E"
+#~ msgid "Time Line"
+#~ msgstr "Vremenski tok"
-#~ msgid "Proposal D"
-#~ msgstr "Prijedlog D"
+#~ msgid "Nominations"
+#~ msgstr "Nominacije"
-#~ msgid "Proposal C"
-#~ msgstr "Prijedlog C"
+#~ msgid "Debate"
+#~ msgstr "Rasprava"
-#~ msgid "Proposal B"
-#~ msgstr "Prijedlog B"
+#~ msgid "Platforms"
+#~ msgstr "Platforme"
-#~ msgid "Proposal A"
-#~ msgstr "Prijedlog A"
+#~ msgid "Proposer"
+#~ msgstr "Predlagač"
-#~ msgid "Text"
-#~ msgstr "Tekst"
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Predlagač prijedloga A"
-#~ msgid "Opposition"
-#~ msgstr "Protivljenje"
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Predlagač prijedloga B"
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Prijedlog F podržavaju"
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Predlagač prijedloga C"
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Prijedlog E podržavaju"
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Predlagač prijedloga D"
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Prijedlog D podržavaju"
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Predlagač prijedloga E"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Prijedlog C podržavaju"
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Predlagač prijedloga F"
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Prijedlog B podržavaju"
+#~ msgid "Seconds"
+#~ msgstr "Podržavaju"
#~ msgid "Proposal A Seconds"
#~ msgstr "Prijedlog A podržavaju"
-#~ msgid "Seconds"
-#~ msgstr "Podržavaju"
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Prijedlog B podržavaju"
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Predlagač prijedloga F"
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Prijedlog C podržavaju"
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Predlagač prijedloga E"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Prijedlog D podržavaju"
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Predlagač prijedloga D"
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Prijedlog E podržavaju"
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Predlagač prijedloga C"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Prijedlog F podržavaju"
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Predlagač prijedloga B"
+#~ msgid "Opposition"
+#~ msgstr "Protivljenje"
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Predlagač prijedloga A"
+#~ msgid "Text"
+#~ msgstr "Tekst"
-#~ msgid "Proposer"
-#~ msgstr "Predlagač"
+#~ msgid "Proposal A"
+#~ msgstr "Prijedlog A"
-#~ msgid "Platforms"
-#~ msgstr "Platforme"
+#~ msgid "Proposal B"
+#~ msgstr "Prijedlog B"
-#~ msgid "Debate"
-#~ msgstr "Rasprava"
+#~ msgid "Proposal C"
+#~ msgstr "Prijedlog C"
-#~ msgid "Nominations"
-#~ msgstr "Nominacije"
+#~ msgid "Proposal D"
+#~ msgstr "Prijedlog D"
-#~ msgid "Time Line"
-#~ msgstr "Vremenski tok"
+#~ msgid "Proposal E"
+#~ msgstr "Prijedlog E"
-#~ msgid "Date"
-#~ msgstr "Datum"
+#~ msgid "Proposal F"
+#~ msgstr "Prijedlog F"
-#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
-#~ msgstr ""
-#~ "<a href=\"/MailingLists/disclaimer\">Javna mailing lista</a> na engleskom "
-#~ "jeziku za CD-e/DVD-e:"
+#~ msgid "Choices"
+#~ msgstr "Izbor"
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "razno"
+#~ msgid "Amendment Proposer"
+#~ msgstr "Predlagač amandmana"
-#~ msgid "net_install"
-#~ msgstr "mrežni_instal"
+#~ msgid "Amendment Seconds"
+#~ msgstr "Amandman podržavaju"
-#~ msgid "buy"
-#~ msgstr "kupi"
+#~ msgid "Amendment Text"
+#~ msgstr "Tekst amandmana"
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Amandman A predlaže"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Amandman A podržavaju"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "Amendment Text A"
+#~ msgstr "Tekst amandmana A"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_na_cdu"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Amandman B predlaže"
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD grupa"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Amandman B podržavaju"
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Informacije o izdanju snimki"
+#~ msgid "Amendment Text B"
+#~ msgstr "Tekst amandmana B"
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Download Torrentom"
+#~ msgid "Amendments"
+#~ msgstr "Amandmani"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync mirrori"
+#~ msgid "Proceedings"
+#~ msgstr "Postupak"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Mirroranje"
+#~ msgid "Majority Requirement"
+#~ msgstr "Zahtjevi za većinu"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Artwork"
+#~ msgid "Data and Statistics"
+#~ msgstr "Podaci i statistike"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Razno"
+#~ msgid "Quorum"
+#~ msgstr "Kvorum"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Download"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Minimalna rasprava"
-#~ msgid "Network Install"
-#~ msgstr "Mrežna instalacija"
+#~ msgid "Ballot"
+#~ msgstr "Glasački list"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Kupi CD-e ili DVD-e"
+#~ msgid "Forum"
+#~ msgstr "Forum"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Download HTTP-om/FTP-om"
+#~ msgid "Outcome"
+#~ msgstr "Rezultat"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Download Jigdom"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Čeka&nbsp;na&nbsp;pokrovitelje"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "U&nbsp;raspravi"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Ovo izdanje Debian Weekly News su uredili <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Glasovanje&nbsp;otvoreno"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Ovo izdanje Debian Weekly News je uredio <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Decided"
+#~ msgstr "Odlučeno"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Weekly News uređuju <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "Withdrawn"
+#~ msgstr "Povučeno"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Weekly News uređuje <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "Other"
+#~ msgstr "Ostalo"
-#~ 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>."
-#~ msgstr ""
-#~ "Kako bi dobili ove vijesti tjedno u svoj elektronski poštanski pretinac, "
-#~ "<a href=\"https://lists.debian.org/debian-news/\">pretplatite se na debian-"
-#~ "news mailing listu.</a>"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Početna&nbsp;stranica&nbsp;glasovanja"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Natrag na stranicu <a href=\"./\">Debian govornici</a>."
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kako"
-#~ msgid "List of Speakers"
-#~ msgstr "Popis govornika"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Predati&nbsp;prijedlog"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Prevele %s."
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Ispraviti&nbsp;prijedlog"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Prevela %s."
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Slijediti&nbsp;prijedlog"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Preveli %s."
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Pročitati&nbsp;rezultat"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Preveo %s."
+#~ msgid "Vote"
+#~ msgstr "Glasovati"
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
#~ msgstr ""
-#~ "<void id=\"plural\" />Ovo izdanje Debian Project News su uredili <a href="
-#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "Pogledajte stranicu <a href=\"./\">informacije o licencama</a> za pregled "
+#~ "Debian License Summaries (DLS)."
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Ovo izdanje Debian Project News je uredio <a href="
-#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Not Redistributable"
+#~ msgstr "Ne može se redistribuirati"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Project News uređuju <a href=\"mailto:debian-"
-#~ "publicity@lists.debian.org\">%s</a>."
+#~ msgid "Non-Free"
+#~ msgstr "Neslobodan"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Project News uređuje <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Free"
+#~ msgstr "Slobodan"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "<a href=\"../../\">Prijašnja izdanja</a> ovih vijesti su dostupna."
+#~ msgid "not redistributable"
+#~ msgstr "ne može se redistribuirati"
-#~ 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 ""
-#~ "Kako bi dobili ove vijesti svako dva tjedna u svoj elektronski poštanski "
-#~ "pretinac, <a href=\"https://lists.debian.org/debian-news/\">pretplatite se "
-#~ "na debian-news mailing listu.</a>"
+#~ msgid "non-free"
+#~ msgstr "neslobodan"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (mrtav link)"
+#~ msgid "free"
+#~ msgstr "slobodan"
+
+#~ msgid "License text"
+#~ msgstr "Tekst licence"
+
+#~ msgid "License text (translated)"
+#~ msgstr "Tekst licence (preveden)"
+
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Ovaj sažetak je pripremio <summary-author/>."
#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
#~ msgstr ""
-#~ "Povratak na: druge <a href=\"./\">vijesti o Debianu</a> || <a href="
-#~ "\"m4_HOME/\">početnu stranicu Debian projekta</a>."
-
-#~ msgid "Download calendar entry"
-#~ msgstr "Prijenos unosa u kalendar"
+#~ "Originalni sažetak kojeg je napisao <summary-author/> može se naći u <a "
+#~ "href=\"<summary-url/>\">arhivama mailing lista</a>."
-#~ msgid "Latest News"
-#~ msgstr "Najnovije vijesti"
+#~ msgid "Original Summary"
+#~ msgstr "Originalni sažetak"
-#~ msgid "Related Links"
-#~ msgstr "Srodne veze"
+#~ msgid "Discussion"
+#~ msgstr "Rasprava"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Projekt</th><th>Koordinator</th>"
+#~ msgid "Justification"
+#~ msgstr "Opravdanje"
-#~ msgid "Main Coordinator"
-#~ msgstr "Glavni koordinator"
+#~ msgid "Summary"
+#~ msgstr "Sažetak"
-#~ msgid "Debian Involvement"
-#~ msgstr "Upletenost Debiana"
+#~ msgid "Version"
+#~ msgstr "Inačica"
-#~ msgid "More Info"
-#~ msgstr "Podrobnije informacije"
+#~ msgid "License"
+#~ msgstr "Licenca"
-#~ msgid "Where"
-#~ msgstr "Gdje"
+#~ msgid "Date published"
+#~ msgstr "Datum objave"
-#~ msgid "When"
-#~ msgstr "Kada"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, inačica %s: %s"
-#~ msgid "link may no longer be valid"
-#~ msgstr "veza možda više ne radi"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Nadolazeće atrakcije"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Debian-Legal arhiva"
-#~ msgid "More information"
-#~ msgstr "Podrobnije informacije"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG FAQ"
-#~ msgid "Rating:"
-#~ msgstr "Ocjena:"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Nobody"
-#~ msgstr "Nitko"
+#~ msgid "DLS Index"
+#~ msgstr "DLS indeks"
-#~ msgid "Taken by:"
-#~ msgstr "Zauzeo:"
+#~ msgid "License Information"
+#~ msgstr "Informacije o licenci"
-#~ msgid "More information:"
-#~ msgstr "Više informacija:"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Natrag na stranicu <a href=\"./\">Debian konzultanti</a>."
-#~ msgid "Select a server near you"
-#~ msgstr "Izaberite vama blizak poslužitelj"
+#~ msgid "List of Consultants"
+#~ msgstr "Popis konzultanata"
diff --git a/croatian/po/vendors.hr.po b/croatian/po/vendors.hr.po
index 9060fc2b4e8..60ae808f1b4 100644
--- a/croatian/po/vendors.hr.po
+++ b/croatian/po/vendors.hr.po
@@ -9,137 +9,130 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Distributer:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL za Debian stranicu:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Omogućava donaciju Debianu:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Zemlja:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Isporučuje međunarodno:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "e-mail:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Vrsta CD-a:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Vrsta DVD-a:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Arhitekture:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Distributer"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Omogućava priloge (donacije):"
-#: ../../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 "Arhitekture"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Isporučuje međunarodno"
-#: ../../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 "Web distributera:"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "stranica"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "e-mail"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "unutar Europe"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "U neka područja"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "izvorni kod"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "i"
-#~ msgid "updated monthly"
-#~ msgstr "osvježava se mjesečno"
+#~ msgid "Official CD"
+#~ msgstr "Službeni CD"
-#~ msgid "updated twice weekly"
-#~ msgstr "osvježava se dvaput tjedno"
+#~ msgid "Official DVD"
+#~ msgstr "Službeni DVD"
-#~ msgid "updated weekly"
-#~ msgstr "osvježava se tjedno"
+#~ msgid "Development Snapshot"
+#~ msgstr "Razvojni snimak"
-#~ msgid "reseller"
-#~ msgstr "preprodaje"
+#~ msgid "Vendor Release"
+#~ msgstr "Distributerovo izdanje"
-#~ msgid "reseller of $var"
-#~ msgstr "preprodaje $var"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Višestruka distribucija"
-#~ msgid "Custom Release"
-#~ msgstr "Vlastito izdanje"
+#~ msgid "non-US included"
+#~ msgstr "non-US uključen"
-#~ msgid "vendor additions"
-#~ msgstr "dodaci tvrtke"
+#~ msgid "non-free included"
+#~ msgstr "non-free uključen"
#~ msgid "contrib included"
#~ msgstr "contrib uključen"
-#~ msgid "non-free included"
-#~ msgstr "non-free uključen"
+#~ msgid "vendor additions"
+#~ msgstr "dodaci tvrtke"
-#~ msgid "non-US included"
-#~ msgstr "non-US uključen"
+#~ msgid "Custom Release"
+#~ msgstr "Vlastito izdanje"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Višestruka distribucija"
+#~ msgid "reseller of $var"
+#~ msgstr "preprodaje $var"
-#~ msgid "Vendor Release"
-#~ msgstr "Distributerovo izdanje"
+#~ msgid "reseller"
+#~ msgstr "preprodaje"
-#~ msgid "Development Snapshot"
-#~ msgstr "Razvojni snimak"
+#~ msgid "updated weekly"
+#~ msgstr "osvježava se tjedno"
-#~ msgid "Official DVD"
-#~ msgstr "Službeni DVD"
+#~ msgid "updated twice weekly"
+#~ msgstr "osvježava se dvaput tjedno"
-#~ msgid "Official CD"
-#~ msgstr "Službeni CD"
+#~ msgid "updated monthly"
+#~ msgstr "osvježava se mjesečno"
+
+#~ msgid "Architectures:"
+#~ msgstr "Arhitekture:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Vrsta DVD-a:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Vrsta CD-a:"
+
+#~ msgid "email:"
+#~ msgstr "e-mail:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Isporučuje međunarodno:"
+
+#~ msgid "Country:"
+#~ msgstr "Zemlja:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Omogućava donaciju Debianu:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL za Debian stranicu:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Distributer:"
diff --git a/croatian/po/vote.hr.po b/croatian/po/vote.hr.po
index 3d43d0daac4..e80d7a8333c 100644
--- a/croatian/po/vote.hr.po
+++ b/croatian/po/vote.hr.po
@@ -18,229 +18,251 @@ msgid "Time Line"
msgstr "Vremenski tok"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Nominacije"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Rasprava"
-#: ../../english/template/debian/votebar.wml:25
+#: ../../english/template/debian/votebar.wml:28
msgid "Platforms"
msgstr "Platforme"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Proposer"
msgstr "Predlagač"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "Predlagač prijedloga A"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "Predlagač prijedloga B"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "Predlagač prijedloga C"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "Predlagač prijedloga D"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "Predlagač prijedloga E"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "Predlagač prijedloga F"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Seconds"
msgstr "Podržavaju"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
msgid "Proposal A Seconds"
msgstr "Prijedlog A podržavaju"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "Prijedlog B podržavaju"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "Prijedlog C podržavaju"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "Prijedlog D podržavaju"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "Prijedlog E podržavaju"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "Prijedlog F podržavaju"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
msgid "Opposition"
msgstr "Protivljenje"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
msgid "Text"
msgstr "Tekst"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal A"
msgstr "Prijedlog A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "Prijedlog B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "Prijedlog C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "Prijedlog D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "Prijedlog E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "Prijedlog F"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
msgid "Choices"
msgstr "Izbor"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
msgid "Amendment Proposer"
msgstr "Predlagač amandmana"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
msgid "Amendment Seconds"
msgstr "Amandman podržavaju"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
msgid "Amendment Text"
msgstr "Tekst amandmana"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
msgid "Amendment Proposer A"
msgstr "Amandman A predlaže"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "Amandman A podržavaju"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "Tekst amandmana A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "Amandman B predlaže"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "Amandman B podržavaju"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "Tekst amandmana B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "Amandman A predlaže"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "Amandman A podržavaju"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "Tekst amandmana A"
+
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendments"
msgstr "Amandmani"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:139
msgid "Proceedings"
msgstr "Postupak"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:142
msgid "Majority Requirement"
msgstr "Zahtjevi za većinu"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:145
msgid "Data and Statistics"
msgstr "Podaci i statistike"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:148
msgid "Quorum"
msgstr "Kvorum"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:151
msgid "Minimum Discussion"
msgstr "Minimalna rasprava"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:154
msgid "Ballot"
msgstr "Glasački list"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:157
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:160
msgid "Outcome"
msgstr "Rezultat"
-#: ../../english/template/debian/votebar.wml:152
+#: ../../english/template/debian/votebar.wml:164
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Čeka&nbsp;na&nbsp;pokrovitelje"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "U&nbsp;raspravi"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Glasovanje&nbsp;otvoreno"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Odlučeno"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Povučeno"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Ostalo"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Početna&nbsp;stranica&nbsp;glasovanja"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Kako"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Predati&nbsp;prijedlog"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Ispraviti&nbsp;prijedlog"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Slijediti&nbsp;prijedlog"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Pročitati&nbsp;rezultat"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Glasovati"
diff --git a/czech/po/bugs.cs.po b/czech/po/bugs.cs.po
index 0fd19f264d5..98a51d6ada0 100644
--- a/czech/po/bugs.cs.po
+++ b/czech/po/bugs.cs.po
@@ -155,146 +155,146 @@ msgstr "Archivované"
msgid "Archived and Unarchived"
msgstr "Archivované i nearchivované"
-#~ msgid "Exclude tag:"
-#~ msgstr "Vynechat značku:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Zahrnout značku:"
+#~ msgid "Flags:"
+#~ msgstr "Příznaky:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "aktivní chyby"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "zobrazit sloučené chyby pouze jednou"
-#~ msgid "wontfix"
-#~ msgstr "nebudu opravovat"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "netřídit podle stavu nebo závažnosti"
-#~ msgid "upstream"
-#~ msgstr "původní autor"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "v záhlaví nezobrazovat obsah"
-#~ msgid "unreproducible"
-#~ msgstr "nereprodukovatelné"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "v patičce nezobrazovat statistiku"
-#~ msgid "security"
-#~ msgstr "bezpečnost"
+#~ msgid "proposed-updates"
+#~ msgstr "navrhované aktualizace"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "navrhované testovací aktualizace"
-#~ msgid "moreinfo"
-#~ msgstr "více informací"
+#~ msgid "Package version:"
+#~ msgstr "Verze balíčku:"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "Distribution:"
+#~ msgstr "Distribuce:"
-#~ msgid "help"
-#~ msgstr "pomoc"
+#~ msgid "bugs"
+#~ msgstr "chyby"
-#~ msgid "fixed-upstream"
-#~ msgstr "opraveno u autora"
+#~ msgid "open"
+#~ msgstr "otevřený"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "opraveno v experimental"
+#~ msgid "forwarded"
+#~ msgstr "přeposlaný"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "čekající"
-#~ msgid "confirmed"
-#~ msgstr "potvrzeno"
+#~ msgid "fixed"
+#~ msgstr "opravený"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "vyřešený"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "Include status:"
+#~ msgstr "Zahrnout stav:"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "Exclude status:"
+#~ msgstr "Vynechat stav:"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "critical"
+#~ msgstr "kritický"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "grave"
+#~ msgstr "závažný"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "serious"
+#~ msgstr "vážný"
-#~ msgid "Exclude severity:"
-#~ msgstr "Vynechat závažnost:"
+#~ msgid "important"
+#~ msgstr "důležitý"
-#~ msgid "Include severity:"
-#~ msgstr "Zahrnout závažnost:"
+#~ msgid "minor"
+#~ msgstr "podružný"
#~ msgid "wishlist"
#~ msgstr "přání"
-#~ msgid "minor"
-#~ msgstr "podružný"
+#~ msgid "Include severity:"
+#~ msgstr "Zahrnout závažnost:"
-#~ msgid "important"
-#~ msgstr "důležitý"
+#~ msgid "Exclude severity:"
+#~ msgstr "Vynechat závažnost:"
-#~ msgid "serious"
-#~ msgstr "vážný"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "grave"
-#~ msgstr "závažný"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "critical"
-#~ msgstr "kritický"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "Vynechat stav:"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "Include status:"
-#~ msgstr "Zahrnout stav:"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "done"
-#~ msgstr "vyřešený"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "opravený"
+#~ msgid "confirmed"
+#~ msgstr "potvrzeno"
-#~ msgid "pending"
-#~ msgstr "čekající"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "přeposlaný"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "opraveno v experimental"
-#~ msgid "open"
-#~ msgstr "otevřený"
+#~ msgid "fixed-upstream"
+#~ msgstr "opraveno u autora"
-#~ msgid "bugs"
-#~ msgstr "chyby"
+#~ msgid "help"
+#~ msgstr "pomoc"
-#~ msgid "Distribution:"
-#~ msgstr "Distribuce:"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "Package version:"
-#~ msgstr "Verze balíčku:"
+#~ msgid "moreinfo"
+#~ msgstr "více informací"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "navrhované testovací aktualizace"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "proposed-updates"
-#~ msgstr "navrhované aktualizace"
+#~ msgid "security"
+#~ msgstr "bezpečnost"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "v patičce nezobrazovat statistiku"
+#~ msgid "unreproducible"
+#~ msgstr "nereprodukovatelné"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "v záhlaví nezobrazovat obsah"
+#~ msgid "upstream"
+#~ msgstr "původní autor"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "netřídit podle stavu nebo závažnosti"
+#~ msgid "wontfix"
+#~ msgstr "nebudu opravovat"
-#~ msgid "display merged bugs only once"
-#~ msgstr "zobrazit sloučené chyby pouze jednou"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "aktivní chyby"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Příznaky:"
+#~ msgid "Include tag:"
+#~ msgstr "Zahrnout značku:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Vynechat značku:"
diff --git a/czech/po/cdimage.cs.po b/czech/po/cdimage.cs.po
index 144f81a5316..61ab517088b 100644
--- a/czech/po/cdimage.cs.po
+++ b/czech/po/cdimage.cs.po
@@ -17,18 +17,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 " Fingerprint klíèe"
-#: ../../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/czech/po/distrib.cs.po b/czech/po/distrib.cs.po
index 9b87d120408..4da0fe9e5e0 100644
--- a/czech/po/distrib.cs.po
+++ b/czech/po/distrib.cs.po
@@ -134,67 +134,77 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
+#, fuzzy
+#| msgid "64-bit PC (amd64)"
+msgid "64-bit ARM (AArch64)"
+msgstr "64 bitové PC (amd64)"
+
+#: ../../english/releases/arches.data:12
msgid "EABI ARM"
msgstr "ARM EABI"
-#: ../../english/releases/arches.data:12
+#: ../../english/releases/arches.data:13
msgid "Hard Float ABI ARM"
msgstr "ARM s hardwarovým FPU"
-#: ../../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 pro 32 bitové PC (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr "32 bitové 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 pro 32 bitové PC (i386)"
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr "kFreeBSD pro 64 bitové 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 "IBM System z"
-#: ../../english/releases/arches.data:25
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
-
#~ msgid "Intel x86"
#~ msgstr "Intel x86"
+
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
diff --git a/czech/po/doc.cs.po b/czech/po/doc.cs.po
index df9ae72e4c7..d00298aad6a 100644
--- a/czech/po/doc.cs.po
+++ b/czech/po/doc.cs.po
@@ -13,7 +13,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"
@@ -28,7 +45,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"
@@ -37,15 +54,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"
@@ -54,13 +71,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"
@@ -75,7 +92,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 -- "
@@ -85,11 +102,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, "
@@ -109,7 +126,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"
@@ -117,11 +134,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"
@@ -129,11 +146,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"
@@ -145,24 +162,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 "
@@ -171,13 +191,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"
@@ -193,24 +213,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"
@@ -221,11 +241,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"
@@ -235,11 +255,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 "
@@ -250,11 +270,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"
@@ -264,11 +284,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"
@@ -276,7 +296,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 "
@@ -292,7 +312,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 "
@@ -322,49 +342,73 @@ msgstr "Obsahuje CD:"
msgid "Publisher:"
msgstr "Vydavatel:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Autoři:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Editoři:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Správce:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "Stav:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "Dostupnost:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "Poslední verze:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(verze <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 "prostý text"
-#. 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 ""
-"Stáhnout zdrojový SGML text <get-var ddp_pkg_loc /> pomocí <a href=\"cvs"
-"\">SVN</a>."
-#: ../../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"
@@ -374,27 +418,34 @@ msgstr ""
" na <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" a stáhněte modul <kbd>boot-floppies/documentation</kbd>."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "webové rozhraní pro CVS"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Balíček Debianu"
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
#, fuzzy
#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Balíček Debianu"
-#: ../../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 "Jazyk:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Stáhnout zdrojový SGML text <get-var ddp_pkg_loc /> pomocí <a href=\"cvs"
+#~ "\">SVN</a>."
diff --git a/czech/po/newsevents.cs.po b/czech/po/newsevents.cs.po
index 29b0de6754d..a52b256b358 100644
--- a/czech/po/newsevents.cs.po
+++ b/czech/po/newsevents.cs.po
@@ -30,27 +30,27 @@ msgstr ""
msgid "The newsletter for the Debian community"
msgstr "Občasník pro komunitu okolo Debianu"
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr "Jméno:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "Email:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Předchozí přednášky:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Jazyky:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Místo:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Témata:"
@@ -161,8 +161,8 @@ msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
"the Debian community. Topics covered in this issue include:"
msgstr ""
-"Vítejte v letošním <get-var issue />. čísle DPN, občasníku pro "
-"komunitu okolo Debianu. Témata v tomto vydání:"
+"Vítejte v letošním <get-var issue />. čísle DPN, občasníku pro komunitu "
+"okolo Debianu. Témata v tomto vydání:"
#: ../../english/template/debian/projectnews/boilerplates.wml:56
#: ../../english/template/debian/projectnews/boilerplates.wml:77
@@ -342,11 +342,12 @@ 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>."
+#| "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 ""
"Pokud chcete tento souhrn zpráv dostávat týdně do vaší poštovní schránky, <a "
"href=\"https://lists.debian.org/debian-news/\">přihlaste se do emailové "
@@ -489,3 +490,17 @@ msgid ""
msgstr ""
"<void id=\"plural\" />Toto vydání Debian týdeníku vydali <a href=\"mailto:"
"dwn@debian.org\">%s</a>."
+
+#, 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>."
+#~ msgstr ""
+#~ "Pokud chcete tento souhrn zpráv dostávat týdně do vaší poštovní schránky, "
+#~ "<a href=\"https://lists.debian.org/debian-news/\">přihlaste se do "
+#~ "emailové konference debian-news</a>."
diff --git a/czech/po/organization.cs.po b/czech/po/organization.cs.po
index b721a5eee1e..36d90009698 100644
--- a/czech/po/organization.cs.po
+++ b/czech/po/organization.cs.po
@@ -71,7 +71,7 @@ msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr ""
@@ -81,11 +81,11 @@ msgid "Publicity"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr ""
-#. 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 ""
msgid "Technical Committee"
msgstr ""
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr ""
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr ""
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr ""
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr ""
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr ""
@@ -218,159 +218,152 @@ msgstr ""
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr ""
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr ""
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr ""
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr ""
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr ""
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr ""
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr ""
-#: ../../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."
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr ""
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr ""
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr ""
diff --git a/czech/po/others.cs.po b/czech/po/others.cs.po
index 28b33f8142f..4dc80d6f4ed 100644
--- a/czech/po/others.cs.po
+++ b/czech/po/others.cs.po
@@ -156,26 +156,6 @@ msgstr ""
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr ""
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr ""
@@ -220,22 +200,34 @@ msgstr ""
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr ""
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
msgstr ""
+#: ../../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 ""
diff --git a/czech/po/templates.cs.po b/czech/po/templates.cs.po
index b9c981efc4c..edc5f75f1c5 100644
--- a/czech/po/templates.cs.po
+++ b/czech/po/templates.cs.po
@@ -50,9 +50,8 @@ msgid ""
"maintained and updated through the work of many users who volunteer their "
"time and effort."
msgstr ""
-"Debian je operační systém a distribuce svobodného softwaru. Je spravován "
-"a udržován za pomoci mnoha dobrovolníků, kteří mu věnují svůj čas "
-"a zkušenosti."
+"Debian je operační systém a distribuce svobodného softwaru. Je spravován a "
+"udržován za pomoci mnoha dobrovolníků, kteří mu věnují svůj čas a zkušenosti."
#: ../../english/template/debian/common_translation.wml:16
msgid "debian, GNU, linux, unix, open source, free, DFSG"
@@ -63,7 +62,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Zpět na <a href=\"m4_HOME/\">domovskou stránku projektu Debian</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 "Domovská stránka"
@@ -104,7 +103,7 @@ msgid "Support"
msgstr "Podpora"
#: ../../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 "Vývojářský koutek"
@@ -141,7 +140,7 @@ msgid "Miscellaneous"
msgstr "Ostatní"
#: ../../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 "Jak&nbsp;získat&nbsp;Debian"
@@ -195,7 +194,7 @@ msgstr "ve vydání 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 "
@@ -209,25 +208,25 @@ msgstr ""
"\">kontakty</a>. Zdrojový kód webových stránek <a href=\"m4_HOME/devel/"
"website/using_cvs\">je k dispozici</a>."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Poslední změna"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Copyright"
-#: ../../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> a další;"
-#: ../../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 ""
"Přečtěte si <a href=\"m4_HOME/license\" rel=\"copyright\">licenční podmínky</"
"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."
@@ -289,138 +288,148 @@ msgid "Debian Books"
msgstr "Knihy o Debianu"
#: ../../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 "Archivy poštovních konferencí"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Poštovní konference"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Společenská smlouva"
-#: ../../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 "Navštivte sponzora stránek"
-#: ../../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 - univerzální operační systém"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Přehled stránek Debianu"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Databáze vývojářů"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr "Časté dotazy"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Strategická příručka Debianu"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Manuál pro vývojáře"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Průvodce pro nové správce"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Chyby kritické pro vydání"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Hlášení Lintianu"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Archivy uživatelských poštovních konferencí"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Archivy vývojářských poštovních konferencí"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Archivy poštovních konferencí i18n/l10n"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Archivy poštovních konferencí jednotlivých portů"
-#: ../../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 "Archivy poštovních konferencí systému sledování chyb"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Archivy ostatních poštovních konferencí"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Svobodný software"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Vývoj"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Pomozte Debianu"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Hlášení chyb"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Porty/architektury"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Instalační příručka"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Prodejci CD"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "ISO obrazy CD/USB"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Síťová instalace"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Předinstalovaný"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Projekt Debian-Edu"
-#: ../../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 "Zajištění kvality"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Systém sledování balíčků"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Přehled balíčků vývojáře"
@@ -503,17 +512,17 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Zpět na stránku <a href=\"../\">Kdo používá Debian?</a>."
-#~ msgid "Rating:"
-#~ msgstr "Hodnocení:"
+#~ msgid "Select a server near you"
+#~ msgstr "Zvolte si nejbližší server"
-#~ msgid "Nobody"
-#~ msgstr "Nikdo"
+#~ msgid "More information:"
+#~ msgstr "Více informací:"
#~ msgid "Taken by:"
#~ msgstr "Převzal:"
-#~ msgid "More information:"
-#~ msgstr "Více informací:"
+#~ msgid "Nobody"
+#~ msgstr "Nikdo"
-#~ msgid "Select a server near you"
-#~ msgstr "Zvolte si nejbližší server"
+#~ msgid "Rating:"
+#~ msgstr "Hodnocení:"
diff --git a/czech/po/vendors.cs.po b/czech/po/vendors.cs.po
index a4d2dc537e8..1976f79667f 100644
--- a/czech/po/vendors.cs.po
+++ b/czech/po/vendors.cs.po
@@ -9,92 +9,56 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr ""
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr ""
#. ###################
#. 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 ""
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr ""
diff --git a/czech/po/vote.cs.po b/czech/po/vote.cs.po
index 34303254889..024aecede88 100644
--- a/czech/po/vote.cs.po
+++ b/czech/po/vote.cs.po
@@ -23,229 +23,245 @@ msgid "Time Line"
msgstr "Časová osa"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Nominace"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Debata"
-#: ../../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
msgid "Proposer"
msgstr ""
-#: ../../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
msgid "Minimum Discussion"
msgstr ""
-#: ../../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 ""
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr ""
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr ""
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr ""
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr ""
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr ""
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr ""
diff --git a/danish/po/bugs.da.po b/danish/po/bugs.da.po
index ea0be5dbe5c..a4a2a9666ef 100644
--- a/danish/po/bugs.da.po
+++ b/danish/po/bugs.da.po
@@ -155,152 +155,152 @@ msgstr "Arkiveret"
msgid "Archived and Unarchived"
msgstr "Arkiveret og uarkiveret"
-#~ msgid "Exclude tag:"
-#~ msgstr "Mærke indeholder ikke: "
-
-#~ msgid "Include tag:"
-#~ msgstr "Mærke indeholder: "
+#~ msgid "Flags:"
+#~ msgstr "Flag:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "aktive fejl"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "vis kun flettede fejl én gang"
-#~ msgid "wontfix"
-#~ msgstr "vil ikke rette"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ingen sortering på status/alvorlighedsgrad"
-#~ msgid "upstream"
-#~ msgstr "opstrøm"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "vis ikke indholdsfortegnelse øverst"
-#~ msgid "unreproducible"
-#~ msgstr "ikke reproducérbar"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "vis ikke statistik i bunden"
-#~ msgid "security"
-#~ msgstr "sikkerhed"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "moreinfo"
-#~ msgstr "mere info"
+#~ msgid "Package version:"
+#~ msgstr "Pakkeversion:"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "Distribution:"
+#~ msgstr "Distribution:"
-#~ msgid "help"
-#~ msgstr "hjælp"
+#~ msgid "bugs"
+#~ msgstr "fejl"
-#~ msgid "fixed-upstream"
-#~ msgstr "rettet-opstrøm"
+#~ msgid "open"
+#~ msgstr "åben"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "rettet-i-eksperimentel"
+#~ msgid "forwarded"
+#~ msgstr "videresendt"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "i gang"
-#~ msgid "confirmed"
-#~ msgstr "bekræftet"
+#~ msgid "fixed"
+#~ msgstr "rettet"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "færdig"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignorer"
+#~ msgid "Include status:"
+#~ msgstr "Status indeholder: "
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "Exclude status:"
+#~ msgstr "Status indeholder ikke: "
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignorer"
+#~ msgid "critical"
+#~ msgstr "kritisk"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "graverende"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignorer"
+#~ msgid "serious"
+#~ msgstr "alvorlig"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "vigtig"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "mindre"
-#~ msgid "Exclude severity:"
-#~ msgstr "Alvorlighedsgrad indeholder ikke: "
+#~ msgid "wishlist"
+#~ msgstr "ønskeliste"
#~ msgid "Include severity:"
#~ msgstr "Alvorlighedsgrad indeholder: "
-#~ msgid "wishlist"
-#~ msgstr "ønskeliste"
+#~ msgid "Exclude severity:"
+#~ msgstr "Alvorlighedsgrad indeholder ikke: "
-#~ msgid "minor"
-#~ msgstr "mindre"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "important"
-#~ msgstr "vigtig"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "serious"
-#~ msgstr "alvorlig"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignorer"
-#~ msgid "grave"
-#~ msgstr "graverende"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "critical"
-#~ msgstr "kritisk"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignorer"
-#~ msgid "Exclude status:"
-#~ msgstr "Status indeholder ikke: "
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "Include status:"
-#~ msgstr "Status indeholder: "
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignorer"
-#~ msgid "done"
-#~ msgstr "færdig"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "rettet"
+#~ msgid "confirmed"
+#~ msgstr "bekræftet"
-#~ msgid "pending"
-#~ msgstr "i gang"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "videresendt"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "rettet-i-eksperimentel"
-#~ msgid "open"
-#~ msgstr "åben"
+#~ msgid "fixed-upstream"
+#~ msgstr "rettet-opstrøm"
-#~ msgid "bugs"
-#~ msgstr "fejl"
+#~ msgid "help"
+#~ msgstr "hjælp"
-#~ msgid "Distribution:"
-#~ msgstr "Distribution:"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "Package version:"
-#~ msgstr "Pakkeversion:"
+#~ msgid "moreinfo"
+#~ msgstr "mere info"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "security"
+#~ msgstr "sikkerhed"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "vis ikke statistik i bunden"
+#~ msgid "unreproducible"
+#~ msgstr "ikke reproducérbar"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "vis ikke indholdsfortegnelse øverst"
+#~ msgid "upstream"
+#~ msgstr "opstrøm"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ingen sortering på status/alvorlighedsgrad"
+#~ msgid "wontfix"
+#~ msgstr "vil ikke rette"
-#~ msgid "display merged bugs only once"
-#~ msgstr "vis kun flettede fejl én gang"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "aktive fejl"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Flag:"
+#~ msgid "Include tag:"
+#~ msgstr "Mærke indeholder: "
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Mærke indeholder ikke: "
diff --git a/danish/po/cdimage.da.po b/danish/po/cdimage.da.po
index 45f0e760af2..0e58bdaa343 100644
--- a/danish/po/cdimage.da.po
+++ b/danish/po/cdimage.da.po
@@ -10,16 +10,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../english/CD/CD-keys.data:5 ../../english/CD/CD-keys.data:9
-#: ../../english/CD/CD-keys.data:14
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
msgid " Key fingerprint"
msgstr " Nøglefingeraftryk"
-#: ../../english/devel/debian-installer/images.data:92
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "ISO-aftryk"
-#: ../../english/devel/debian-installer/images.data:93
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "Jigdo-filer"
diff --git a/danish/po/countries.da.po b/danish/po/countries.da.po
index cfbc9db802c..66aed0bb1be 100644
--- a/danish/po/countries.da.po
+++ b/danish/po/countries.da.po
@@ -421,8 +421,8 @@ msgstr "Sydafrika"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#~ msgid "Great Britain"
-#~ msgstr "Storbritannien"
-
#~ msgid "Yugoslavia"
#~ msgstr "Jugoslavien"
+
+#~ msgid "Great Britain"
+#~ msgstr "Storbritannien"
diff --git a/danish/po/distrib.da.po b/danish/po/distrib.da.po
index 41e810de9ff..94af6784f88 100644
--- a/danish/po/distrib.da.po
+++ b/danish/po/distrib.da.po
@@ -196,53 +196,53 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "pakker der indeholder filer eller mapper med navne som dette"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "all files in this package"
-#~ msgstr "alle filer i denne pakke"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Case sensitive"
-#~ msgstr "Gør søgningen afhængig af små/store bogstaver"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "no"
-#~ msgstr "nej"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "yes"
-#~ msgstr "ja"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Tillad søgning på dele af ord"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Search case sensitive"
-#~ msgstr "Gør søgningen afhængig af små/store bogstaver"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
#~ msgid "MIPS (DEC)"
#~ msgstr "MIPS (DEC)"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Search case sensitive"
+#~ msgstr "Gør søgningen afhængig af små/store bogstaver"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Tillad søgning på dele af ord"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "yes"
+#~ msgstr "ja"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "no"
+#~ msgstr "nej"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "Case sensitive"
+#~ msgstr "Gør søgningen afhængig af små/store bogstaver"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "all files in this package"
+#~ msgstr "alle filer i denne pakke"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "pakker der indeholder filer eller mapper med navne som dette"
diff --git a/danish/po/doc.da.po b/danish/po/doc.da.po
index c38e37cb68b..e49a21537a2 100644
--- a/danish/po/doc.da.po
+++ b/danish/po/doc.da.po
@@ -102,12 +102,12 @@ msgstr ""
" en omfattede dækning af Debians unikke pakkehåndteringssystem."
#: ../../english/doc/books.data:104 ../../english/doc/books.data:207
-#: ../../english/doc/books.data:251 ../../english/doc/books.data:296
+#: ../../english/doc/books.data:267 ../../english/doc/books.data:312
msgid "official Debian GNU/Linux 3.1r0a \"sarge\" on DVD (i386)"
msgstr "officiel Debian GNU/Linux 3.1r0a sarge på dvd (i386)"
#: ../../english/doc/books.data:107 ../../english/doc/books.data:210
-#: ../../english/doc/books.data:254 ../../english/doc/books.data:299
+#: ../../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"
@@ -244,15 +244,27 @@ msgstr ""
"pålideligt\n"
" netværk med Debian."
-#: ../../english/doc/books.data:232
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "to udgaver: En uden cd og en med cd (i386)"
-#: ../../english/doc/books.data:240
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 og amd64) på dvd"
-#: ../../english/doc/books.data:243
+#: ../../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 "
@@ -266,14 +278,14 @@ msgstr ""
"praktisk håndbog for alle brugere, der ønsker at lære mere om Debian og dens "
"store udvalg af services."
-#: ../../english/doc/books.data:271
+#: ../../english/doc/books.data:287
msgid ""
"2 editions: One with no CD, the other with Official CD (i386, contrib and "
"sources)"
msgstr ""
"to udgaver: En uden cd og en med officiel cd (i386, contrib og kildekode)"
-#: ../../english/doc/books.data:274
+#: ../../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"
@@ -304,11 +316,11 @@ msgstr ""
"server\n"
" til Windows-baserede klienter (SAMBA)."
-#: ../../english/doc/books.data:317
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "Debian GNU/Linux 3.1 Sarge-installer (enkeltbredde-cd)"
-#: ../../english/doc/books.data:320
+#: ../../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"
@@ -318,13 +330,13 @@ msgstr ""
"begyndere og viderkommende brugere; installering på forskellige måder,\n"
"tilpasning af skrivebordsmiljøet, problemløsning, profitabel knowhow, osv."
-#: ../../english/doc/books.data:333
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
msgstr "Debian GNU/Linux 3.1r0 i386, forfatterens udgave (dvd+cd)"
-#: ../../english/doc/books.data:337
+#: ../../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"
@@ -342,11 +354,11 @@ msgstr ""
"en kommerciel skrifttypepakke. Bogen er nyttig for alle Debian-brugere,\n"
"fra begyndere til viderekomne."
-#: ../../english/doc/books.data:352
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr "Debian 2.2r0 i386 forfatterens udgave (3 cd'er)"
-#: ../../english/doc/books.data:355
+#: ../../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"
@@ -362,11 +374,11 @@ msgstr ""
"Debian\n"
" GNU/Linux i et japansk miljø.GNU/Linux i et japansk miljø."
-#: ../../english/doc/books.data:371
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "en uofficiel Woody, tre Potato rev0"
-#: ../../english/doc/books.data:374
+#: ../../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 "
@@ -383,11 +395,11 @@ msgstr ""
"dækker også vedligeholdelsesoplysninger, som kan pirre koreanere til at\n"
"blive officielle Debian-vedligeholdere."
-#: ../../english/doc/books.data:388
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr "Tre officielle potato r3-cd'er og en uofficiel woody-cd"
-#: ../../english/doc/books.data:391
+#: ../../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"
@@ -404,11 +416,11 @@ msgstr ""
"Linux-systemet i et koreansk sprogmiljø. Også god for Debian GNU/Linux-\n"
"begyndere."
-#: ../../english/doc/books.data:413
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "Debian GNU/Linux 3.1r0 cd1"
-#: ../../english/doc/books.data:416
+#: ../../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"
@@ -420,7 +432,7 @@ msgstr ""
"database, firewall, mail, ftp osv. på systemet. Man hjælpes også i gang\n"
"med at anvende GNU/Linux og Debians avancerede pakkehåndteringssystem."
-#: ../../english/doc/books.data:432
+#: ../../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 "
@@ -447,7 +459,7 @@ msgstr ""
"systemets ydelse. Bogen er rettet med univeritetsstuderende og alle der\n"
"ønsker at lære GNU/Linux til bunds. Bogen dækker Debian sarge."
-#: ../../english/doc/books.data:455
+#: ../../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 "
@@ -587,19 +599,6 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Latest version in development:"
-#~ msgstr "Seneste udviklingsversion:"
-
-#~ msgid "Language:"
-#~ msgstr "Sprog:"
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Brug <a href=\"cvs\">SVN</a> til at hente SGML-kildekodeteksten til <get-"
-#~ "var ddp_pkg_loc />."
-
#~ msgid ""
#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
#~ "mode=viewone&amp;titnr=254925022\">\n"
@@ -611,3 +610,16 @@ msgstr "PDF"
#~ "mode=viewone&amp;titnr=254925022\">\n"
#~ " udgivelse</a> er tilgængelig fra Lehmanns Fachbuchhandlung og koster\n"
#~ " 29,95 € (pr. 2008)."
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Brug <a href=\"cvs\">SVN</a> til at hente SGML-kildekodeteksten til <get-"
+#~ "var ddp_pkg_loc />."
+
+#~ msgid "Language:"
+#~ msgstr "Sprog:"
+
+#~ msgid "Latest version in development:"
+#~ msgstr "Seneste udviklingsversion:"
diff --git a/danish/po/l10n.da.po b/danish/po/l10n.da.po
index 85edfced24a..45f6faf9b32 100644
--- a/danish/po/l10n.da.po
+++ b/danish/po/l10n.da.po
@@ -94,11 +94,11 @@ msgstr "POT-filer"
msgid "Hints for translators"
msgstr "Tips til oversættere"
-#~ msgid "Todo"
-#~ msgstr "Skal gøres"
+#~ msgid "Original templates"
+#~ msgstr "Original skabelon"
#~ msgid "Translated templates"
#~ msgstr "Oversatte skabeloner"
-#~ msgid "Original templates"
-#~ msgstr "Original skabelon"
+#~ msgid "Todo"
+#~ msgstr "Skal gøres"
diff --git a/danish/po/mailinglists.da.po b/danish/po/mailinglists.da.po
index fbf8ea69fc8..cadb770e460 100644
--- a/danish/po/mailinglists.da.po
+++ b/danish/po/mailinglists.da.po
@@ -127,8 +127,8 @@ msgstr "åben"
msgid "closed"
msgstr "lukket"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Vælg hvilke lister du ønsker at ophæve abonnementet på:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Vælg de lister du ønsker at abonnere på:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Vælg hvilke lister du ønsker at ophæve abonnementet på:"
diff --git a/danish/po/organization.da.po b/danish/po/organization.da.po
index 1f31da7b132..f8b71914403 100644
--- a/danish/po/organization.da.po
+++ b/danish/po/organization.da.po
@@ -71,17 +71,17 @@ msgid "Officers"
msgstr "Bestyrelesesmedlemmer"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:79
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribution"
#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:221
+#: ../../english/intro/organization.data:220
msgid "Publicity"
msgstr "PR"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Support og infrastruktur"
@@ -98,191 +98,191 @@ 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:82
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Udviklingsprojekter"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Ftp-arkiv"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "Ftp-mastere"
-#: ../../english/intro/organization.data:89
+#: ../../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 "Ftp-troldmænd"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Backports-holdet"
-#: ../../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 "Udgivelsesstyring"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Udgivelseshold"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Kvalitetssikring"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Startdisketter"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Udgivelsesbemærkninger"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Cd-aftryk"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Produktion"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Tester"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Autoopbygning og infrastruktur"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Wanna-build-hold"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Buildd-administration"
-#: ../../english/intro/organization.data:167
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Dokumentation"
-#: ../../english/intro/organization.data:172
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Pakker der skal arbejdes på og fremtidige pakker"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Live System-holdet"
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Tilpasninger"
-#: ../../english/intro/organization.data:211
+#: ../../english/intro/organization.data:210
msgid "Special Configurations"
msgstr "Specielle systemer"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:213
msgid "Laptops"
msgstr "Bærbare"
-#: ../../english/intro/organization.data:215
+#: ../../english/intro/organization.data:214
msgid "Firewalls"
msgstr "Firewalls"
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:215
msgid "Embedded systems"
msgstr "Embedded systemer"
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:223
msgid "Press Contact"
msgstr "Pressekontakt"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:229
msgid "Partner Program"
msgstr "Partnerskabsprogram"
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Begivenheder"
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Bits fra Debian"
-#: ../../english/intro/organization.data:248
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Hjælp til brugere"
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Fejlrapporteringssystem"
-#: ../../english/intro/organization.data:320
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Postlisteadministration og postlistearkiver"
-#: ../../english/intro/organization.data:328
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Reception for nye medlemmer"
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Debians kontoadministratorer"
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Vedligeholdere af nøglering (PGP og GPG)"
-#: ../../english/intro/organization.data:343
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Vedligeholdere af Debian Maintainer-nøglering (DM)"
-#: ../../english/intro/organization.data:347
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Sikkerhedsteam"
-#: ../../english/intro/organization.data:362
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Websider"
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Konsulentside"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Cd-forhandlerside"
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Retningslinier"
-#: ../../english/intro/organization.data:386
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Systemadministration"
-#: ../../english/intro/organization.data:387
+#: ../../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."
@@ -291,7 +291,7 @@ msgstr ""
"inklusive problemer med adgangskoder eller hvis du har brug for at en pakke "
"bliver installeret."
-#: ../../english/intro/organization.data:397
+#: ../../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 "
@@ -301,151 +301,125 @@ msgstr ""
"debian.org/machines.cgi\">Debians maskineside</a>, den skulle indeholde "
"administratoroplysninger for hver enkelt maskine."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Administrator af LDAP-udvikleroversigten"
-#: ../../english/intro/organization.data:399
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Filspejle"
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "DNS-ansvarlig"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Pakkesporingssystem"
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Koordinering af hardwaredonationer"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Revisor"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:413
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-"Ønsker om at anvende "
-"<a name=\"trademark\" href=\"m4_HOME/trademark\">varemærke</a>"
-
-#: ../../english/intro/organization.data:417
-msgid "current Debian Project Leader"
-msgstr "nuværende Debian-projektleder"
+"Ønsker om at anvende <a name=\"trademark\" href=\"m4_HOME/trademark"
+"\">varemærke</a>"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Alioth-administratorer"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Debian Women-projektet"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "DebConf-ledere"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Bekæmpelse af chikane"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:436
msgid "Outreach"
msgstr "Opsøgning"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:446
msgid "Debian for children from 1 to 99"
msgstr "Debian for børn mellem 1 og 99"
-#: ../../english/intro/organization.data:452
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian til lægepraksiser og forskning"
-#: ../../english/intro/organization.data:455
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian til uddannelse"
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian på juridiske kontorer"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian til handicappede"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian til videnskabelig og relateret forskning"
-#~ msgid "Testing Security Team"
-#~ msgstr "Testings Sikkerhedsteam"
-
-#~ msgid "Security Audit Project"
-#~ msgstr "Sikkerhedsauditprojektet"
-
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (ikke aktiv: blev ikke udgivet med squeeze)"
-
-#~ msgid "Volatile Team"
-#~ msgstr "Volatile-hold"
+#~ msgid "Summer of Code 2013 Administrators"
+#~ msgstr "Summer of Code 2013-administratorer"
-#~ 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 ""
-#~ "De ansvarlige administratorer for buildd'erne til en bestemt arkitektur, "
-#~ "kan kontaktes på <genericemail arch@buildd.debian.org>, eksempelvis "
-#~ "<genericemail i386@buildd.debian.org>."
+#~ msgid "Vendors"
+#~ msgstr "Forhandlere"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Navne på individuelle buildd'ers administratorer kan også findes på <a "
-#~ "href=\"http://www.buildd.net\">http://www.buildd.net</a>. Vælg en "
-#~ "arkitektur og en distribution, for at se de tilgængelige buildd'er og "
-#~ "deres administratorer."
+#~ msgid "Handhelds"
+#~ msgstr "Håndholdte"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Postlistearkiv"
+#~ msgid "Marketing Team"
+#~ msgstr "Marketingsholdet"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux til 'enterprise computing'"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinering af nøglesignering"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Installationssystem til 'stable'"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Debians skræddersyede distribution"
-#~ msgid "Internal Projects"
-#~ msgstr "Interne projekter"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Udgivelseshold vedr. den \"stabile\" udgave"
-#~ msgid "Mailing list"
-#~ msgstr "Postliste"
+#~ msgid "Accountant"
+#~ msgstr "Bogholder"
-#~ msgid "Installation"
-#~ msgstr "Installation"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Det universelle styresystem som din desktop"
-#~ msgid "Delegates"
-#~ msgstr "Delegerede"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian for almennyttige organisationer"
-#~ msgid "Debian-Med"
-#~ msgstr "Debian-Med"
+#~ msgid "APT Team"
+#~ msgstr "APT-team"
-#~ msgid "Debian-Edu"
-#~ msgstr "Debian-Edu"
+#~ msgid "Release Assistants"
+#~ msgstr "Udgivelsesassistenter"
-#~ msgid "Debian-Desktop"
-#~ msgstr "Debian-Desktop"
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "Udgivelsesassistenter for den \"stabile\" udgave"
-#~ msgid "Debian-Lex"
-#~ msgstr "Debian-Lex"
+#~ msgid "Release Wizard"
+#~ msgstr "Udgivelsestroldmand"
-#~ msgid "Proposed Debian internal project."
-#~ msgstr "Foreslået internt Debian-projekt."
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debians multimedie-distribution"
#~ msgid ""
#~ "This is not yet an official Debian internal project but it has announced "
@@ -454,47 +428,72 @@ msgstr "Debian til videnskabelig og relateret forskning"
#~ "Dette er endnu ikke et officelt internt Debian-projekt, men ønsket om at "
#~ "blive integreret er blevet annonceret."
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debians multimedie-distribution"
+#~ msgid "Proposed Debian internal project."
+#~ msgstr "Foreslået internt Debian-projekt."
-#~ msgid "Release Wizard"
-#~ msgstr "Udgivelsestroldmand"
+#~ msgid "Debian-Lex"
+#~ msgstr "Debian-Lex"
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "Udgivelsesassistenter for den \"stabile\" udgave"
+#~ msgid "Debian-Desktop"
+#~ msgstr "Debian-Desktop"
-#~ msgid "Release Assistants"
-#~ msgstr "Udgivelsesassistenter"
+#~ msgid "Debian-Edu"
+#~ msgstr "Debian-Edu"
-#~ msgid "APT Team"
-#~ msgstr "APT-team"
+#~ msgid "Debian-Med"
+#~ msgstr "Debian-Med"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian for almennyttige organisationer"
+#~ msgid "Delegates"
+#~ msgstr "Delegerede"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Det universelle styresystem som din desktop"
+#~ msgid "Installation"
+#~ msgstr "Installation"
-#~ msgid "Accountant"
-#~ msgstr "Bogholder"
+#~ msgid "Mailing list"
+#~ msgstr "Postliste"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Udgivelseshold vedr. den \"stabile\" udgave"
+#~ msgid "Internal Projects"
+#~ msgstr "Interne projekter"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Debians skræddersyede distribution"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Installationssystem til 'stable'"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinering af nøglesignering"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux til 'enterprise computing'"
-#~ msgid "Marketing Team"
-#~ msgstr "Marketingsholdet"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Postlistearkiv"
-#~ msgid "Handhelds"
-#~ msgstr "Håndholdte"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Navne på individuelle buildd'ers administratorer kan også findes på <a "
+#~ "href=\"http://www.buildd.net\">http://www.buildd.net</a>. Vælg en "
+#~ "arkitektur og en distribution, for at se de tilgængelige buildd'er og "
+#~ "deres administratorer."
-#~ msgid "Vendors"
-#~ msgstr "Forhandlere"
+#~ 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 ""
+#~ "De ansvarlige administratorer for buildd'erne til en bestemt arkitektur, "
+#~ "kan kontaktes på <genericemail arch@buildd.debian.org>, eksempelvis "
+#~ "<genericemail i386@buildd.debian.org>."
-#~ msgid "Summer of Code 2013 Administrators"
-#~ msgstr "Summer of Code 2013-administratorer"
+#~ msgid "Volatile Team"
+#~ msgstr "Volatile-hold"
+
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (ikke aktiv: blev ikke udgivet med squeeze)"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "Sikkerhedsauditprojektet"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "Testings Sikkerhedsteam"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "nuværende Debian-projektleder"
diff --git a/danish/po/others.da.po b/danish/po/others.da.po
index 38efbf74f7f..e9a5ae0e034 100644
--- a/danish/po/others.da.po
+++ b/danish/po/others.da.po
@@ -309,126 +309,91 @@ msgstr "Version"
msgid "URL"
msgstr "URL"
-#~ msgid "Name:"
-#~ msgstr "Navn:"
-
-#~ msgid "Company:"
-#~ msgstr "Firma:"
-
-#~ msgid "URL:"
-#~ msgstr "Webadresse:"
+#~ msgid "Wanted:"
+#~ msgstr "Ønskes:"
-#~ msgid "or"
-#~ msgstr "eller"
+#~ msgid "Who:"
+#~ msgstr "Hvem:"
-#~ msgid "Email:"
-#~ msgstr "E-mail:"
+#~ msgid "Architecture:"
+#~ msgstr "Arkitektur:"
-#~ msgid "Rates:"
-#~ msgstr "Priser:"
+#~ msgid "Specifications:"
+#~ msgstr "Specifikationer:"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Kan flytte"
+#~ msgid "Where:"
+#~ msgstr "Hvor:"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "<total_consultant> Debian-konsulenter i <total_country> lande over hele "
-#~ "verden er vist ."
+#~ msgid "p<get-var page />"
+#~ msgstr "s.<get-var page />"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Postliste-abonnement"
+#~ msgid "Previous Talks:"
+#~ msgstr "Tidligere foredrag:"
-#~ 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. "
-#~ msgstr ""
-#~ "Se <a href=\"./#subunsub\">postliste</a>-siden for oplysninger om hvordan "
-#~ "man tegner abonnement via e-mail. Der findes også en webformular til <a "
-#~ "href=\"unsubscribe\">ophævelse af abonnement</a> på postlister. "
+#~ msgid "Languages:"
+#~ msgstr "Sprog:"
-#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
-#~ msgstr ""
-#~ "Bemærk at de fleste af Debians postlister er offentlige forummer. Alle e-"
-#~ "mails der sendes til listerne, vil kunne ses i de offentlige "
-#~ "postlistearkiver og de vil blive indekseret af søgemaskiner. Du bør kun "
-#~ "tegne abonnement på Debians postlister med en e-mail-adresse, som gerne "
-#~ "må offentliggøres."
+#~ msgid "Location:"
+#~ msgstr "Sted:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Vælg de lister du ønsker at abonnere på:"
+#~ msgid "Topics:"
+#~ msgstr "Emner:"
-#~ msgid "No description given"
-#~ msgstr "Beskrivelse mangler"
+#~ msgid "rc3 (broken)"
+#~ msgstr "rc3 (fungerer ikke)"
-#~ msgid "Moderated:"
-#~ msgstr "Modereret:"
+#~ msgid "rc3"
+#~ msgstr "rc3"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Kun abonnenter kan sende til listen."
+#~ msgid "rc2 (broken)"
+#~ msgstr "rc2 (fungerer ikke)"
-#~ msgid ""
-#~ "Only messages signed by a Debian developer will be accepted by this list."
-#~ msgstr ""
-#~ "Kun beskeder signeret af en Debian-udvikler accepteres på denne liste."
+#~ msgid "rc2"
+#~ msgstr "rc2"
-#~ msgid "Subscription:"
-#~ msgstr "Abonnement:"
+#~ msgid "Debian GNU/Linux: Your next Linux distribution."
+#~ msgstr "Debian GNU/Linux: Your next Linux distribution."
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "er kun læsbar, sammendragsversion."
+#~ msgid "Debian: The Perfect OS"
+#~ msgstr "Debian: The Perfect OS"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Din e-mail-adresse:"
+#~ msgid "Debian: The biggest is still the best."
+#~ msgstr "Debian: The biggest is still the best."
-#~ msgid "Subscribe"
-#~ msgstr "Abonnér"
+#~ msgid "Older Debian banners"
+#~ msgstr "Ældre Debian-bannere"
-#~ msgid "Clear"
-#~ msgstr "Nulstil"
+#~ msgid "Debian: the potato has landed. announcing version 2.2"
+#~ msgstr "Debian: the potato has landed. announcing version 2.2"
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr ""
-#~ "Overhold venligst <a href=\"./#ads\">Debians annonceringsregler for "
-#~ "postlisterne</a>."
+#~ msgid "Debian: apt-get into it."
+#~ msgstr "Debian: apt-get into it."
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Ophæv abonnement på postliste"
+#~ msgid "Newer Debian banners"
+#~ msgstr "Nyere Debian-bannere"
-#~ 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\">postliste</a>-siden for oplysninger om hvordan "
-#~ "man ophæver abonnement via e-mail. Der findes også en webformular til <a "
-#~ "href=\"subscribe\">tegning af abonnement</a> på postlister. "
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "animeret&nbsp;GIF-banner"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Vælg hvilke lister du ønsker at ophæve abonnementet på:"
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "horisontalt&nbsp;banner"
-#~ msgid "Unsubscribe"
-#~ msgstr "Ophæv"
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "vertikalt&nbsp;banner"
-#~ msgid "open"
-#~ msgstr "åben"
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "kun Debians tekniske komité"
-#~ msgid "closed"
-#~ msgstr "lukket"
+#~ msgid "deity developers only"
+#~ msgstr "kun deity-udviklere"
-#~ msgid "beta 4"
-#~ msgstr "beta 4"
+#~ msgid "developers only"
+#~ msgstr "kun udviklere"
-#~ msgid "Q"
-#~ msgstr "Sp"
+#~ msgid "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">more info</a>)"
+#~ msgstr ""
+#~ "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">flere oplysninger</"
+#~ "a>)"
#~ msgid ""
#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.php\">more info</a>)"
@@ -436,88 +401,123 @@ msgstr "URL"
#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.html\">flere "
#~ "oplysninger</a>)"
-#~ msgid "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">more info</a>)"
-#~ msgstr ""
-#~ "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">flere oplysninger</"
-#~ "a>)"
+#~ msgid "Q"
+#~ msgstr "Sp"
-#~ msgid "developers only"
-#~ msgstr "kun udviklere"
+#~ msgid "beta 4"
+#~ msgstr "beta 4"
-#~ msgid "deity developers only"
-#~ msgstr "kun deity-udviklere"
+#~ msgid "closed"
+#~ msgstr "lukket"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "kun Debians tekniske komité"
+#~ msgid "open"
+#~ msgstr "åben"
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "vertikalt&nbsp;banner"
+#~ msgid "Unsubscribe"
+#~ msgstr "Ophæv"
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "horisontalt&nbsp;banner"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Vælg hvilke lister du ønsker at ophæve abonnementet på:"
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "animeret&nbsp;GIF-banner"
+#~ 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\">postliste</a>-siden for oplysninger om hvordan "
+#~ "man ophæver abonnement via e-mail. Der findes også en webformular til <a "
+#~ "href=\"subscribe\">tegning af abonnement</a> på postlister. "
-#~ msgid "Newer Debian banners"
-#~ msgstr "Nyere Debian-bannere"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Ophæv abonnement på postliste"
-#~ msgid "Debian: apt-get into it."
-#~ msgstr "Debian: apt-get into it."
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr ""
+#~ "Overhold venligst <a href=\"./#ads\">Debians annonceringsregler for "
+#~ "postlisterne</a>."
-#~ msgid "Debian: the potato has landed. announcing version 2.2"
-#~ msgstr "Debian: the potato has landed. announcing version 2.2"
+#~ msgid "Clear"
+#~ msgstr "Nulstil"
-#~ msgid "Older Debian banners"
-#~ msgstr "Ældre Debian-bannere"
+#~ msgid "Subscribe"
+#~ msgstr "Abonnér"
-#~ msgid "Debian: The biggest is still the best."
-#~ msgstr "Debian: The biggest is still the best."
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Din e-mail-adresse:"
-#~ msgid "Debian: The Perfect OS"
-#~ msgstr "Debian: The Perfect OS"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "er kun læsbar, sammendragsversion."
-#~ msgid "Debian GNU/Linux: Your next Linux distribution."
-#~ msgstr "Debian GNU/Linux: Your next Linux distribution."
+#~ msgid "Subscription:"
+#~ msgstr "Abonnement:"
-#~ msgid "rc2"
-#~ msgstr "rc2"
+#~ msgid ""
+#~ "Only messages signed by a Debian developer will be accepted by this list."
+#~ msgstr ""
+#~ "Kun beskeder signeret af en Debian-udvikler accepteres på denne liste."
-#~ msgid "rc2 (broken)"
-#~ msgstr "rc2 (fungerer ikke)"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Kun abonnenter kan sende til listen."
-#~ msgid "rc3"
-#~ msgstr "rc3"
+#~ msgid "Moderated:"
+#~ msgstr "Modereret:"
-#~ msgid "rc3 (broken)"
-#~ msgstr "rc3 (fungerer ikke)"
+#~ msgid "No description given"
+#~ msgstr "Beskrivelse mangler"
-#~ msgid "Topics:"
-#~ msgstr "Emner:"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Vælg de lister du ønsker at abonnere på:"
-#~ msgid "Location:"
-#~ msgstr "Sted:"
+#~ msgid ""
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
+#~ msgstr ""
+#~ "Bemærk at de fleste af Debians postlister er offentlige forummer. Alle e-"
+#~ "mails der sendes til listerne, vil kunne ses i de offentlige "
+#~ "postlistearkiver og de vil blive indekseret af søgemaskiner. Du bør kun "
+#~ "tegne abonnement på Debians postlister med en e-mail-adresse, som gerne "
+#~ "må offentliggøres."
-#~ msgid "Languages:"
-#~ msgstr "Sprog:"
+#~ 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. "
+#~ msgstr ""
+#~ "Se <a href=\"./#subunsub\">postliste</a>-siden for oplysninger om hvordan "
+#~ "man tegner abonnement via e-mail. Der findes også en webformular til <a "
+#~ "href=\"unsubscribe\">ophævelse af abonnement</a> på postlister. "
-#~ msgid "Previous Talks:"
-#~ msgstr "Tidligere foredrag:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Postliste-abonnement"
-#~ msgid "p<get-var page />"
-#~ msgstr "s.<get-var page />"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> Debian-konsulenter i <total_country> lande over hele "
+#~ "verden er vist ."
-#~ msgid "Where:"
-#~ msgstr "Hvor:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Kan flytte"
-#~ msgid "Specifications:"
-#~ msgstr "Specifikationer:"
+#~ msgid "Rates:"
+#~ msgstr "Priser:"
-#~ msgid "Architecture:"
-#~ msgstr "Arkitektur:"
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
-#~ msgid "Who:"
-#~ msgstr "Hvem:"
+#~ msgid "or"
+#~ msgstr "eller"
-#~ msgid "Wanted:"
-#~ msgstr "Ønskes:"
+#~ msgid "URL:"
+#~ msgstr "Webadresse:"
+
+#~ msgid "Company:"
+#~ msgstr "Firma:"
+
+#~ msgid "Name:"
+#~ msgstr "Navn:"
diff --git a/danish/po/ports.da.po b/danish/po/ports.da.po
index b40f7f8c8e8..bb7ec2df2fc 100644
--- a/danish/po/ports.da.po
+++ b/danish/po/ports.da.po
@@ -113,135 +113,135 @@ msgstr "Debian til PowerPC"
msgid "Debian for Sparc"
msgstr "Debian til Sparc"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian til AMD64"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian til bærbare"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian til ARM"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, LCD-controller, Compact Flash, UART, parallel, RTC, tastatur, "
+#~ "USB, touchpad, audio"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian til Beowulf"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Compact Flash, UART, parallel, RTC, audio, PCIC"
-#~ msgid "Main"
-#~ msgstr "Forside"
+#~ msgid ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgstr ""
+#~ "Mips 16, RTC, tastatur, TouchPanel, audio, Compact-Flash, UART, parallel"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian til Motorola 680x0"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 L2-cache på chip'en"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian til MIPS"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, ekstern 64-bits bus, ekstern L2-cache"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian til S/390"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, ekstern 64-bits bus"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian til Sparc64"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, ekstern 32-bits bus"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "libc5-baseret Debian GNU/FreeBSD"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 10/100 ethernet, 4 UART, IrDA, AC'97, I2C, 38 digital I/O"
-#~ msgid "Vendor/Name"
-#~ msgstr "Fabrikant/navn"
+#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "Ingen FPU, SDRAMC, ROMC, DMAC, PCIC, UART, timer"
-#~ msgid "Date announced"
-#~ msgstr "Annonceret den"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "Ingen FPU, SDRAMC, ROMC, UART, timer, PCMCIA, IrDA"
-#~ msgid "Clock"
-#~ msgstr "Klokfrekvens"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "Ingen FPU, SDRAMC, ROMC, UART, timer, PCMCIA, LCD-controller, IrDA"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "Ingen FPU, SDRAMC, ROMC, timer, PCMCIA, LCD-controller, IrDA"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, PCIC, UART, timer"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, UART, timer"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, UART, timer, I2C, LCD-controller"
-#~ msgid "Specials"
-#~ msgstr "Særegenheder"
+#~ msgid ""
+#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
+#~ "I2C, Watchdog"
+#~ msgstr ""
+#~ "Mips16 ISA-udvidelse, ingen FPU, 512k flash, 16k RAM, DMAC, UART, timer, "
+#~ "I2C, watchdog"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "Ingen FPU (R2010), ekstern cache"
+#~ msgid "Multiple chip CPU"
+#~ msgstr "CPU med flere chips"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "Ingen FPU (R3010)"
+#~ msgid "External L1 cache"
+#~ msgstr "Ekstern L1-cache"
#~ msgid "Virtual indexed L1 cache, L2 cache controller"
#~ msgstr "Virtuelt indekseret L1-cache, L2-cache-controller"
-#~ msgid "External L1 cache"
-#~ msgstr "Ekstern L1-cache"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "Ingen FPU (R3010)"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "CPU med flere chips"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "Ingen FPU (R2010), ekstern cache"
-#~ msgid ""
-#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
-#~ "I2C, Watchdog"
-#~ msgstr ""
-#~ "Mips16 ISA-udvidelse, ingen FPU, 512k flash, 16k RAM, DMAC, UART, timer, "
-#~ "I2C, watchdog"
+#~ msgid "Specials"
+#~ msgstr "Særegenheder"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, UART, timer, I2C, LCD-controller"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, UART, timer"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "Ingen FPU, DRAMC, ROMC, DMAC, PCIC, UART, timer"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "Ingen FPU, SDRAMC, ROMC, timer, PCMCIA, LCD-controller, IrDA"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "Ingen FPU, SDRAMC, ROMC, UART, timer, PCMCIA, LCD-controller, IrDA"
+#~ msgid "Clock"
+#~ msgstr "Klokfrekvens"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "Ingen FPU, SDRAMC, ROMC, UART, timer, PCMCIA, IrDA"
+#~ msgid "Date announced"
+#~ msgstr "Annonceret den"
-#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "Ingen FPU, SDRAMC, ROMC, DMAC, PCIC, UART, timer"
+#~ msgid "Vendor/Name"
+#~ msgstr "Fabrikant/navn"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 10/100 ethernet, 4 UART, IrDA, AC'97, I2C, 38 digital I/O"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "libc5-baseret Debian GNU/FreeBSD"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, ekstern 32-bits bus"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian til Sparc64"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, ekstern 64-bits bus"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian til S/390"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, ekstern 64-bits bus, ekstern L2-cache"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian til MIPS"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 L2-cache på chip'en"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian til Motorola 680x0"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgstr ""
-#~ "Mips 16, RTC, tastatur, TouchPanel, audio, Compact-Flash, UART, parallel"
+#~ msgid "Main"
+#~ msgstr "Forside"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Compact Flash, UART, parallel, RTC, audio, PCIC"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian til Beowulf"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, LCD-controller, Compact Flash, UART, parallel, RTC, tastatur, "
-#~ "USB, touchpad, audio"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian til ARM"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian til bærbare"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian til AMD64"
diff --git a/danish/po/stats.da.po b/danish/po/stats.da.po
index 796389c9a7f..616ef6f43d7 100644
--- a/danish/po/stats.da.po
+++ b/danish/po/stats.da.po
@@ -19,80 +19,75 @@ msgstr "Der er %d bytes at oversætte."
msgid "There are %d strings to translate."
msgstr "Der er %d strenge at oversætte."
-#. TRANSLATORS: The first string is hostname of the debian website mirror, second string is date and time.
-#: ../../english/template/debian/stats_tags.wml:23
-msgid "Hit data from %s, gathered %s."
-msgstr "Forekomstdata fra %s, indsamlet %s."
-
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Denne oversættelse er forældet"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Forkert oversættelsesversion"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "Originalen er nyere end denne oversættelse"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "Originalen findes ikke længere"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "antal forekomster ikke tilgængelig"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "forekomster"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Klik for at hente diffstat-data"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "Samlet diff"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "Farvelagt diff"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Oversættelsesresume 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 oversat"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Forældet"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Oversat"
-#: ../../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 "Ajourført"
-#: ../../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 "bytes"
-#: ../../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."
@@ -100,137 +95,140 @@ msgstr ""
"Note: Listerne over sider er sorteret efter popularitet. Svæv over "
"sidenavnet for at se antallet af forekomster."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Forældede oversættelser"
-#: ../../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 "Diff"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Kommentar"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Log"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Oversættelse"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Vedligeholder"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Oversætter"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Dato"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Generelle sider ikke oversat"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Uoversatte generelle sider"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Nyheder ikke oversat"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Uoversatte nyheder"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Konsulent-/brugersider ikke oversat"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Uoversatte konsulent-/brugersider"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Internationale sider ikke oversat"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Uoversatte internationale sider"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Oversatte sider (ajourførte)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Oversatte skabeloner (PO-filer)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Statistik over PO-oversættelser"
-#: ../../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 "Uoversat"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Total:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Oprettet med"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Oversatte websider"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Oversættelsesstatistik efter antal sider"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Sprog"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Oversættelser"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Oversatte websider (efter størrelse)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Oversættelsesstatistik efter sidestørrelse"
#~ msgid "Origin"
#~ msgstr "Ophav"
+
+#~ msgid "Hit data from %s, gathered %s."
+#~ msgstr "Forekomstdata fra %s, indsamlet %s."
diff --git a/danish/po/templates.da.po b/danish/po/templates.da.po
index efb4ba8f38f..44426ab8329 100644
--- a/danish/po/templates.da.po
+++ b/danish/po/templates.da.po
@@ -504,334 +504,295 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Tilbage til <a href=\"./\">Hvem bruger Debian?-siden</a>."
-#~ msgid "More information:"
-#~ msgstr "Flere oplysninger:"
+#~ msgid "Select a server near you"
+#~ msgstr "Vælg en server i nærheden af dig"
-#~ msgid "Taken by:"
-#~ msgstr "Overtaget af:"
+#~ msgid "List of Consultants"
+#~ msgstr "Konsulentliste"
-#~ msgid "Nobody"
-#~ msgstr "Ingen"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Tilbage til <a href=\"./\">Debians konsulentside</a>."
-#~ msgid "Rating:"
-#~ msgstr "Grad:"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Har du fundet et problem med webstedets layout?"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Hent med Jigdo"
-#~ msgid "Report it!"
-#~ msgstr "Rapporter det!"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Hent via http/ftp"
-#~ msgid "More information"
-#~ msgstr "Yderligere oplysninger"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Køb cd'er eller dvd'er"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Kommende begivenheder"
+#~ msgid "Network Install"
+#~ msgstr "Netværksinstallering"
-#~ msgid "link may no longer be valid"
-#~ msgstr "Linket kan være forældet"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Hent"
-#~ msgid "When"
-#~ msgstr "Hvornår"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Diverse"
-#~ msgid "Where"
-#~ msgstr "Hvor"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Kunst"
-#~ msgid "More Info"
-#~ msgstr "Yderligere oplysninger"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Spejling"
-#~ msgid "Debian Involvement"
-#~ msgstr "Debians involvering"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-spejle"
-#~ msgid "Main Coordinator"
-#~ msgstr "Hovedkoordinator"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Hent med Torrent"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Projekt</th><th>Koordinator</th>"
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Aftryksoplysninger"
-#~ msgid "Related Links"
-#~ msgstr "Relaterede links"
+#~ msgid "Debian CD team"
+#~ msgstr "Debians cd-team"
-#~ msgid "Latest News"
-#~ msgstr "Seneste nyt"
+#~ msgid "debian_on_cd"
+#~ msgstr "debian på cd"
-#~ msgid "Download calendar entry"
-#~ msgstr "Hent kalenderpost"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "oss"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Tilbage til: andre <a href=\"./\">Debian-nyheder</a> || <a href=\"m4_HOME/"
-#~ "\">Debian-projektets hjemmeside</a>."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (dødt link)"
+#~ msgid "http_ftp"
+#~ msgstr "http/ftp"
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "For at få dette nyhedsbrev som e-mail hver anden uge, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">abonnér på postlisten debian-news</a>."
+#~ msgid "buy"
+#~ msgstr "køb"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "<a href=\"../../\">Tidligere udgaver</a> af nyhedsbrevet er tilgængelige."
+#~ msgid "net_install"
+#~ msgstr "netinstall"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debians projektnyheder redigeres af <a href="
-#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "div"
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"plural\" />Debians projektnyheder redigeres af <a href="
-#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "Engelsksproget <a href=\"/MailingLists/disclaimer\">offentlig postliste</"
+#~ "a> vedr. cd'er/dvd'er:"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Denne udgave af Debians projektnyheder blev "
-#~ "redigeret af <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Date"
+#~ msgstr "Dato"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Denne udgave af Debians projektnyheder blev "
-#~ "redigeret af <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Time Line"
+#~ msgstr "Tidslinje"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Den blev oversat af %s."
+#~ msgid "Nominations"
+#~ msgstr "Nomineringer"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Den blev oversat af %s."
+#~ msgid "Debate"
+#~ msgstr "Debat"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Den blev oversat af %s."
+#~ msgid "Platforms"
+#~ msgstr "Platforme"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Den blev oversat af %s."
+#~ msgid "Proposer"
+#~ msgstr "Forslagsstiller"
-#~ msgid "List of Speakers"
-#~ msgstr "Liste med foredragsholdere"
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Forslags A's forslagsstiller"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Tilbage til <a href=\"./\">Debians foredragsholderside</a>."
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Forslags B's forslagsstiller"
-#~ 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 at få dette nyhedsbrev som e-mail hver uge, <a href=\"http://lists."
-#~ "debian.org/debian-news/\">abonnér på postlisten debian-news</a>."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Forslags C's forslagsstiller"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Weekly News redigeres af <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Forslags D's forslagsstiller"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Weekly News redigeres af <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Forslags E's forslagsstiller"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Denne udgave af Debian Weekly News blev redigeret "
-#~ "af <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Forslags F's forslagsstiller"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Denne udgave af Debian Weekly News blev redigeret "
-#~ "af <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Seconds"
+#~ msgstr "Støtter"
-#~ msgid "No requests for adoption"
-#~ msgstr "Ingen adoptionsforespørglser"
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Forslags A's støtter"
-#~ msgid "No orphaned packages"
-#~ msgstr "Ingen forældreløse pakker"
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Forslags B's støtter"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Ingen pakker som venter på at blive adopteret"
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Forslags C's støtter"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Ingen pakker som venter på at blive pakket"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Forslags D's støtter"
-#~ msgid "No Requested packages"
-#~ msgstr "Ingen efterspurgte pakker"
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Forslags E's støtter"
-#~ msgid "No help requested"
-#~ msgstr "Ingen hjælp ønsket"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Forslags F's støtter"
-#~ msgid "in adoption since today."
-#~ msgstr "under adoption siden i dag."
+#~ msgid "Opposition"
+#~ msgstr "Opposition"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "under adoption siden i går."
+#~ msgid "Text"
+#~ msgstr "Tekst"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s dage under adoption."
+#~ msgid "Proposal A"
+#~ msgstr "Forslag A"
-#~ msgid "in preparation since today."
-#~ msgstr "under forberedelse siden i dag."
+#~ msgid "Proposal B"
+#~ msgstr "Forslag B"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "under forberedelse siden i går."
+#~ msgid "Proposal C"
+#~ msgstr "Forslag C"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s dage under forberedelse."
+#~ msgid "Proposal D"
+#~ msgstr "Forslag D"
-#~ msgid "requested today."
-#~ msgstr "efterspurgt i dag."
+#~ msgid "Proposal E"
+#~ msgstr "Forslag E"
-#~ msgid "requested yesterday."
-#~ msgstr "efterspurgt i går."
+#~ msgid "Proposal F"
+#~ msgstr "Forslag F"
-#~ msgid "requested %s days ago."
-#~ msgstr "efterspurgt i %s dage."
+#~ msgid "Choices"
+#~ msgstr "Valgmuligheder"
-#~ msgid "package info"
-#~ msgstr "pakkeinfo"
+#~ msgid "Amendment Proposer"
+#~ msgstr "Ændringens forslagstiller"
-#~ msgid "License Information"
-#~ msgstr "Licensoplysninger"
+#~ msgid "Amendment Seconds"
+#~ msgstr "Ændringens støtter"
-#~ msgid "DLS Index"
-#~ msgstr "DLS-indeks"
+#~ msgid "Amendment Text"
+#~ msgstr "Ændringens tekst"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Ændringens forslagstiller A"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG-OSS"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Ændringens støtter A"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Debian-Legals arkiv"
+#~ msgid "Amendment Text A"
+#~ msgstr "Ændringens tekst A"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Ændringens forslagstiller B"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Version %s: %s"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Ændringens støtter B"
-#~ msgid "Date published"
-#~ msgstr "Offentliggørelsesdato"
+#~ msgid "Amendment Text B"
+#~ msgstr "Ændringens tekst B"
-#~ msgid "License"
-#~ msgstr "Licens"
+#~ msgid "Amendments"
+#~ msgstr "Ændringsforslag"
-#~ msgid "Version"
-#~ msgstr "Version"
+#~ msgid "Proceedings"
+#~ msgstr "Forløb"
-#~ msgid "Summary"
-#~ msgstr "Sammendrag"
+#~ msgid "Majority Requirement"
+#~ msgstr "Flertalskrav"
-#~ msgid "Justification"
-#~ msgstr "Begrundelse"
+#~ msgid "Data and Statistics"
+#~ msgstr "Data og statistik"
-#~ msgid "Discussion"
-#~ msgstr "Diskussion"
+#~ msgid "Quorum"
+#~ msgstr "Beslutningsdygtigt flertal"
-#~ msgid "Original Summary"
-#~ msgstr "Originalt sammendrag"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Minimal diskussion"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "Det originale sammendrag af <summary-author/> findes i <a href=\"<summary-"
-#~ "url/>\">listearkivet</a>."
+#~ msgid "Ballot"
+#~ msgstr "Stemme"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Dette sammendrag blev forberedt af <summary-author/>."
+#~ msgid "Forum"
+#~ msgstr "Forum"
-#~ msgid "License text (translated)"
-#~ msgstr "Licenstekst (oversat)"
+#~ msgid "Outcome"
+#~ msgstr "Resultat"
-#~ msgid "License text"
-#~ msgstr "Licenstekst"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Venter&nbsp;på&nbsp;en&nbsp;sponsor"
-#~ msgid "free"
-#~ msgstr "fri"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Under&nbsp;diskussion"
-#~ msgid "non-free"
-#~ msgstr "ikke-fri"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Afstemning&nbsp;åben"
-#~ msgid "not redistributable"
-#~ msgstr "ikke videredistribuérbar"
+#~ msgid "Decided"
+#~ msgstr "Besluttet"
-#~ msgid "Free"
-#~ msgstr "Fri"
+#~ msgid "Withdrawn"
+#~ msgstr "Tilbagetrukket"
-#~ msgid "Non-Free"
-#~ msgstr "Ikke-fri"
+#~ msgid "Other"
+#~ msgstr "Andet"
-#~ msgid "Not Redistributable"
-#~ msgstr "Ikke videredistribuérbar"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Hjem&nbsp;til&nbsp;afstemningssiden"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Se siden med <a href=\"./\">licensoplysninger</a> for en oversigt over "
-#~ "Debians licenssammendrag (DLS)."
+#~ msgid "How&nbsp;To"
+#~ msgstr "Hvordan&nbsp;man&nbsp;..."
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Afgiver&nbsp;et&nbsp;forslag"
-#~ msgid "discussed"
-#~ msgstr "diskuteret"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Ændrer&nbsp;et&nbsp;forslag"
-#~ msgid "Please use English when sending mail."
-#~ msgstr "Brug venligst engelsk når du sender e-mail"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Følger&nbsp;et&nbsp;forslag"
-#~ msgid "CERT vulnerabilities"
-#~ msgstr "CERT-sårbarheder"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Læser&nbsp;et&nbsp;resultat"
-#~ msgid "CERT alerts"
-#~ msgstr "CERT-advarsler"
+#~ msgid "Vote"
+#~ msgstr "Stemmer"
-#~ msgid "Securityfocus Bugtraq database"
-#~ msgstr "Securityfocus' Bugtraq-database"
+#~ msgid "network install"
+#~ msgstr "netværksinstallering"
-#~ msgid "Mitre CVE dictionary"
-#~ msgstr "I Mitres CVE-ordbog:"
+#~ msgid "buy pre-made images"
+#~ msgstr "køb færdige cd-aftryk"
-#~ msgid "Security database references"
-#~ msgstr "Referencer i sikkerhedsdatabaser"
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Tilbage til andre <a href=\"./\">Debian-nyheder</a>."
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "I Mitres CVE-ordbog:"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for oplysninger om "
+#~ "at kontakte os."
-#~ msgid "BugTraq ID"
-#~ msgstr "BugTraq-id"
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Debians sikkerhedsbulletin"
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Debians sikkerhedsbulletiner"
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "CERTs noter om sårbarheder, bulletiner og hændelser:"
+#~ msgid "Date Reported"
+#~ msgstr "Rapporteret den"
-#~ msgid "No other external database security references currently available."
-#~ msgstr ""
-#~ "Der er pt. ingen tilgængelige eksterne sikkerhedsreferencer i andre "
-#~ "databaser."
+#~ msgid "Vulnerable"
+#~ msgstr "Sårbar"
+
+#~ msgid "Fixed in"
+#~ msgstr "Rettet i"
+
+#~ msgid "Source:"
+#~ msgstr "Kildekode:"
+
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Arkitekturuafhængig komponent:"
#~ msgid ""
#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
@@ -840,292 +801,331 @@ msgstr "Tilbage til <a href=\"./\">Hvem bruger Debian?-siden</a>."
#~ "MD5-kontrolsummer for de listede filer findes i den <a href=\"<get-var "
#~ "url />\">originale sikkerhedsbulletin</a>."
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Arkitekturuafhængig komponent:"
-
-#~ msgid "Source:"
-#~ msgstr "Kildekode:"
-
-#~ msgid "Fixed in"
-#~ msgstr "Rettet i"
-
-#~ msgid "Vulnerable"
-#~ msgstr "Sårbar"
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "Der er pt. ingen tilgængelige eksterne sikkerhedsreferencer i andre "
+#~ "databaser."
-#~ msgid "Date Reported"
-#~ msgstr "Rapporteret den"
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "CERTs noter om sårbarheder, bulletiner og hændelser:"
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Debians sikkerhedsbulletiner"
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "I Bugtraq-databasen (hos SecurityFocus):"
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Debians sikkerhedsbulletin"
+#~ msgid "BugTraq ID"
+#~ msgstr "BugTraq-id"
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Se Debians <a href=\"m4_HOME/contact\">kontaktside</a> for oplysninger om "
-#~ "at kontakte os."
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "I Mitres CVE-ordbog:"
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Tilbage til andre <a href=\"./\">Debian-nyheder</a>."
+#~ msgid "Security database references"
+#~ msgstr "Referencer i sikkerhedsdatabaser"
-#~ msgid "buy pre-made images"
-#~ msgstr "køb færdige cd-aftryk"
+#~ msgid "Mitre CVE dictionary"
+#~ msgstr "I Mitres CVE-ordbog:"
-#~ msgid "network install"
-#~ msgstr "netværksinstallering"
+#~ msgid "Securityfocus Bugtraq database"
+#~ msgstr "Securityfocus' Bugtraq-database"
-#~ msgid "Vote"
-#~ msgstr "Stemmer"
+#~ msgid "CERT alerts"
+#~ msgstr "CERT-advarsler"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Læser&nbsp;et&nbsp;resultat"
+#~ msgid "CERT vulnerabilities"
+#~ msgstr "CERT-sårbarheder"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Følger&nbsp;et&nbsp;forslag"
+#~ msgid "Please use English when sending mail."
+#~ msgstr "Brug venligst engelsk når du sender e-mail"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Ændrer&nbsp;et&nbsp;forslag"
+#~ msgid "discussed"
+#~ msgstr "diskuteret"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Afgiver&nbsp;et&nbsp;forslag"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Hvordan&nbsp;man&nbsp;..."
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Se siden med <a href=\"./\">licensoplysninger</a> for en oversigt over "
+#~ "Debians licenssammendrag (DLS)."
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Hjem&nbsp;til&nbsp;afstemningssiden"
+#~ msgid "Not Redistributable"
+#~ msgstr "Ikke videredistribuérbar"
-#~ msgid "Other"
-#~ msgstr "Andet"
+#~ msgid "Non-Free"
+#~ msgstr "Ikke-fri"
-#~ msgid "Withdrawn"
-#~ msgstr "Tilbagetrukket"
+#~ msgid "Free"
+#~ msgstr "Fri"
-#~ msgid "Decided"
-#~ msgstr "Besluttet"
+#~ msgid "not redistributable"
+#~ msgstr "ikke videredistribuérbar"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Afstemning&nbsp;åben"
+#~ msgid "non-free"
+#~ msgstr "ikke-fri"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Under&nbsp;diskussion"
+#~ msgid "free"
+#~ msgstr "fri"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Venter&nbsp;på&nbsp;en&nbsp;sponsor"
+#~ msgid "License text"
+#~ msgstr "Licenstekst"
-#~ msgid "Outcome"
-#~ msgstr "Resultat"
+#~ msgid "License text (translated)"
+#~ msgstr "Licenstekst (oversat)"
-#~ msgid "Forum"
-#~ msgstr "Forum"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Dette sammendrag blev forberedt af <summary-author/>."
-#~ msgid "Ballot"
-#~ msgstr "Stemme"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "Det originale sammendrag af <summary-author/> findes i <a href=\"<summary-"
+#~ "url/>\">listearkivet</a>."
-#~ msgid "Minimum Discussion"
-#~ msgstr "Minimal diskussion"
+#~ msgid "Original Summary"
+#~ msgstr "Originalt sammendrag"
-#~ msgid "Quorum"
-#~ msgstr "Beslutningsdygtigt flertal"
+#~ msgid "Discussion"
+#~ msgstr "Diskussion"
-#~ msgid "Data and Statistics"
-#~ msgstr "Data og statistik"
+#~ msgid "Justification"
+#~ msgstr "Begrundelse"
-#~ msgid "Majority Requirement"
-#~ msgstr "Flertalskrav"
+#~ msgid "Summary"
+#~ msgstr "Sammendrag"
-#~ msgid "Proceedings"
-#~ msgstr "Forløb"
+#~ msgid "Version"
+#~ msgstr "Version"
-#~ msgid "Amendments"
-#~ msgstr "Ændringsforslag"
+#~ msgid "License"
+#~ msgstr "Licens"
-#~ msgid "Amendment Text B"
-#~ msgstr "Ændringens tekst B"
+#~ msgid "Date published"
+#~ msgstr "Offentliggørelsesdato"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Ændringens støtter B"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Version %s: %s"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Ændringens forslagstiller B"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Amendment Text A"
-#~ msgstr "Ændringens tekst A"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Debian-Legals arkiv"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Ændringens støtter A"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG-OSS"
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Ændringens forslagstiller A"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Amendment Text"
-#~ msgstr "Ændringens tekst"
+#~ msgid "DLS Index"
+#~ msgstr "DLS-indeks"
-#~ msgid "Amendment Seconds"
-#~ msgstr "Ændringens støtter"
+#~ msgid "License Information"
+#~ msgstr "Licensoplysninger"
-#~ msgid "Amendment Proposer"
-#~ msgstr "Ændringens forslagstiller"
+#~ msgid "package info"
+#~ msgstr "pakkeinfo"
-#~ msgid "Choices"
-#~ msgstr "Valgmuligheder"
+#~ msgid "requested %s days ago."
+#~ msgstr "efterspurgt i %s dage."
-#~ msgid "Proposal F"
-#~ msgstr "Forslag F"
+#~ msgid "requested yesterday."
+#~ msgstr "efterspurgt i går."
-#~ msgid "Proposal E"
-#~ msgstr "Forslag E"
+#~ msgid "requested today."
+#~ msgstr "efterspurgt i dag."
-#~ msgid "Proposal D"
-#~ msgstr "Forslag D"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s dage under forberedelse."
-#~ msgid "Proposal C"
-#~ msgstr "Forslag C"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "under forberedelse siden i går."
-#~ msgid "Proposal B"
-#~ msgstr "Forslag B"
+#~ msgid "in preparation since today."
+#~ msgstr "under forberedelse siden i dag."
-#~ msgid "Proposal A"
-#~ msgstr "Forslag A"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s dage under adoption."
-#~ msgid "Text"
-#~ msgstr "Tekst"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "under adoption siden i går."
-#~ msgid "Opposition"
-#~ msgstr "Opposition"
+#~ msgid "in adoption since today."
+#~ msgstr "under adoption siden i dag."
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Forslags F's støtter"
+#~ msgid "No help requested"
+#~ msgstr "Ingen hjælp ønsket"
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Forslags E's støtter"
+#~ msgid "No Requested packages"
+#~ msgstr "Ingen efterspurgte pakker"
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Forslags D's støtter"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Ingen pakker som venter på at blive pakket"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Forslags C's støtter"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Ingen pakker som venter på at blive adopteret"
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Forslags B's støtter"
+#~ msgid "No orphaned packages"
+#~ msgstr "Ingen forældreløse pakker"
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Forslags A's støtter"
+#~ msgid "No requests for adoption"
+#~ msgstr "Ingen adoptionsforespørglser"
-#~ msgid "Seconds"
-#~ msgstr "Støtter"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Denne udgave af Debian Weekly News blev redigeret "
+#~ "af <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Forslags F's forslagsstiller"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Denne udgave af Debian Weekly News blev redigeret "
+#~ "af <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Forslags E's forslagsstiller"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Weekly News redigeres af <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Forslags D's forslagsstiller"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Weekly News redigeres af <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Forslags C's forslagsstiller"
+#~ 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 at få dette nyhedsbrev som e-mail hver uge, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">abonnér på postlisten debian-news</a>."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Forslags B's forslagsstiller"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Tilbage til <a href=\"./\">Debians foredragsholderside</a>."
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Forslags A's forslagsstiller"
+#~ msgid "List of Speakers"
+#~ msgstr "Liste med foredragsholdere"
-#~ msgid "Proposer"
-#~ msgstr "Forslagsstiller"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Den blev oversat af %s."
-#~ msgid "Platforms"
-#~ msgstr "Platforme"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Den blev oversat af %s."
-#~ msgid "Debate"
-#~ msgstr "Debat"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Den blev oversat af %s."
-#~ msgid "Nominations"
-#~ msgstr "Nomineringer"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Den blev oversat af %s."
-#~ msgid "Time Line"
-#~ msgstr "Tidslinje"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Denne udgave af Debians projektnyheder blev "
+#~ "redigeret af <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Date"
-#~ msgstr "Dato"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Denne udgave af Debians projektnyheder blev "
+#~ "redigeret af <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "Engelsksproget <a href=\"/MailingLists/disclaimer\">offentlig postliste</"
-#~ "a> vedr. cd'er/dvd'er:"
+#~ "<void id=\"plural\" />Debians projektnyheder redigeres af <a href="
+#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "div"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debians projektnyheder redigeres af <a href="
+#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "net_install"
-#~ msgstr "netinstall"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "<a href=\"../../\">Tidligere udgaver</a> af nyhedsbrevet er tilgængelige."
-#~ msgid "buy"
-#~ msgstr "køb"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "For at få dette nyhedsbrev som e-mail hver anden uge, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">abonnér på postlisten debian-news</a>."
-#~ msgid "http_ftp"
-#~ msgstr "http/ftp"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (dødt link)"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Tilbage til: andre <a href=\"./\">Debian-nyheder</a> || <a href=\"m4_HOME/"
+#~ "\">Debian-projektets hjemmeside</a>."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "oss"
+#~ msgid "Download calendar entry"
+#~ msgstr "Hent kalenderpost"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian på cd"
+#~ msgid "Latest News"
+#~ msgstr "Seneste nyt"
-#~ msgid "Debian CD team"
-#~ msgstr "Debians cd-team"
+#~ msgid "Related Links"
+#~ msgstr "Relaterede links"
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Aftryksoplysninger"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Projekt</th><th>Koordinator</th>"
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Hent med Torrent"
+#~ msgid "Main Coordinator"
+#~ msgstr "Hovedkoordinator"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-spejle"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debians involvering"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Spejling"
+#~ msgid "More Info"
+#~ msgstr "Yderligere oplysninger"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Kunst"
+#~ msgid "Where"
+#~ msgstr "Hvor"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Diverse"
+#~ msgid "When"
+#~ msgstr "Hvornår"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Hent"
+#~ msgid "link may no longer be valid"
+#~ msgstr "Linket kan være forældet"
-#~ msgid "Network Install"
-#~ msgstr "Netværksinstallering"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Kommende begivenheder"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Køb cd'er eller dvd'er"
+#~ msgid "More information"
+#~ msgstr "Yderligere oplysninger"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Hent via http/ftp"
+#~ msgid "Report it!"
+#~ msgstr "Rapporter det!"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Hent med Jigdo"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Har du fundet et problem med webstedets layout?"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Rating:"
+#~ msgstr "Grad:"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Tilbage til <a href=\"./\">Debians konsulentside</a>."
+#~ msgid "Nobody"
+#~ msgstr "Ingen"
-#~ msgid "List of Consultants"
-#~ msgstr "Konsulentliste"
+#~ msgid "Taken by:"
+#~ msgstr "Overtaget af:"
-#~ msgid "Select a server near you"
-#~ msgstr "Vælg en server i nærheden af dig"
+#~ msgid "More information:"
+#~ msgstr "Flere oplysninger:"
diff --git a/danish/po/vendors.da.po b/danish/po/vendors.da.po
index a0ba15a1a73..b8474ad5afc 100644
--- a/danish/po/vendors.da.po
+++ b/danish/po/vendors.da.po
@@ -9,145 +9,134 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Forhandler:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "Debian-sidens URL:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Tillader 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 udlandet:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "e-mail:"
-
-#: ../../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 "BD Type:"
-msgstr "BD-type:"
-
-#: ../../english/CD/vendors/vendors.CD.def:15
-msgid "USB Type:"
-msgstr "USB-type:"
-
-#: ../../english/CD/vendors/vendors.CD.def:16
-msgid "Architectures:"
-msgstr "Arkitekturer:"
-
-#: ../../english/CD/vendors/vendors.CD.def:28
msgid "Vendor"
msgstr "Forhandler"
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Tillader bidrag"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:16
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD/BD/USB"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr "Arkitekturer"
-#: ../../english/CD/vendors/vendors.CD.def:32
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Sender til udlandet"
-#: ../../english/CD/vendors/vendors.CD.def:33
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Kontakt"
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:58
+#: ../../english/CD/vendors/vendors.CD.def:44
msgid "Vendor Home"
msgstr "Forhandlerside"
-#: ../../english/CD/vendors/vendors.CD.def:84
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "side"
-#: ../../english/CD/vendors/vendors.CD.def:85
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "e-mail"
-#: ../../english/CD/vendors/vendors.CD.def:128
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "indenfor Europa"
-#: ../../english/CD/vendors/vendors.CD.def:132
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "til visse områder"
-#: ../../english/CD/vendors/vendors.CD.def:136
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "kildekode"
-#: ../../english/CD/vendors/vendors.CD.def:140
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "og"
-#~ msgid "Official CD"
-#~ msgstr "Officiel cd"
+#~ msgid "updated monthly"
+#~ msgstr "opdateres månedligt"
-#~ msgid "Official DVD"
-#~ msgstr "Officiel dvd"
+#~ msgid "updated twice weekly"
+#~ msgstr "opdateres to gange om ugen"
-#~ msgid "Development Snapshot"
-#~ msgstr "Udviklingsversion"
+#~ msgid "updated weekly"
+#~ msgstr "opdateres ugentligt"
-#~ msgid "Vendor Release"
-#~ msgstr "Distributørspecifik udgave"
+#~ msgid "reseller"
+#~ msgstr "forhandler"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Flere distributioner"
+#~ msgid "reseller of $var"
+#~ msgstr "forhandler af $var"
-#~ msgid "non-US included"
-#~ msgstr "inkluderer non-US-delen"
+#~ msgid "Custom Release"
+#~ msgstr "Specialfremstillet udgave"
-#~ msgid "non-free included"
-#~ msgstr "inkluderer non-free-delen"
+#~ msgid "vendor additions"
+#~ msgstr "tillæg fra distributør"
#~ msgid "contrib included"
#~ msgstr "inkluderer contrib-delen"
-#~ msgid "vendor additions"
-#~ msgstr "tillæg fra distributør"
+#~ msgid "non-free included"
+#~ msgstr "inkluderer non-free-delen"
-#~ msgid "Custom Release"
-#~ msgstr "Specialfremstillet udgave"
+#~ msgid "non-US included"
+#~ msgstr "inkluderer non-US-delen"
-#~ msgid "reseller of $var"
-#~ msgstr "forhandler af $var"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Flere distributioner"
-#~ msgid "reseller"
-#~ msgstr "forhandler"
+#~ msgid "Vendor Release"
+#~ msgstr "Distributørspecifik udgave"
-#~ msgid "updated weekly"
-#~ msgstr "opdateres ugentligt"
+#~ msgid "Development Snapshot"
+#~ msgstr "Udviklingsversion"
-#~ msgid "updated twice weekly"
-#~ msgstr "opdateres to gange om ugen"
+#~ msgid "Official DVD"
+#~ msgstr "Officiel dvd"
-#~ msgid "updated monthly"
-#~ msgstr "opdateres månedligt"
+#~ msgid "Official CD"
+#~ msgstr "Officiel cd"
+
+#~ msgid "Architectures:"
+#~ msgstr "Arkitekturer:"
+
+#~ msgid "USB Type:"
+#~ msgstr "USB-type:"
+
+#~ msgid "BD Type:"
+#~ msgstr "BD-type:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD-type"
+
+#~ msgid "CD Type:"
+#~ msgstr "CD-type:"
+
+#~ msgid "email:"
+#~ msgstr "e-mail:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Sender til udlandet:"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Tillader bidrag til Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian-sidens URL:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Forhandler:"
diff --git a/dutch/po/bugs.nl.po b/dutch/po/bugs.nl.po
index 9933385674b..94797fa9fd2 100644
--- a/dutch/po/bugs.nl.po
+++ b/dutch/po/bugs.nl.po
@@ -8,6 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: bugs\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2014-09-14 10:21+0100\n"
"Last-Translator: Paul Gevers <elbrus@debian.org>\n"
"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -17,7 +18,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 1.4\n"
-"POT-Creation-Date: \n"
#: ../../english/Bugs/pkgreport-opts.inc:17
msgid "in package"
@@ -164,4 +164,3 @@ msgstr "Gearchiveerd"
#: ../../english/Bugs/pkgreport-opts.inc:158
msgid "Archived and Unarchived"
msgstr "Wel en niet gearchiveerd"
-
diff --git a/dutch/po/cdimage.nl.po b/dutch/po/cdimage.nl.po
index 2f08b69304a..391b0f84b28 100644
--- a/dutch/po/cdimage.nl.po
+++ b/dutch/po/cdimage.nl.po
@@ -21,18 +21,16 @@ msgstr ""
"X-Generator: Lokalize 1.4\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 " Vingerafdruk van de Sleutel"
-#: ../../english/devel/debian-installer/images.data:90
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "ISO-images"
-#: ../../english/devel/debian-installer/images.data:91
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "Jigdo-bestanden"
@@ -132,4 +130,3 @@ msgid ""
msgstr ""
"Engelstalige <a href=\"/MailingLists/disclaimer\">publieke mailinglijst</a> "
"voor CD's/DVD's"
-
diff --git a/dutch/po/consultants.nl.po b/dutch/po/consultants.nl.po
index 7199854c455..dfd10fbf58a 100644
--- a/dutch/po/consultants.nl.po
+++ b/dutch/po/consultants.nl.po
@@ -81,4 +81,3 @@ msgstr "Overzicht van Debian dienstverleners"
#: ../../english/template/debian/consultant.wml:9
msgid "Back to the <a href=\"./\">Debian consultants page</a>."
msgstr "Terug naar de <a href=\"./\">Debian dienstverleners pagina</a>."
-
diff --git a/dutch/po/distrib.nl.po b/dutch/po/distrib.nl.po
index b3f69d7fa8f..14c2bf2bbef 100644
--- a/dutch/po/distrib.nl.po
+++ b/dutch/po/distrib.nl.po
@@ -135,82 +135,92 @@ 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 "ARM met FPU-ABI"
-#: ../../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 "IBM System z"
-#: ../../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 "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 "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
diff --git a/dutch/po/doc.nl.po b/dutch/po/doc.nl.po
index 40b07926c4e..29fbfc93d28 100644
--- a/dutch/po/doc.nl.po
+++ b/dutch/po/doc.nl.po
@@ -8,6 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: doc\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2014-09-17 21:56+0100\n"
"Last-Translator: Paul Gevers <elbrus@debian.org>\n"
"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -17,9 +18,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 1.4\n"
-"POT-Creation-Date: \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"
@@ -33,10 +50,21 @@ msgid ""
" like SELinux setup to secure services, automated installations, or\n"
" virtualization with Xen, KVM or LXC."
msgstr ""
-"Dit vrij verkrijgbare boek, geschreven door twee Debian ontwikkelaars, was oorspronkelijk een vertaling van hun Franse bestseller, uitgebracht door Eyrolles onder de titel \"Cahier de l'admin Debian.\" Wie graag een efficiënte en onafhankelijke systeembeheerder van Debian Gnu/Linux computers wil worden kan via dit erg toegankelijke werk de nodige basiskennis verwerven.\n"
-"Het boek behandelt alle onderwerpen die een competente Linux systeembeheerder onder de knie moet hebben, vanaf het installeren en onderhouden van het systeem tot het maken van pakketten en het compileren van de kernel. Het besteedt voorts aandacht aan systeemopvolging, reservekopieën maken en de overstap wagen. Ook meer gevorderde aspecten komen aan bod, zoals SELinux instellen voor het beveiligen van diensten, automatische installaties en virtualisatie met behulp van Xen, KVM of LXC."
+"Dit vrij verkrijgbare boek, geschreven door twee Debian ontwikkelaars, was "
+"oorspronkelijk een vertaling van hun Franse bestseller, uitgebracht door "
+"Eyrolles onder de titel \"Cahier de l'admin Debian.\" Wie graag een "
+"efficiënte en onafhankelijke systeembeheerder van Debian Gnu/Linux computers "
+"wil worden kan via dit erg toegankelijke werk de nodige basiskennis "
+"verwerven.\n"
+"Het boek behandelt alle onderwerpen die een competente Linux "
+"systeembeheerder onder de knie moet hebben, vanaf het installeren en "
+"onderhouden van het systeem tot het maken van pakketten en het compileren "
+"van de kernel. Het besteedt voorts aandacht aan systeemopvolging, "
+"reservekopieën maken en de overstap wagen. Ook meer gevorderde aspecten "
+"komen aan bod, zoals SELinux instellen voor het beveiligen van diensten, "
+"automatische installaties en virtualisatie met behulp van Xen, KVM of LXC."
-#: ../../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"
@@ -44,21 +72,23 @@ msgid ""
" for the user who installs and maintains the system themselves (whether\n"
" in the home, office, club, or school)."
msgstr ""
-"Het doel van dit vrij verkrijgbaar up-to-date boek is om op snelheid te komen\n"
+"Het doel van dit vrij verkrijgbaar up-to-date boek is om op snelheid te "
+"komen\n"
" met Debian (inclusief zowel de huidige stable release en de huidige\n"
" unstable distributie). Het is zeer uitgebreid met basisondersteuning voor\n"
-" de gebruiker die het systeem zelf installeert en beheert (thuis, op kantoor,\n"
+" de gebruiker die het systeem zelf installeert en beheert (thuis, op "
+"kantoor,\n"
" in een club of op school)."
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "Sarge-CD met installatieprogramma en een selectie van pakketten"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "Live-CD met Knoppix"
-#: ../../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"
@@ -69,20 +99,17 @@ msgstr ""
"Zowel beginners als gevorderde gebruikers zullen dit boek zien als een\n"
" uitgebreide bron van informatie over Debian voor desktops, intranet- en\n"
" internetservers en ontwikkeling. Het bevat ook achtergrondinformatie over\n"
-" de achtergrond van het project en een uitgebreide aandacht voor het unieke\n"
+" de achtergrond van het project en een uitgebreide aandacht voor het "
+"unieke\n"
" pakketbeheersysteem van Debian."
-#: ../../english/doc/books.data:77
-#: ../../english/doc/books.data:180
-#: ../../english/doc/books.data:224
-#: ../../english/doc/books.data:269
+#: ../../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 "officiële Debian GNU/Linux 3.1r0a \"sarge\" DVD (i386)"
-#: ../../english/doc/books.data:80
-#: ../../english/doc/books.data:183
-#: ../../english/doc/books.data:227
-#: ../../english/doc/books.data:272
+#: ../../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"
@@ -96,46 +123,58 @@ msgid ""
" resource alongside a standard Linux reference to bootstrap one's\n"
" Linux experience in Debian's bottom-up philosophy."
msgstr ""
-"Dit boek introduceert de concepten en technieken in het Debian-besturingssysteeem,\n"
+"Dit boek introduceert de concepten en technieken in het Debian-"
+"besturingssysteeem,\n"
" het legt hun gebruik en valkuilen uit en het illustreert de gedachtegang\n"
-" achter elk van de mogelijkheden. Het doel is niet om een referentieboek te\n"
-" zijn, maar om de lezer genoeg inzicht te geven in de werking van het project\n"
+" achter elk van de mogelijkheden. Het doel is niet om een referentieboek "
+"te\n"
+" zijn, maar om de lezer genoeg inzicht te geven in de werking van het "
+"project\n"
" en het besturingssysteem om de gesofisticeerde en elegante, soms op het\n"
" eerste zicht niet echt intuïtieve oplossingen die geëvolueerd zijn als\n"
" onderdeel van het Debian-systeem in het laatste decenium, te leren en\n"
-" gebruiken. Alhoewel het gericht is op de geletterde UNIX/Linux-beheerder, kan\n"
-" het boek ook dienen als een excellente bron naast een standaard Linux-referentie\n"
+" gebruiken. Alhoewel het gericht is op de geletterde UNIX/Linux-beheerder, "
+"kan\n"
+" het boek ook dienen als een excellente bron naast een standaard Linux-"
+"referentie\n"
" om de Linux-ervaring in een Debian bottum-up filosofie op te doen."
-#: ../../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 -- from\n"
+" in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+"from\n"
" working with text, images, and sound to productivity and networking\n"
" issues. Like the software the book describes, the book is copylefted\n"
" and its source data is available."
msgstr ""
"Een praktische referentiegids voor het Debian GNU/Linux-systeem dat toont,\n"
" in meer dan 1,500 <q>recepten</q>, hoe het te gebruiken voor alledaagse\n"
-" activiteiten -- van tekstbewerking, figuren en geluid tot productiviteit en\n"
+" activiteiten -- van tekstbewerking, figuren en geluid tot productiviteit "
+"en\n"
" netwerkproblemen. Zoals de software het boek beschrijft, het boek is\n"
" ‘copylefted’ en haar broncode is beschikbaar."
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
msgid "Debian 2.2 ARM architecture"
msgstr "Debian 2.2 ARM-architectuur"
-#: ../../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, Psion5).\n"
+" It covers some devices specifically for quick set-up (LART, Assabet, "
+"Psion5).\n"
" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It also\n"
-" includes extensive tutorial information on GNU/Linux basics for developers\n"
+" toolchain is covered in native and cross-compiler form, as are "
+"bootloaders,\n"
+" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+"also\n"
+" includes extensive tutorial information on GNU/Linux basics for "
+"developers\n"
" coming from other platforms.\n"
" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed you\n"
+" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+"you\n"
" will be working from this distribution and preferably have a Debian based\n"
" host machine too."
msgstr ""
@@ -144,30 +183,35 @@ msgstr ""
" Assabet, Psion5). Het geeft ook algemene informatie, hulpmiddelen en\n"
" technieken. De GNU toolchain wordt behandeld in oorspronkelijke als in\n"
" cross-compiler-vorm, evenals bootloaders, kernel-patches, RAM-schijven,\n"
-" ARM-eigenaardigheden en andere ARM-bronnen. Er is ook een extensieve tutorial\n"
+" ARM-eigenaardigheden en andere ARM-bronnen. Er is ook een extensieve "
+"tutorial\n"
" inbegrepen over basiskennis voor GNU/Linux-ontwikkelaars die van andere\n"
" platformen komen.\n"
" Het is niet specifiek voor Debian, maar de Aleph ARMLinux distributie is\n"
-" gebaseerd op Debian-ARM en er wordt vanuit gegaan dut u zult werken vanuit\n"
+" gebaseerd op Debian-ARM en er wordt vanuit gegaan dut u zult werken "
+"vanuit\n"
" deze distributie en dat u best ook een Debian-gebaseerde host-machine hebt."
-#: ../../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"
" Windows users will gain a gentle introduction to this exciting\n"
" computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</q>."
msgstr ""
-"Learning Debian GNU/Linux gidst de nieuwe Linux-gebruiker door de installatie\n"
+"Learning Debian GNU/Linux gidst de nieuwe Linux-gebruiker door de "
+"installatie\n"
" en configuratie van Debian GNU/Linux.\n"
-" Windows-gebruikers zullen een geleidelijke introductie krijgen in de boeiende\n"
-" computerwereld aangeboden door Bill McCarty in <q>Learning Debian GNU/Linux</q>."
+" Windows-gebruikers zullen een geleidelijke introductie krijgen in de "
+"boeiende\n"
+" computerwereld aangeboden door Bill McCarty in <q>Learning Debian GNU/"
+"Linux</q>."
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
msgid "Debian 2.1"
msgstr "Debian 2.1"
-#: ../../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"
@@ -176,48 +220,78 @@ msgid ""
msgstr ""
"Bestaat uit 230+ pagina’s en drie CD-ROM’s. Softwareonderwerpen die aan bod\n"
" komen zijn Debian Linux, netwerken, programmeerhulpmiddelen, GUI, desktop\n"
-" publishing, bedrijfssoftware, plezante dingen en multimedia. 30 dagen gratis\n"
+" publishing, bedrijfssoftware, plezante dingen en multimedia. 30 dagen "
+"gratis\n"
" e-mailondersteuning inbegrepen."
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "DVD van Debian Squeeze i386/amd64"
-#: ../../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"
" to the configuration of network services.\n"
" Written by two Debian developers, this book can be of interest to many\n"
-" people: the beginner wishing to discover Debian, the advanced user looking\n"
+" people: the beginner wishing to discover Debian, the advanced user "
+"looking\n"
" for tips to enhance his mastership of the Debian tools and the\n"
" administrator who wants to build a reliable network with Debian."
msgstr ""
"Het eerste Franstalige boek over Debian in alweer zijn vijfde editie. Het\n"
" behandelt alle aspecten van het beheer van Debian van de installatie tot\n"
" de configuratie van netwerkdiensten.\n"
-" Geschreven door twee Debian-ontwikkelaars, kan dit boek voor velen interessant\n"
+" Geschreven door twee Debian-ontwikkelaars, kan dit boek voor velen "
+"interessant\n"
" zijn: de beginner die Debian wilt ontdekken, de geavanceerde gebruiker\n"
-" die tips zoekt om het gebruik van de Debian-hulpmiddelen te verbeteren en de\n"
+" die tips zoekt om het gebruik van de Debian-hulpmiddelen te verbeteren en "
+"de\n"
" beheerder die een betrouwbaar netwerk wilt bouwen met Debian."
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "Twee edities: Eén zonder DVD, de andere met twee DVDs (i386)"
-#: ../../english/doc/books.data:213
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 en amd64) op DVD"
-#: ../../english/doc/books.data:216
-msgid "This book teaches you how to install and configure the system and also how to use Debian in a professional environment. It shows the full potential of the distribution (in its current version 6.0) and provides a practical manual for all users who want to learn more about Debian and its range of services."
-msgstr "Dit boek leert u het installeren en configuraren van het systeem en hoe Debian te gebruiken in een professionele omgeving. Het toont alle mogelijkheden van de dinstributie (in de huidige versie 6.0) en biedt een praktische handleiding voor alle gebruikers die meer willen leren over Debian en diens scala aan diensten."
+#: ../../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 "
+"the distribution (in its current version 6.0) and provides a practical "
+"manual for all users who want to learn more about Debian and its range of "
+"services."
+msgstr ""
+"Dit boek leert u het installeren en configuraren van het systeem en hoe "
+"Debian te gebruiken in een professionele omgeving. Het toont alle "
+"mogelijkheden van de dinstributie (in de huidige versie 6.0) en biedt een "
+"praktische handleiding voor alle gebruikers die meer willen leren over "
+"Debian en diens scala aan diensten."
-#: ../../english/doc/books.data:244
-msgid "2 editions: One with no CD, the other with Official CD (i386, contrib and sources)"
-msgstr "Twee edities: Eén zonder CD, de ander met officiële CD (i386, contrib en broncode)"
+#: ../../english/doc/books.data:287
+msgid ""
+"2 editions: One with no CD, the other with Official CD (i386, contrib and "
+"sources)"
+msgstr ""
+"Twee edities: Eén zonder CD, de ander met officiële CD (i386, contrib en "
+"broncode)"
-#: ../../english/doc/books.data:247
+#: ../../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"
@@ -232,39 +306,46 @@ msgid ""
" administration issues, like planing and building of a dial-in router or\n"
" a server for Windows based clients (Samba)."
msgstr ""
-"Het boek handelt over alle stappen van het plannen en installeren van Debian\n"
+"Het boek handelt over alle stappen van het plannen en installeren van "
+"Debian\n"
" GNU/Linux op PC-gebaseerde hardware, belangrijke applicaties zoals het X\n"
" Window System, vensterbeheerders en desktopomgevingen (KDE, GNOME) en een\n"
-" selectie van belangrijke systeemdiensten inbegrepen. Unix/Linux basiskennis\n"
+" selectie van belangrijke systeemdiensten inbegrepen. Unix/Linux "
+"basiskennis\n"
" en -concepten samen met systeemgebruik en belangrijke componenten (bash,\n"
" systeemdiensten en belangrijke commando’s) worden geïntroduceerd.\n"
-" Er is een uitleg over Debians pakketformaat en hoe men pakketten aanmaakt in\n"
+" Er is een uitleg over Debians pakketformaat en hoe men pakketten aanmaakt "
+"in\n"
" dit formaat. Het geeft ook een overzicht van standaard Linux-applicaties\n"
-" (netwerken, softwareontwikkeling, LaTeX en office-suites). Er wordt sterk de\n"
-" nadruk gelegd op netwerken en systeembeheer, zoals het plannen en bouwen van\n"
+" (netwerken, softwareontwikkeling, LaTeX en office-suites). Er wordt sterk "
+"de\n"
+" nadruk gelegd op netwerken en systeembeheer, zoals het plannen en bouwen "
+"van\n"
" een inbelrouter of een server voor Windows-gebaseerde clients (Samba)."
-#: ../../english/doc/books.data:290
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "Debian GNU/Linux 3.1 Sarge installatieprogramma (mini-CD)"
-#: ../../english/doc/books.data:293
+#: ../../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 ""
-"Dit boek is in woordenboekstijl en behandelt verschillende tips voor beginners\n"
-" en gebruikers met een gemiddelde kunde; installatie op verschillende manieren,\n"
+"Dit boek is in woordenboekstijl en behandelt verschillende tips voor "
+"beginners\n"
+" en gebruikers met een gemiddelde kunde; installatie op verschillende "
+"manieren,\n"
" desktop-aanpassingen, problemen oplossen, winstgevende knowhow enzovoort."
-#: ../../english/doc/books.data:306
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
msgstr "Debian GNU/Linux 3.1r0 i386, eigen uitgave auteur (DVD + CD)"
-#: ../../english/doc/books.data:310
+#: ../../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"
@@ -282,11 +363,11 @@ msgstr ""
" lettertype-pakket dat uw desktop decoreert. Dit boek is nuttig voor alle\n"
" Debian-gebruikers van beginners tot gevorderde gebruikers."
-#: ../../english/doc/books.data:325
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr "Debian 2.2r0 i386, eigen uitgave auteur (3 CD’s)"
-#: ../../english/doc/books.data:328
+#: ../../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"
@@ -298,34 +379,39 @@ msgstr ""
"Dit boek behandelt algemene onderwerpen over Debian GNU/Linux: installatie\n"
" APT en dpkg, shell, X Window System, netwerken, systeembeheer,\n"
" kernelconfiguratie, delen met Windows, servers configureren enz.\n"
-" U zult in staat zijn om Debian GNU/Linux Japanse omgeving zeer gemakkelijk\n"
+" U zult in staat zijn om Debian GNU/Linux Japanse omgeving zeer "
+"gemakkelijk\n"
" te installeren en te gebruiken met de aangepaste CD’s."
-#: ../../english/doc/books.data:344
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "Eén onofficiële Woody, 3 Potato rev0"
-#: ../../english/doc/books.data:347
+#: ../../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 and\n"
+" GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+"and\n"
" maintenance of system and networking,\n"
" X Window System setup, and using multimedia in Debian GNU/Linux.\n"
" This book also includes a guide for maintainers, which stimulates\n"
" people in Korea to become official Debian maintainers."
msgstr ""
"Dit boek geeft een kort overzicht van de installatie van Debian GNU/Linux,\n"
-" fundamentele Unix- en Linux-commando’s, basisch configuratie en beheer van\n"
-" het systeem en netwerken, instelling van het X Window System en het gebruik\n"
+" fundamentele Unix- en Linux-commando’s, basisch configuratie en beheer "
+"van\n"
+" het systeem en netwerken, instelling van het X Window System en het "
+"gebruik\n"
" van multimedia in Debian GNU/Linux.\n"
-" Dit boek is ook een gids voor beheerders die mensen in Korea stimuleren om\n"
+" Dit boek is ook een gids voor beheerders die mensen in Korea stimuleren "
+"om\n"
" officiële Debian-beheerders te worden."
-#: ../../english/doc/books.data:361
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr "Drie officiële potato r3-CD’s en een onofficiële woody-CD"
-#: ../../english/doc/books.data:364
+#: ../../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"
@@ -335,17 +421,18 @@ msgid ""
" Debian for Korean language environment, and it is good for newcomers, too."
msgstr ""
"Dit boek introduceert de lezers in Debian GNU/Linux met vele praktische\n"
-" uitleg en tips. Geschreven in het Koreaans, dit boek behandelt veelomvattende\n"
+" uitleg en tips. Geschreven in het Koreaans, dit boek behandelt "
+"veelomvattende\n"
" aspecten van het Debian GNU/Linux-systeem: instellen voor de eerste keer,\n"
" pakketinstallatie, instellen van X, verbinden met het Internet,\n"
" netwerkbeheer, en meer. Dit boek biedt een handvol tips om Debian in te\n"
" stellen voor de Koreaanse taalomgeving en het is ook goed voor nieuwkomers."
-#: ../../english/doc/books.data:386
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "Debian GNU/Linux 3.1r0 CD1"
-#: ../../english/doc/books.data:389
+#: ../../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"
@@ -353,14 +440,16 @@ msgid ""
" using GNU/Linux and Debian's powerful package management system."
msgstr ""
"Het eerste Perzische boek over Debian GNU/Linux. Dit boek helpt u om Debian\n"
-" GNU/Linux te installeren en netwerkdiensten op te zetten zoals web, databank,\n"
+" GNU/Linux te installeren en netwerkdiensten op te zetten zoals web, "
+"databank,\n"
" firewall, mail, ftp en .... Het helpt u ook om te beginnen GNU/Linux en\n"
" Debian’s krachtige pakketbeheersysteem te gebruiken."
-#: ../../english/doc/books.data:405
+#: ../../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 chapter\n"
+" GNU/Linux, Administration of the system and Advanced operations. Each "
+"chapter\n"
" explains in depth the features of the operating system. The first\n"
" chapters explain the structure of GNU/Linux. These chapters will help\n"
" the reader to understand how the system uses basic resources such as\n"
@@ -371,20 +460,38 @@ msgid ""
" and anyone who wants to learn GNU/Linux in depth. This book covers\n"
" Debian Sarge."
msgstr ""
-"Dit boek bevat vier delen: Basisconcepten, Beheer van GNU/Linux, geavanceerde\n"
-" Systeemadministratie en Geavanceerde operaties. Elk hoofdstuk verklaard diepgaand\n"
-" de mogelijkheden van het besturingssysteem. In het eerste hoofdstuk wordt de structuur\n"
-" van GNU/Linux uitgelegd. Deze hoofdstukken zullen de lezer helpen te begrijpen hoe het\n"
+"Dit boek bevat vier delen: Basisconcepten, Beheer van GNU/Linux, "
+"geavanceerde\n"
+" Systeemadministratie en Geavanceerde operaties. Elk hoofdstuk verklaard "
+"diepgaand\n"
+" de mogelijkheden van het besturingssysteem. In het eerste hoofdstuk wordt "
+"de structuur\n"
+" van GNU/Linux uitgelegd. Deze hoofdstukken zullen de lezer helpen te "
+"begrijpen hoe het\n"
" systeem basismiddelen zoals de processor en het geheugen gebruikt. Een\n"
-" gedetailleerde analyse over bestandssystemen zoals Ext2, Ext3, en ReiserFS\n"
+" gedetailleerde analyse over bestandssystemen zoals Ext2, Ext3, en "
+"ReiserFS\n"
" zal gebruikers toelaten om de correcte keuze voor hun behoeften te maken.\n"
-" Vele cijfers door het boek tonen aspecten over de prestaties van het systeem.\n"
+" Vele cijfers door het boek tonen aspecten over de prestaties van het "
+"systeem.\n"
" Dit boek verzorgt studenten en iedereen die GNU/Linux diepgaand wil leren\n"
" kennen. Dit boek behandelt Debian Sarge."
-#: ../../english/doc/books.data:428
-msgid "This is the right book for you to learn how to create basic and complex IT platforms using only Free Software. Inside it you will find a wide range of procedures reviewed and adjusted to fit into the best practices of technological infrastructure implementation. This easy to read and comprehensive guide will take you by the hand to achieve specific objectives with the Debian GNU/Linux operating system."
-msgstr "Als u wilt leren om eenvoudige en complexe IT-platformen ten ontwikkelen met enkel vrije software, dan is dit voor u het juiste boek. In dit boek worden een groot aantal procedures besproken en aangepast op de richtlijnen voor implementatie van technologische infrastructuur. Deze eenvoudig te lezen en uitgebreide gids helpt u om specifieke doelen te bereiken met het besturingssysteem Debian GNU/Linux."
+#: ../../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 "
+"procedures reviewed and adjusted to fit into the best practices of "
+"technological infrastructure implementation. This easy to read and "
+"comprehensive guide will take you by the hand to achieve specific objectives "
+"with the Debian GNU/Linux operating system."
+msgstr ""
+"Als u wilt leren om eenvoudige en complexe IT-platformen ten ontwikkelen met "
+"enkel vrije software, dan is dit voor u het juiste boek. In dit boek worden "
+"een groot aantal procedures besproken en aangepast op de richtlijnen voor "
+"implementatie van technologische infrastructuur. Deze eenvoudig te lezen en "
+"uitgebreide gids helpt u om specifieke doelen te bereiken met het "
+"besturingssysteem Debian GNU/Linux."
#: ../../english/doc/books.def:38
msgid "Author:"
@@ -434,78 +541,83 @@ msgstr "Meest recente versie:"
msgid "(version <get-var version />)"
msgstr "(versie <get-var version />)"
-#: ../../english/doc/manuals.defs:138
-#: ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr "platte tekst"
#: ../../english/doc/manuals.defs:154
-msgid "The latest <get-var srctype /> source is available through the <a href=\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
-msgstr "De laatste <get-var srctype /> broncode is beschikbaar via de <a href=\"https://www.debian.org/doc/cvs\">Subversion</a> opslagplaats."
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+msgstr ""
+"De laatste <get-var srctype /> broncode is beschikbaar via de <a href="
+"\"https://www.debian.org/doc/cvs\">Subversion</a> opslagplaats."
-#: ../../english/doc/manuals.defs:156
-#: ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172
-#: ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
+#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
msgid "Web interface: "
msgstr "Web interface: "
-#: ../../english/doc/manuals.defs:157
-#: ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173
-#: ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
msgid "VCS interface: "
msgstr "VCS interface: "
#: ../../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 "De laatste <get-var srctype /> broncode is beschikbaar via de <a href=\"https://www.debian.org/doc/cvs\">Cvs</a> opslagplaats."
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+"De laatste <get-var srctype /> broncode is beschikbaar via de <a href="
+"\"https://www.debian.org/doc/cvs\">Cvs</a> opslagplaats."
#: ../../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 "De laatste <get-var srctype /> broncode is beschikbaar via de <a href=\"https://packages.debian.org/subversion\">Subversion</a> opslagplaats."
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a> repository."
+msgstr ""
+"De laatste <get-var srctype /> broncode is beschikbaar via de <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a> opslagplaats."
#: ../../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 "De laatste <get-var srctype /> broncode is beschikbaar via de <a href=\"https://www.debian.org/git\">Git</a> opslagplaats."
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"De laatste <get-var srctype /> broncode is beschikbaar via de <a href="
+"\"https://www.debian.org/git\">Git</a> opslagplaats."
#: ../../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"
" and check out the <kbd>boot-floppies/documentation</kbd> module."
-msgstr "Broncode uit CVS: zet <code>CVSROOT</code> op <kbd>:ext:<var>gebruikersnaam</var>@cvs.debian.org:/cvs/debian-boot</kbd> en download de module <kbd>boot-floppies/documentation</kbd>."
+msgstr ""
+"Broncode uit CVS: zet <code>CVSROOT</code> op <kbd>:ext:<var>gebruikersnaam</"
+"var>@cvs.debian.org:/cvs/debian-boot</kbd> en download de module <kbd>boot-"
+"floppies/documentation</kbd>."
#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "CVS via web"
-#: ../../english/doc/manuals.defs:197
-#: ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Debian-pakket"
-#: ../../english/doc/manuals.defs:206
-#: ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
msgid "Debian package (archived)"
msgstr "Debian-pakket (gearchiveerd)"
-#: ../../english/releases/arches.data:32
+#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
msgid "PDF"
msgstr "PDF"
#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Gebruik <a href=\"cvs\">SVN</a> om de SGML-broncode van de tekst van <get-"
-#~ "var ddp_pkg_loc /> te downloaden."
-
-#~ 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 "
@@ -517,3 +629,10 @@ msgstr "PDF"
#~ " publicatie</a> is beschikbaar bij Lehmanns Fachbuchhandlung en kost "
#~ "€&nbsp;29,95;\n"
#~ " (per 2008)"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Gebruik <a href=\"cvs\">SVN</a> om de SGML-broncode van de tekst van <get-"
+#~ "var ddp_pkg_loc /> te downloaden."
diff --git a/dutch/po/newsevents.nl.po b/dutch/po/newsevents.nl.po
index 95774cc6b36..fa390d5a3f9 100644
--- a/dutch/po/newsevents.nl.po
+++ b/dutch/po/newsevents.nl.po
@@ -32,27 +32,27 @@ msgstr "p<get-var page />"
msgid "The newsletter for the Debian community"
msgstr "De nieuwsbrief voor de Debian-gemeenschap"
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr "Naam:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "E-mail:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Eerdere voordrachten:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Talen:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Lokatie:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Onderwerpen:"
@@ -145,8 +145,12 @@ msgid "Download calendar entry"
msgstr "Download kalender-item"
#: ../../english/template/debian/news.wml:9
-msgid "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/\">Debian Project homepage</a>."
-msgstr "Terug naar: ander <a href=\"./\">Debian-nieuws</a> || <a href=\"m4_HOME/\">thuispagina van het Debian Project</a>."
+msgid ""
+"Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/\">Debian "
+"Project homepage</a>."
+msgstr ""
+"Terug naar: ander <a href=\"./\">Debian-nieuws</a> || <a href=\"m4_HOME/"
+"\">thuispagina van het Debian Project</a>."
#. '<get-var url />' is replaced by the URL and must not be translated.
#. In English the final line would look like "<http://broken.com (dead.link)>"
@@ -155,44 +159,125 @@ msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (dode link)"
#: ../../english/template/debian/projectnews/boilerplates.wml:35
-msgid "Welcome to this year's <get-var issue /> issue of DPN, the newsletter for the Debian community. Topics covered in this issue include:"
-msgstr "Welkom bij uitgave <get-var issue /> van dit jaar van DPN, de nieuwsbrief voor de Debian-gemeenschap. Deze uitgave bevat onder andere de volgende onderwerpen:"
+msgid ""
+"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
+"the Debian community. Topics covered in this issue include:"
+msgstr ""
+"Welkom bij uitgave <get-var issue /> van dit jaar van DPN, de nieuwsbrief "
+"voor de Debian-gemeenschap. Deze uitgave bevat onder andere de volgende "
+"onderwerpen:"
#: ../../english/template/debian/projectnews/boilerplates.wml:56
#: ../../english/template/debian/projectnews/boilerplates.wml:77
-msgid "According to the <a href=\"https://udd.debian.org/bugs.cgi\">Bugs Search interface of the Ultimate Debian Database</a>, the upcoming release, Debian <q><get-var release /></q>, is currently affected by <get-var testing /> Release-Critical bugs. Ignoring bugs which are easily solved or on the way to being solved, roughly speaking, about <get-var tobefixed /> Release-Critical bugs remain to be solved for the release to happen."
-msgstr "Volgens de <a href=\"https://udd.debian.org/bugs.cgi\">bugzoekinterface van de Ultimate Debian Database</a> is de komende release, Debian <q><get-var release /></q> beinvloed door <get-var testing /> release-kritieke bugs. Als we de bugs negeren die makkelijk op te lossen zijn of al bijna zijn opgelost blijven er ruwweg <get-var tobefixed /> release-kritieke bugs over die moeten worden opgelost om een release mogelijk te maken."
+msgid ""
+"According to the <a href=\"https://udd.debian.org/bugs.cgi\">Bugs Search "
+"interface of the Ultimate Debian Database</a>, the upcoming release, Debian "
+"<q><get-var release /></q>, is currently affected by <get-var testing /> "
+"Release-Critical bugs. Ignoring bugs which are easily solved or on the way "
+"to being solved, roughly speaking, about <get-var tobefixed /> Release-"
+"Critical bugs remain to be solved for the release to happen."
+msgstr ""
+"Volgens de <a href=\"https://udd.debian.org/bugs.cgi\">bugzoekinterface van "
+"de Ultimate Debian Database</a> is de komende release, Debian <q><get-var "
+"release /></q> beinvloed door <get-var testing /> release-kritieke bugs. Als "
+"we de bugs negeren die makkelijk op te lossen zijn of al bijna zijn opgelost "
+"blijven er ruwweg <get-var tobefixed /> release-kritieke bugs over die "
+"moeten worden opgelost om een release mogelijk te maken."
#: ../../english/template/debian/projectnews/boilerplates.wml:57
-msgid "There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints on how to interpret</a> these numbers."
-msgstr "Er zijn ook enkele < <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints over het interpreteren</a> van deze getallen."
+msgid ""
+"There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats"
+"\">hints on how to interpret</a> these numbers."
+msgstr ""
+"Er zijn ook enkele < <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats"
+"\">hints over het interpreteren</a> van deze getallen."
#: ../../english/template/debian/projectnews/boilerplates.wml:78
-#| msgid ""
-#| "There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats"
-#| "\">hints on how to interpret</a> these numbers."
-msgid "There are also <a href=\"<get-var url />\">more detailed statistics</a> as well as some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints on how to interpret</a> these numbers."
-msgstr "Er zijn ook <a href=\"<get-var url />\">gedetaileerdere statistieken</a> alsook enkele <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints over het interpreteren</a> van deze getallen."
+msgid ""
+"There are also <a href=\"<get-var url />\">more detailed statistics</a> as "
+"well as some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints "
+"on how to interpret</a> these numbers."
+msgstr ""
+"Er zijn ook <a href=\"<get-var url />\">gedetaileerdere statistieken</a> "
+"alsook enkele <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints "
+"over het interpreteren</a> van deze getallen."
#: ../../english/template/debian/projectnews/boilerplates.wml:102
-msgid "<a href=\"<get-var link />\">Currently</a> <a href=\"m4_DEVEL/wnpp/orphaned\"><get-var orphaned /> packages are orphaned</a> and <a href=\"m4_DEVEL/wnpp/rfa\"><get-var rfa /> packages are up for adoption</a>: please visit the complete list of <a href=\"m4_DEVEL/wnpp/help_requested\">packages which need your help</a>."
-msgstr "Er zijn <a href=\"<get-var link />\">op dit moment</a> <a href=\"m4_DEVEL/wnpp/orphaned\"><get-var orphaned /> verweesde pakketten</a> en <a href=\"m4_DEVEL/wnpp/rfa\"><get-var rfa /> pakketten aangeboden voor adoptie</a>: bezoek de volledige lijst van <a href=\"m4_DEVEL/wnpp/help_requested\">pakketten die uw hulp nodig hebben</a>."
+msgid ""
+"<a href=\"<get-var link />\">Currently</a> <a href=\"m4_DEVEL/wnpp/orphaned"
+"\"><get-var orphaned /> packages are orphaned</a> and <a href=\"m4_DEVEL/"
+"wnpp/rfa\"><get-var rfa /> packages are up for adoption</a>: please visit "
+"the complete list of <a href=\"m4_DEVEL/wnpp/help_requested\">packages which "
+"need your help</a>."
+msgstr ""
+"Er zijn <a href=\"<get-var link />\">op dit moment</a> <a href=\"m4_DEVEL/"
+"wnpp/orphaned\"><get-var orphaned /> verweesde pakketten</a> en <a href="
+"\"m4_DEVEL/wnpp/rfa\"><get-var rfa /> pakketten aangeboden voor adoptie</a>: "
+"bezoek de volledige lijst van <a href=\"m4_DEVEL/wnpp/help_requested"
+"\">pakketten die uw hulp nodig hebben</a>."
#: ../../english/template/debian/projectnews/boilerplates.wml:114
-msgid "Please help us create this newsletter. We still need more volunteer writers to watch the Debian community and report about what is going on. Please see the <a href=\"https://wiki.debian.org/ProjectNews/HowToContribute\">contributing page</a> to find out how to help. We're looking forward to receiving your mail at <a href=\"mailto:debian-publicity@lists.debian.org\">debian-publicity@lists.debian.org</a>."
-msgstr "Help ons bij het maken van deze nieuwsbrief. We hebben nog steeds vrijwilligers nodig die schrijven over wat er speelt in de Debian-gemeenschap. Bekijk de <a href=\"https://wiki.debian.org/ProjectNews/HowToContribute\">bijdragen-pagina</a> om te lezen hoe u kunt helpen. We verheugen ons op uw e-mail op <a href=\"mailto:debian-publicity@lists.debian.org\">debian-publicity@lists.debian.org</a>."
+msgid ""
+"Please help us create this newsletter. We still need more volunteer writers "
+"to watch the Debian community and report about what is going on. Please see "
+"the <a href=\"https://wiki.debian.org/ProjectNews/HowToContribute"
+"\">contributing page</a> to find out how to help. We're looking forward to "
+"receiving your mail at <a href=\"mailto:debian-publicity@lists.debian.org"
+"\">debian-publicity@lists.debian.org</a>."
+msgstr ""
+"Help ons bij het maken van deze nieuwsbrief. We hebben nog steeds "
+"vrijwilligers nodig die schrijven over wat er speelt in de Debian-"
+"gemeenschap. Bekijk de <a href=\"https://wiki.debian.org/ProjectNews/"
+"HowToContribute\">bijdragen-pagina</a> om te lezen hoe u kunt helpen. We "
+"verheugen ons op uw e-mail op <a href=\"mailto:debian-publicity@lists.debian."
+"org\">debian-publicity@lists.debian.org</a>."
#: ../../english/template/debian/projectnews/boilerplates.wml:175
-msgid "Please note that these are a selection of the more important security advisories of the last weeks. If you need to be kept up to date about security advisories released by the Debian Security Team, please subscribe to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href=\"<get-var url-stable-announce />\">stable updates list</a>) for announcements."
-msgstr "Deze lijst is slechts een selectie van de belangrijkere beveiligingsaanbevelingen van de afgelopen week. Als u op de hoogte gehouden moet worden over beveiligingsaanbevelingen die uitgebracht zijn door het Debian beveiligingsteam, abonneert u zich dan op de <a href=\"<get-var url-dsa />\">beveiligings e-maillijst</a> (en de aparte <a href=\"<get-var url-bpo />\">backports lijst</a> en <a href=\"<get-var url-stable-announce />\">stabiele updates lijst</a>) voor aankondigingen."
+msgid ""
+"Please note that these are a selection of the more important security "
+"advisories of the last weeks. If you need to be kept up to date about "
+"security advisories released by the Debian Security Team, please subscribe "
+"to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
+"\"<get-var url-stable-announce />\">stable updates list</a>) for "
+"announcements."
+msgstr ""
+"Deze lijst is slechts een selectie van de belangrijkere "
+"beveiligingsaanbevelingen van de afgelopen week. Als u op de hoogte gehouden "
+"moet worden over beveiligingsaanbevelingen die uitgebracht zijn door het "
+"Debian beveiligingsteam, abonneert u zich dan op de <a href=\"<get-var url-"
+"dsa />\">beveiligings e-maillijst</a> (en de aparte <a href=\"<get-var url-"
+"bpo />\">backports lijst</a> en <a href=\"<get-var url-stable-announce />"
+"\">stabiele updates lijst</a>) voor aankondigingen."
#: ../../english/template/debian/projectnews/boilerplates.wml:176
-msgid "Please note that these are a selection of the more important security advisories of the last weeks. If you need to be kept up to date about security advisories released by the Debian Security Team, please subscribe to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href=\"<get-var url-stable-announce />\">stable updates list</a> or <a href=\"<get-var url-volatile-announce />\">volatile list</a>, for <q><get-var old-stable /></q>, the oldstable distribution) for announcements."
-msgstr "Deze lijst is slechts een selectie van de belangrijkere beveiligingsaanbevelingen van de afgelopen week. Als u op de hoogte gehouden moet worden over beveiligingsaanbevelingen die uitgebracht zijn door het Debian beveiligingsteam, abonneert u zich dan op de <a href=\"<get-var url-dsa />\">beveiligings e-maillijst</a> (en de aparte <a href=\"<get-var url-bpo />\">backports lijst</a> en <a href=\"<get-var url-stable-announce />\">stabiele updates lijst</a> of <a href=\"<get-var url-volatile-announce />\">volatile lijst</a> voor <q><get-var old-stable /></q>, de oldstable distributie) voor aankondigingen."
+msgid ""
+"Please note that these are a selection of the more important security "
+"advisories of the last weeks. If you need to be kept up to date about "
+"security advisories released by the Debian Security Team, please subscribe "
+"to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
+"\"<get-var url-stable-announce />\">stable updates list</a> or <a href="
+"\"<get-var url-volatile-announce />\">volatile list</a>, for <q><get-var old-"
+"stable /></q>, the oldstable distribution) for announcements."
+msgstr ""
+"Deze lijst is slechts een selectie van de belangrijkere "
+"beveiligingsaanbevelingen van de afgelopen week. Als u op de hoogte gehouden "
+"moet worden over beveiligingsaanbevelingen die uitgebracht zijn door het "
+"Debian beveiligingsteam, abonneert u zich dan op de <a href=\"<get-var url-"
+"dsa />\">beveiligings e-maillijst</a> (en de aparte <a href=\"<get-var url-"
+"bpo />\">backports lijst</a> en <a href=\"<get-var url-stable-announce />"
+"\">stabiele updates lijst</a> of <a href=\"<get-var url-volatile-announce />"
+"\">volatile lijst</a> voor <q><get-var old-stable /></q>, de oldstable "
+"distributie) voor aankondigingen."
#: ../../english/template/debian/projectnews/boilerplates.wml:185
-msgid "Debian's Stable Release Team released an update announcement for the package: "
-msgstr "Debians Stable Release Team heeft een update aankondiging gedaan voor het pakket: "
+msgid ""
+"Debian's Stable Release Team released an update announcement for the "
+"package: "
+msgstr ""
+"Debians Stable Release Team heeft een update aankondiging gedaan voor het "
+"pakket: "
#: ../../english/template/debian/projectnews/boilerplates.wml:187
#: ../../english/template/debian/projectnews/boilerplates.wml:200
@@ -224,15 +309,24 @@ msgstr "Leest u ze a.u.b zorgvuldig en neem de juiste maatregelen."
#: ../../english/template/debian/projectnews/boilerplates.wml:198
msgid "Debian's Backports Team released advisories for these packages: "
-msgstr "Debians Backports Team heeft adviezen uitgebracht voor deze pakketten: "
+msgstr ""
+"Debians Backports Team heeft adviezen uitgebracht voor deze pakketten: "
#: ../../english/template/debian/projectnews/boilerplates.wml:211
-msgid "Debian's Security Team recently released advisories for these packages (among others): "
-msgstr "Debians Beveiligings Team heeft recentelijk adviezen uitgebracht voor (onder andere) deze pakketten: "
+msgid ""
+"Debian's Security Team recently released advisories for these packages "
+"(among others): "
+msgstr ""
+"Debians Beveiligings Team heeft recentelijk adviezen uitgebracht voor (onder "
+"andere) deze pakketten: "
#: ../../english/template/debian/projectnews/boilerplates.wml:240
-msgid "<get-var num-newpkg /> packages were added to the unstable Debian archive recently."
-msgstr "<get-var num-newpkg /> pakketten zijn recentelijk toegevoegd aan het unstable Debian archief."
+msgid ""
+"<get-var num-newpkg /> packages were added to the unstable Debian archive "
+"recently."
+msgstr ""
+"<get-var num-newpkg /> pakketten zijn recentelijk toegevoegd aan het "
+"unstable Debian archief."
#: ../../english/template/debian/projectnews/boilerplates.wml:242
msgid " <a href=\"<get-var url-newpkg />\">Among many others</a> are:"
@@ -243,89 +337,171 @@ msgid "There are several upcoming Debian-related events:"
msgstr "Er komen verschillende Debian gerelateerde evenementen aan:"
#: ../../english/template/debian/projectnews/boilerplates.wml:275
-msgid "You can find more information about Debian-related events and talks on the <a href=\"<get-var events-section />\">events section</a> of the Debian web site, or subscribe to one of our events mailing lists for different regions: <a href=\"<get-var events-ml-eu />\">Europe</a>, <a href=\"<get-var events-ml-nl />\">Netherlands</a>, <a href=\"<get-var events-ml-ha />\">Hispanic America</a>, <a href=\"<get-var events-ml-na />\">North America</a>."
-msgstr "U kunt meer informatie over Debian-gerelateerde evenementen en praatjes vinden in de <a href=\"<get-var events-section />\">evenementen sektie</a> van de Debian web-site, of abonneer u op een van onze evenementen e-maillijsten voor verschillende regios: <a href=\"<get-var events-ml-eu />\">Europa</a>, <a href=\"<get-var events-ml-nl />\">Nederland</a>, <a href=\"<get-var events-ml-ha />\">Spaans Amerika</a>, <a href=\"<get-var events-ml-na />\">Noord Amerika</a>."
+msgid ""
+"You can find more information about Debian-related events and talks on the "
+"<a href=\"<get-var events-section />\">events section</a> of the Debian web "
+"site, or subscribe to one of our events mailing lists for different regions: "
+"<a href=\"<get-var events-ml-eu />\">Europe</a>, <a href=\"<get-var events-"
+"ml-nl />\">Netherlands</a>, <a href=\"<get-var events-ml-ha />\">Hispanic "
+"America</a>, <a href=\"<get-var events-ml-na />\">North America</a>."
+msgstr ""
+"U kunt meer informatie over Debian-gerelateerde evenementen en praatjes "
+"vinden in de <a href=\"<get-var events-section />\">evenementen sektie</a> "
+"van de Debian web-site, of abonneer u op een van onze evenementen e-"
+"maillijsten voor verschillende regios: <a href=\"<get-var events-ml-eu />"
+"\">Europa</a>, <a href=\"<get-var events-ml-nl />\">Nederland</a>, <a href="
+"\"<get-var events-ml-ha />\">Spaans Amerika</a>, <a href=\"<get-var events-"
+"ml-na />\">Noord Amerika</a>."
#: ../../english/template/debian/projectnews/boilerplates.wml:300
-msgid "Do you want to organise a Debian booth or a Debian install party? Are you aware of other upcoming Debian-related events? Have you delivered a Debian talk that you want to link on our <a href=\"<get-var events-talks />\">talks page</a>? Send an email to the <a href=\"<get-var events-team />\">Debian Events Team</a>."
-msgstr "Wilt u een Debian stand of een Debian installatiefeest organiseren? Bent u bekend met een aankomend Debian-gerelateerd evenement? Heeft u een verhaal gehouden over Debian dat u wilt linken op onze <a href=\"<get-var events-talks />\">verhalen pagina</a>? Stuurt u dan een e-mail aan het <a href=\"<get-var events-team />\">Debian evenementen team</a>."
+msgid ""
+"Do you want to organise a Debian booth or a Debian install party? Are you "
+"aware of other upcoming Debian-related events? Have you delivered a Debian "
+"talk that you want to link on our <a href=\"<get-var events-talks />\">talks "
+"page</a>? Send an email to the <a href=\"<get-var events-team />\">Debian "
+"Events Team</a>."
+msgstr ""
+"Wilt u een Debian stand of een Debian installatiefeest organiseren? Bent u "
+"bekend met een aankomend Debian-gerelateerd evenement? Heeft u een verhaal "
+"gehouden over Debian dat u wilt linken op onze <a href=\"<get-var events-"
+"talks />\">verhalen pagina</a>? Stuurt u dan een e-mail aan het <a href="
+"\"<get-var events-team />\">Debian evenementen team</a>."
#: ../../english/template/debian/projectnews/boilerplates.wml:322
-msgid "<get-var dd-num /> applicants have been <a href=\"<get-var dd-url />\">accepted</a> as Debian Developers"
-msgstr "<get-var dd-num /> sollicitanten zijn <a href=\"<get-var dd-url />\">geaccepteerd</a> als Debian Developers"
+msgid ""
+"<get-var dd-num /> applicants have been <a href=\"<get-var dd-url />"
+"\">accepted</a> as Debian Developers"
+msgstr ""
+"<get-var dd-num /> sollicitanten zijn <a href=\"<get-var dd-url />"
+"\">geaccepteerd</a> als Debian Developers"
#: ../../english/template/debian/projectnews/boilerplates.wml:329
-msgid "<get-var dm-num /> applicants have been <a href=\"<get-var dm-url />\">accepted</a> as Debian Maintainers"
-msgstr "<get-var dm-num /> sollicitanten zijn <a href=\"<get-var dm-url />\">geaccepteerd</a> als Debian Maintainers"
+msgid ""
+"<get-var dm-num /> applicants have been <a href=\"<get-var dm-url />"
+"\">accepted</a> as Debian Maintainers"
+msgstr ""
+"<get-var dm-num /> sollicitanten zijn <a href=\"<get-var dm-url />"
+"\">geaccepteerd</a> als Debian Maintainers"
#: ../../english/template/debian/projectnews/boilerplates.wml:336
-msgid "<get-var uploader-num /> people have <a href=\"<get-var uploader-url />\">started to maintain packages</a>"
-msgstr "<get-var uploader-num /> mensen zijn <a href=\"<get-var uploader-url />\">begonnen met het beheren van pakketten</a>"
+msgid ""
+"<get-var uploader-num /> people have <a href=\"<get-var uploader-url />"
+"\">started to maintain packages</a>"
+msgstr ""
+"<get-var uploader-num /> mensen zijn <a href=\"<get-var uploader-url />"
+"\">begonnen met het beheren van pakketten</a>"
#: ../../english/template/debian/projectnews/boilerplates.wml:381
-msgid "<get-var eval-newcontributors-text-list /> since the previous issue of the Debian Project News. Please welcome <get-var eval-newcontributors-name-list /> into our project!"
-msgstr "<get-var eval-newcontributors-text-list /> sinds de vorige editie van het Debian project nieuws. Laten we <get-var eval-newcontributors-name-list /> verwelkomen in ons project!"
+msgid ""
+"<get-var eval-newcontributors-text-list /> since the previous issue of the "
+"Debian Project News. Please welcome <get-var eval-newcontributors-name-list /"
+"> into our project!"
+msgstr ""
+"<get-var eval-newcontributors-text-list /> sinds de vorige editie van het "
+"Debian project nieuws. Laten we <get-var eval-newcontributors-name-list /> "
+"verwelkomen in ons project!"
#: ../../english/template/debian/projectnews/boilerplates.wml:394
-msgid "The <get-var issue-devel-news /> issue of the <a href=\"<get-var url-devel-news />\">miscellaneous news for developers</a> has been released and covers the following topics:"
-msgstr "De <get-var issue-devel-news /> editie van het <a href=\"<get-var url-devel-news />\">diverse nieuws voor ontwikkelaars</a> is uitgegeven en behandelt de volgende onderwerpen:"
+msgid ""
+"The <get-var issue-devel-news /> issue of the <a href=\"<get-var url-devel-"
+"news />\">miscellaneous news for developers</a> has been released and covers "
+"the following topics:"
+msgstr ""
+"De <get-var issue-devel-news /> editie van het <a href=\"<get-var url-devel-"
+"news />\">diverse nieuws voor ontwikkelaars</a> is uitgegeven en behandelt "
+"de volgende onderwerpen:"
#: ../../english/template/debian/projectnews/footer.wml:6
-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 "Om deze nieuwsbrief om de week in uw mailbox te ontvangen, kunt u zich <a href=\"https://lists.debian.org/debian-news/\">aanmelden voor de debian-news mailinglijst</a>."
+#, 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 in your mailbox, <a href=\"https://lists.debian."
+"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+"Om deze nieuwsbrief wekelijks in uw mailbox te ontvangen, kunt u zich <a "
+"href=\"https://lists.debian.org/debian-news/\">aanmelden voor de debian-news "
+"mailinglijst</a>."
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-msgstr "<a href=\"../../\">Eerdere uitgaven</a> van deze nieuwsbrief zijn beschikbaar."
+msgstr ""
+"<a href=\"../../\">Eerdere uitgaven</a> van deze nieuwsbrief zijn "
+"beschikbaar."
#. One editor name only
#: ../../english/template/debian/projectnews/footer.wml:15
-msgid "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr "<void id=\"singular\" />Debian Projectnieuws wordt geredigeerd door <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgid ""
+"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Debian Projectnieuws wordt geredigeerd door <a href="
+"\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#. Two or more editors
#: ../../english/template/debian/projectnews/footer.wml:20
-msgid "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr "<void id=\"plural\" />Debian Projectnieuws wordt geredigeerd door <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgid ""
+"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Debian Projectnieuws wordt geredigeerd door <a href="
+"\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#. One editor name only
#: ../../english/template/debian/projectnews/footer.wml:25
-msgid "<void id=\"singular\" />This issue of Debian Project News was edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr "<void id=\"singular\" />Deze uitgave van Debian Projectnieuws is geredigeerd door <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgid ""
+"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Deze uitgave van Debian Projectnieuws is geredigeerd "
+"door <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#. Two or more editors
#: ../../english/template/debian/projectnews/footer.wml:30
-msgid "<void id=\"plural\" />This issue of Debian Project News was edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr "<void id=\"plural\" />Deze uitgave van Debian Projectnieuws is geredigeerd door <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgid ""
+"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Deze uitgave van Debian Projectnieuws is geredigeerd "
+"door <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#. One translator only
#. One translator only
#: ../../english/template/debian/projectnews/footer.wml:35
#: ../../english/template/debian/weeklynews/footer.wml:35
msgid "<void id=\"singular\" />It was translated by %s."
-msgstr "<void id=\"singular\" />Deze editie van Debian Weekly News is vertaald door %s."
+msgstr ""
+"<void id=\"singular\" />Deze editie van Debian Weekly News is vertaald door "
+"%s."
#. Two ore more translators
#. Two ore more translators
#: ../../english/template/debian/projectnews/footer.wml:40
#: ../../english/template/debian/weeklynews/footer.wml:40
msgid "<void id=\"plural\" />It was translated by %s."
-msgstr "<void id=\"plural\" />Deze editie van Debian Weekly News is vertaald door %s."
+msgstr ""
+"<void id=\"plural\" />Deze editie van Debian Weekly News is vertaald door %s."
#. One female translator only
#. One female translator only
#: ../../english/template/debian/projectnews/footer.wml:45
#: ../../english/template/debian/weeklynews/footer.wml:45
msgid "<void id=\"singularfemale\" />It was translated by %s."
-msgstr "<void id=\"singularfemale\" />Deze editie van Debian Weekly News is vertaald door %s."
+msgstr ""
+"<void id=\"singularfemale\" />Deze editie van Debian Weekly News is vertaald "
+"door %s."
#. Two ore more female translators
#. Two ore more female translators
#: ../../english/template/debian/projectnews/footer.wml:50
#: ../../english/template/debian/weeklynews/footer.wml:50
msgid "<void id=\"pluralfemale\" />It was translated by %s."
-msgstr "<void id=\"pluralfemale\" />Deze editie van Debian Weekly News is vertaald door %s."
+msgstr ""
+"<void id=\"pluralfemale\" />Deze editie van Debian Weekly News is vertaald "
+"door %s."
#: ../../english/template/debian/speakers.wml:6
msgid "List of Speakers"
@@ -336,26 +512,55 @@ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
msgstr "Terug naar de <a href=\"./\">Debian sprekerspagina</a>."
#: ../../english/template/debian/weeklynews/footer.wml:6
-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>."
-msgstr "Om deze nieuwsbrief wekelijks in uw mailbox te ontvangen, kunt u zich <a href=\"https://lists.debian.org/debian-news/\">aanmelden voor de debian-news mailinglijst</a>."
+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>."
+msgstr ""
+"Om deze nieuwsbrief wekelijks in uw mailbox te ontvangen, kunt u zich <a "
+"href=\"https://lists.debian.org/debian-news/\">aanmelden voor de debian-news "
+"mailinglijst</a>."
#. One editor name only
#: ../../english/template/debian/weeklynews/footer.wml:15
-msgid "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr "<void id=\"singular\" />Debian Weekly News wordt geredigeerd door <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>."
+msgstr ""
+"<void id=\"singular\" />Debian Weekly News wordt geredigeerd door <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
#. Two or more editors
#: ../../english/template/debian/weeklynews/footer.wml:20
-msgid "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr "<void id=\"plural\" />Debian Weekly News wordt geredigeerd door <a href=\"mailto:dwn@debian.org\">%s</a>."
+msgid ""
+"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Debian Weekly News wordt geredigeerd door <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
#. One editor name only
#: ../../english/template/debian/weeklynews/footer.wml:25
-msgid "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr "<void id=\"singular\" />Deze uitgave Debian Weekly News werd geredigeerd door <a href=\"mailto:dwn@debian.org\">%s</a>."
+msgid ""
+"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Deze uitgave Debian Weekly News werd geredigeerd "
+"door <a href=\"mailto:dwn@debian.org\">%s</a>."
#. Two or more editors
#: ../../english/template/debian/weeklynews/footer.wml:30
-msgid "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr "<void id=\"plural\" />Deze uitgave van Debian Weekly News werd geredigeerd door <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>."
+msgstr ""
+"<void id=\"plural\" />Deze uitgave van Debian Weekly News werd geredigeerd "
+"door <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 ""
+#~ "Om deze nieuwsbrief om de week in uw mailbox te ontvangen, kunt u zich <a "
+#~ "href=\"https://lists.debian.org/debian-news/\">aanmelden voor de debian-"
+#~ "news mailinglijst</a>."
diff --git a/dutch/po/organization.nl.po b/dutch/po/organization.nl.po
index 26dbfc0a599..0554998c1e7 100644
--- a/dutch/po/organization.nl.po
+++ b/dutch/po/organization.nl.po
@@ -9,6 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2014-09-14 20:24+0100\n"
"Last-Translator: Paul Gevers <elbrus@debian.org>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -18,7 +19,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 1.4\n"
-"POT-Creation-Date: \n"
#: ../../english/intro/organization.data:13
msgid "delegation mail"
@@ -82,7 +82,7 @@ msgid "Officers"
msgstr "Gezagsdragers"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distributie"
@@ -92,11 +92,11 @@ msgid "Publicity"
msgstr "Publiciteit"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Ondersteuning en Infrastructuur"
-#. 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 "Doelgroepspecifieke uitgaves van Debian (Debian Pure Blends)"
@@ -109,100 +109,99 @@ msgstr "Leider"
msgid "Technical Committee"
msgstr "Technisch comité"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Secretaris"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Ontwikkelingsprojecten"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP-archieven"
-#: ../../english/intro/organization.data:86
-#| msgid "FTP Master"
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "FTP-meesters"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "FTP-assistenten"
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "FTP-grootmeesters"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Backports-team"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Individuele pakketten"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Releasemanagement"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Release-team"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Kwaliteitscontrole"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Installatiesysteem-team"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Notities bij de uitgave"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD-images"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Productie"
-#: ../../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 "Infrastructuur voor geautomatiseerde bouw van pakketten"
-#: ../../english/intro/organization.data:140
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Wanna-build-team"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Buildd-beheer"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Documentatie"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Lijst van pakketten waaraan gewerkt moet worden of die eraan komen"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Livesysteem-team"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Ports"
@@ -230,158 +229,175 @@ msgstr "Perscontact"
msgid "Partner Program"
msgstr "Partnerprogramma"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Evenementen"
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Stukjes van Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Gebruikersondersteuning"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Bugvolgsysteem"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Beheer van mailinglijsten en mailinglijstarchieven"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Aanmeldbalie voor nieuwe leden"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Beheerders van ontwikkelaarsaccounts"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Beheerders van encryptiesleutels (PGP en GPG)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Beheerders van de encryptiesleutels van Debian Maintainers (DM)"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Beveiligingsteam"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "Beveiligingsteam voor Testing"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Beveiligingsauditproject"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Webpagina’s"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Pagina met Debian dienstverleners"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Pagina voor CD-verkopers"
-#: ../../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 "Beleid"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Systeembeheer"
-#: ../../english/intro/organization.data:401
-msgid "This is the address to use when encountering problems on one of Debian's machines, including password problems or you need a package installed."
-msgstr "Dit is het adres dat u moet gebruiken als er problemen optreden met een van Debian’s machines, inclusief wachtwoord problemen, of als er een pakket geïnstalleerd moet worden."
+#: ../../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."
+msgstr ""
+"Dit is het adres dat u moet gebruiken als er problemen optreden met een van "
+"Debian’s machines, inclusief wachtwoord problemen, of als er een pakket "
+"geïnstalleerd moet worden."
-#: ../../english/intro/organization.data:408
-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 "Als u hardware problemen hebt met Debian machine, gelieve dan de <a href=\"https://db.debian.org/machines.cgi\">Debian Machine</a> pagina te raadplegen. Deze behoort per machine over de nodige beheerdersinformatie te bevatten."
+#: ../../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 ""
+"Als u hardware problemen hebt met Debian machine, gelieve dan de <a href="
+"\"https://db.debian.org/machines.cgi\">Debian Machine</a> pagina te "
+"raadplegen. Deze behoort per machine over de nodige beheerdersinformatie te "
+"bevatten."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Beheerder van de LDAP-gids van ontwikkelaars"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Spiegelservers"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "DNS-beheerder"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Pakketvolgsysteem"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Coördinatie hardwaredonaties"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Auditor"
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr "Aanvragen voor het gebruik van het <a href=\"m4_HOME/trademark\">handelsmerk</a>"
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
-msgstr "huidige projectleider van Debian"
+#: ../../english/intro/organization.data:413
+#, fuzzy
+#| msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgstr ""
+"Aanvragen voor het gebruik van het <a href=\"m4_HOME/trademark"
+"\">handelsmerk</a>"
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Alioth-beheerders"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Vrouwen in Debian"
-#: ../../english/intro/organization.data:443
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "DebConf-leiding"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Pestpreventie"
-#: ../../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 voor kinderen van 1 tot 99"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian voor medische toepassingen en onderzoek"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian voor het onderwijs"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian in de rechtspraak"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian voor mensen met een handicap"
-#: ../../english/intro/organization.data:479
-#| msgid "Debian for medical practice and research"
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian voor wetenschappelijke toepassingen en onderzoek"
#~ msgid "Alpha (Not active: was not released with squeeze)"
#~ msgstr "Alpha (Niet actief: is niet uitgebracht met squeeze)"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "huidige projectleider van Debian"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "Beveiligingsauditproject"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "Beveiligingsteam voor Testing"
diff --git a/dutch/po/others.nl.po b/dutch/po/others.nl.po
index 7c74bd61c1a..9b9d4742035 100644
--- a/dutch/po/others.nl.po
+++ b/dutch/po/others.nl.po
@@ -104,8 +104,12 @@ msgid "Applicants' checklist"
msgstr "Checklist voor inschrijvers"
#: ../../english/devel/website/tc.data:11
-msgid "See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> (only available in French) for more information."
-msgstr "Zie <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/index.fr.html</a> (alleen in het Frans) voor meer informatie."
+msgid ""
+"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
+"(only available in French) for more information."
+msgstr ""
+"Zie <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/"
+"index.fr.html</a> (alleen in het Frans) voor meer informatie."
#: ../../english/devel/website/tc.data:12
#: ../../english/devel/website/tc.data:14
@@ -115,8 +119,12 @@ msgid "More information"
msgstr "Meer informatie"
#: ../../english/devel/website/tc.data:13
-msgid "See <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</a> (only available in Spanish) for more information."
-msgstr "Zie <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</a> (alleen in het Spaans) voor meer informatie."
+msgid ""
+"See <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</"
+"a> (only available in Spanish) for more information."
+msgstr ""
+"Zie <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</"
+"a> (alleen in het Spaans) voor meer informatie."
#: ../../english/distrib/pre-installed.defs:18
msgid "Phone"
@@ -162,27 +170,6 @@ msgstr "[Debian] (mini-button)"
msgid "same as the above"
msgstr "zelfde als bovenstaande"
-#: ../../english/misc/hardware.def:12
-#: ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Gevraagd:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Wie:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Architectuur"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Specificaties:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Waar:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Producten"
@@ -272,11 +259,16 @@ msgid "What got you interested in working with Debian?"
msgstr "Waardoor raakte u geïnteresseerd om met Debian te werken?"
#: ../../english/women/profiles/profiles.def:36
-msgid "Do you have any tips for women interested in getting more involved with Debian?"
-msgstr "Heeft u tips voor vrouwen die graag meer actief betrokken willen worden bij Debian?"
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+"Heeft u tips voor vrouwen die graag meer actief betrokken willen worden bij "
+"Debian?"
#: ../../english/women/profiles/profiles.def:39
-msgid "Are you involved with any other women in technology group? Which one(s)?"
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
msgstr "Bent u actief in andere technologiegroepen van vrouwen? Welke?"
#: ../../english/women/profiles/profiles.def:42
@@ -327,3 +319,17 @@ msgstr "Versie"
msgid "URL"
msgstr "URL"
+#~ msgid "Where:"
+#~ msgstr "Waar:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Specificaties:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Architectuur"
+
+#~ msgid "Who:"
+#~ msgstr "Wie:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Gevraagd:"
diff --git a/dutch/po/ports.nl.po b/dutch/po/ports.nl.po
index a455a348746..c96a6289897 100644
--- a/dutch/po/ports.nl.po
+++ b/dutch/po/ports.nl.po
@@ -120,32 +120,32 @@ msgstr "Debian voor PowerPC"
msgid "Debian for Sparc"
msgstr "Debian voor Sparc"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian voor Sparc64"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian voor S/390"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian voor Laptops"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian voor MIPS"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian voor AMD64"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian voor Motorola 680x0"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian voor ARM"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian voor Beowulf"
#~ msgid "Main"
#~ msgstr "Hoofd"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian voor Beowulf"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian voor ARM"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian voor Motorola 680x0"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian voor AMD64"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian voor MIPS"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian voor Laptops"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian voor S/390"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian voor Sparc64"
diff --git a/dutch/po/stats.nl.po b/dutch/po/stats.nl.po
index 4ecba1aaf9a..cd57316db7d 100644
--- a/dutch/po/stats.nl.po
+++ b/dutch/po/stats.nl.po
@@ -33,75 +33,75 @@ msgstr "Er zijn %d bytes te vertalen."
msgid "There are %d strings to translate."
msgstr "Er zijn %d strings te vertalen."
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Deze vertaling is te verouderd"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Verkeerde vertalingsversie"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "Het origineel is nieuwer dan deze vertaling"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "Het origineel bestaat niet meer"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "aantal bezoeken n.v.t"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "bezoeken"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Klik om de verschil-info op te halen"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "Verenigde diff"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "Gekleurde diff"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Vertaaloverzicht voor"
-#: ../../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 "Niet vertaald"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Verouderd"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Vertaald"
-#: ../../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 "Bijgewerkt"
-#: ../../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 "bestanden"
-#: ../../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 "bytes"
-#: ../../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."
@@ -109,135 +109,134 @@ msgstr ""
"Let op: De lijst van pagina’s is gesorteerd op volgorde van populariteit. "
"Houd de muis over de paginanaam om het aantal bezoeken te zien."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Verouderde vertalingen"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "Bestand"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Verschill (diff)"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Opmerking"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Verschil-info"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Logboek"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Vertaling"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Beheerder"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Vertaler"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Datum"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Algemene pagina’s die niet zijn vertaald"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Onvertaalde algemene pagina’s"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Nieuwsberichten die niet zijn vertaald"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Onvertaalde nieuwsberichten"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Consultant/gebruikerspagina’s die niet zijn vertaald"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Onvertaalde consultant/gebruikerspagina’s"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Internationale pagina’s die niet zijn vertaald"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Onvertaalde internationale pagina’s"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Vertaalde pagina’s (bijgewerkt)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Vertaalde templates (PO-bestanden)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "PO vertaalstatistieken"
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr "Vaag (fuzzy)"
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr "Onvertaald"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Totaal"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Totaal:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Gemaakt met"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Vertaalde webpagina’s"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Vertaalstatistieken op basis van het aantal pagina’s"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Taal"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Vertalingen"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Vertaalde webpagina’s (grootte)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Vertaalstatistieken op basis van paginagrootte"
-
diff --git a/dutch/po/templates.nl.po b/dutch/po/templates.nl.po
index c870f91f9bc..762543f2fa3 100644
--- a/dutch/po/templates.nl.po
+++ b/dutch/po/templates.nl.po
@@ -49,8 +49,14 @@ msgid "Debian Project"
msgstr "Debian Project"
#: ../../english/template/debian/common_translation.wml:13
-msgid "Debian is an operating system and a distribution of Free Software. It is maintained and updated through the work of many users who volunteer their time and effort."
-msgstr "Debian is een besturingssysteem en een distributie van vrije software. Onderhoud en bijwerken gebeurt door de vele gebruikers die vrijwillig hun tijd en inspanningen aanbieden."
+msgid ""
+"Debian is an operating system and a distribution of Free Software. It is "
+"maintained and updated through the work of many users who volunteer their "
+"time and effort."
+msgstr ""
+"Debian is een besturingssysteem en een distributie van vrije software. "
+"Onderhoud en bijwerken gebeurt door de vele gebruikers die vrijwillig hun "
+"tijd en inspanningen aanbieden."
#: ../../english/template/debian/common_translation.wml:16
msgid "debian, GNU, linux, unix, open source, free, DFSG"
@@ -58,10 +64,11 @@ msgstr "debian, GNU, linux, unix, open source, vrij, DFSG"
#: ../../english/template/debian/common_translation.wml:19
msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
-msgstr "Terug naar de <a href=\"m4_HOME/\">homepagina van het Debian Project</a>."
+msgstr ""
+"Terug naar de <a href=\"m4_HOME/\">homepagina van het Debian Project</a>."
#: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:149
+#: ../../english/template/debian/links.tags.wml:152
msgid "Home"
msgstr "Thuis"
@@ -102,7 +109,7 @@ msgid "Support"
msgstr "Ondersteuning"
#: ../../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 "Ontwikkeling"
@@ -139,7 +146,7 @@ msgid "Miscellaneous"
msgstr "Diversen"
#: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:107
msgid "Getting Debian"
msgstr "Verkrijgen"
@@ -148,8 +155,12 @@ msgid "The Debian Blog"
msgstr "Blog van Debian"
#: ../../english/template/debian/ddp.wml:6
-msgid "Please send all comments, criticisms and suggestions about these web pages to our <a href=\"mailto:debian-doc@lists.debian.org\">mailing list</a>."
-msgstr "Stuur commentaar, kritiek en suggesties over deze pagina’s naar onze <a href=\"mailto:debian-doc@lists.debian.org\">mailinglijst</a>."
+msgid ""
+"Please send all comments, criticisms and suggestions about these web pages "
+"to our <a href=\"mailto:debian-doc@lists.debian.org\">mailing list</a>."
+msgstr ""
+"Stuur commentaar, kritiek en suggesties over deze pagina’s naar onze <a href="
+"\"mailto:debian-doc@lists.debian.org\">mailinglijst</a>."
#: ../../english/template/debian/fixes_link.wml:11
msgid "not needed"
@@ -189,8 +200,21 @@ msgstr "in versie 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../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 information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/website/using_cvs\">available</a>."
-msgstr "Stuur, om een probleem met de website te rapporteren, een e-mail (in het Engels) naar <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</a> of (in het Nederlands) naar <a href=\"mailto:debian-l10n-dutch@lists.debian.org\">debian-l10n-dutch@lists.debian.org</a>. Problemen met de Nederlandse vertaling kunnen eveneens naar het tweede adres worden gestuurd. Zie <a href=\"m4_HOME/contact\">contactpagina</a> voor algemene contactinformatie. De broncode van de website is <a href=\"m4_HOME/devel/website/using_cvs\">beschikbaar</a>."
+msgid ""
+"To report a problem with the web site, e-mail <a href=\"mailto:debian-"
+"www@lists.debian.org\">debian-www@lists.debian.org</a>. For other contact "
+"information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>. "
+"Web site source code is <a href=\"m4_HOME/devel/website/using_cvs"
+"\">available</a>."
+msgstr ""
+"Stuur, om een probleem met de website te rapporteren, een e-mail (in het "
+"Engels) naar <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
+"debian.org</a> of (in het Nederlands) naar <a href=\"mailto:debian-l10n-"
+"dutch@lists.debian.org\">debian-l10n-dutch@lists.debian.org</a>. Problemen "
+"met de Nederlandse vertaling kunnen eveneens naar het tweede adres worden "
+"gestuurd. Zie <a href=\"m4_HOME/contact\">contactpagina</a> voor algemene "
+"contactinformatie. De broncode van de website is <a href=\"m4_HOME/devel/"
+"website/using_cvs\">beschikbaar</a>."
#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
@@ -206,11 +230,16 @@ msgstr "<a href=\"http://www.spi-inc.org/\">SPI</a> en anderen;"
#: ../../english/template/debian/footer.wml:109
msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
-msgstr "Zie de <a href=\"m4_HOME/license\" rel=\"copyright\">licentievoorwaarden</a>"
+msgstr ""
+"Zie de <a href=\"m4_HOME/license\" rel=\"copyright\">licentievoorwaarden</a>"
#: ../../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."
-msgstr "Debian is een geregisteerd <a href=\"m4_HOME/trademark\">handelsmerk</a> van Software in the Public Interest, Inc."
+msgid ""
+"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
+"Software in the Public Interest, Inc."
+msgstr ""
+"Debian is een geregisteerd <a href=\"m4_HOME/trademark\">handelsmerk</a> van "
+"Software in the Public Interest, Inc."
#: ../../english/template/debian/languages.wml:196
#: ../../english/template/debian/languages.wml:232
@@ -219,7 +248,8 @@ msgstr "Deze pagina is ook beschikbaar in de volgende talen:"
#: ../../english/template/debian/languages.wml:265
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
-msgstr "De <a href=m4_HOME/intro/cn>standaard taal voor webpagina’s</a> instellen"
+msgstr ""
+"De <a href=m4_HOME/intro/cn>standaard taal voor webpagina’s</a> instellen"
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
@@ -266,142 +296,148 @@ msgid "Debian Books"
msgstr "Debian Boeken"
#: ../../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 "Mailinglijst Archieven"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Mailinglijsten"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Sociaal Contract"
-#: ../../english/template/debian/links.tags.wml:49
+#: ../../english/template/debian/links.tags.wml:52
msgid "Code of Conduct"
msgstr "Gedragscode"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:55
msgid "Visit the site sponsor"
msgstr "Bezoek de sponsor van deze site"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr "Debian 5.0 - Het universele besturingssysteem"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Kaart van de Debian website"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Ontwikkelaarsdatabase"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr "Debian FAQ (veelgestelde vragen)"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Debian beleidshandboek"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Naslagwerk voor ontwikkelaars"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Naslagwerk voor nieuwe ontwikkelaars"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Release-kritieke Bugs"
-#: ../../english/template/debian/links.tags.wml:79
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Lintian-rapporten"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Archieven van gebruikersmailinglijsten"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Archieven van ontwikkelaarsmailinglijsten"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Archieven van i18n/l10n-mailinglijsten"
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Archieven van port-mailinglijsten"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:98
msgid "Archives for mailing lists of the Bug tracking system"
msgstr "Archieven van mailinglijsten van het Bug Tracking Systeem"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Archieven van overige mailinglijsten"
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Vrije Software"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Ontwikkeling"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Help Debian"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Bugrapporten"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Ports/Architecturen"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Installatiehandleiding"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "CD-verkopers"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "CD/USB-ISO-images"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Netwerkinstallatie"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Voorgeïnstalleerd"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Debian-Edu Project"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr "Alioth &ndash; Debian GForge"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "Kwaliteitsbewaking"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Pakket Traceer Systeem"
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Debian-ontwikkelaars pakketoverzicht"
@@ -456,15 +492,24 @@ msgid "<void id=\"doc_for_arch\" />%s for %s"
msgstr "<void id=\"doc_for_arch\" />%s voor %s"
#: ../../english/template/debian/translation-check.wml:37
-msgid "<em>Note:</em> The <a href=\"$link\">original document</a> is newer than this translation."
-msgstr "<em>N.B.</em> Het <a href=\"$link\">origineel</a> is recenter dan de vertaling."
+msgid ""
+"<em>Note:</em> The <a href=\"$link\">original document</a> is newer than "
+"this translation."
+msgstr ""
+"<em>N.B.</em> Het <a href=\"$link\">origineel</a> is recenter dan de "
+"vertaling."
#: ../../english/template/debian/translation-check.wml:43
-msgid "Warning! This translation is too out of date, please see the <a href=\"$link\">original</a>."
-msgstr "Waarschuwing! Deze vertaling is te oud. Lees liever <a href=\"$link\">het origineel</a>."
+msgid ""
+"Warning! This translation is too out of date, please see the <a href=\"$link"
+"\">original</a>."
+msgstr ""
+"Waarschuwing! Deze vertaling is te oud. Lees liever <a href=\"$link\">het "
+"origineel</a>."
#: ../../english/template/debian/translation-check.wml:49
-msgid "<em>Note:</em> The original document of this translation no longer exists."
+msgid ""
+"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>N.B.</em> Het origineel van deze vertaling bestaat niet meer."
#: ../../english/template/debian/url.wml:4
@@ -474,4 +519,3 @@ msgstr "URL"
#: ../../english/template/debian/users.wml:7
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Terug naar de <a href=\"../\">Wie gebruikt Debian?-pagina</a>."
-
diff --git a/dutch/po/vendors.nl.po b/dutch/po/vendors.nl.po
index 5158e2fdb04..81f5502efa2 100644
--- a/dutch/po/vendors.nl.po
+++ b/dutch/po/vendors.nl.po
@@ -16,92 +16,85 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Verkoper:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL voor Debian-pagina:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Staat donatie aan Debian toe:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Land:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Verzendt naar het buitenland:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "e-mail:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Type CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Type DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Architecturen:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Verkoper"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Staat donaties toe"
-#: ../../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 "Architecturen"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Verzendt naar het buitenland"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Contact"
#. ###################
#. 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 "Website verkoper"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "pagina"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "e-mail"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "binnen Europa"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "Naar sommige gebieden"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "broncode"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "en"
+
+#~ msgid "Architectures:"
+#~ msgstr "Architecturen:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Type DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Type CD:"
+
+#~ msgid "email:"
+#~ msgstr "e-mail:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Verzendt naar het buitenland:"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Staat donatie aan Debian toe:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL voor Debian-pagina:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Verkoper:"
diff --git a/dutch/po/vote.nl.po b/dutch/po/vote.nl.po
index 61561a528c8..70d40653eb2 100644
--- a/dutch/po/vote.nl.po
+++ b/dutch/po/vote.nl.po
@@ -25,229 +25,251 @@ msgid "Time Line"
msgstr "Tijdslijn"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Nominaties"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Debat"
-#: ../../english/template/debian/votebar.wml:25
+#: ../../english/template/debian/votebar.wml:28
msgid "Platforms"
msgstr "Platforms"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Proposer"
msgstr "Indiener"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "Indiener Voorstel A"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "Indiener Voorstel B"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "Indiener Voorstel C"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "Indiener Voorstel D"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "Indiener Voorstel E"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "Indiener Voorstel F"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Seconds"
msgstr "Steun"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
msgid "Proposal A Seconds"
msgstr "Steun Voorstel A"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "Steun Voorstel B"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "Steun Voorstel C"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "Steun Voorstel D"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "Steun Voorstel E"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "Steun Voorstel F"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
msgid "Opposition"
msgstr "Weerstand"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
msgid "Text"
msgstr "Tekst"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal A"
msgstr "Voorstel A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "Voorstel B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "Voorstel C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "Voorstel D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "Voorstel E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "Voorstel F"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
msgid "Choices"
msgstr "Keuzes"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
msgid "Amendment Proposer"
msgstr "Indiener Amendement"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
msgid "Amendment Seconds"
msgstr "Steun Amendement"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
msgid "Amendment Text"
msgstr "Tekst Amendement"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
msgid "Amendment Proposer A"
msgstr "Indiener Amendement A"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "Steun Amendement A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "Tekst Amendement A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "Indiener Amendement B"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "Steun Amendement B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "Tekst Amendement B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "Indiener Amendement A"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "Steun Amendement A"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "Tekst Amendement A"
+
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendments"
msgstr "Amendementen"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:139
msgid "Proceedings"
msgstr "Notulen"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:142
msgid "Majority Requirement"
msgstr "Meerderheidsvereiste"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:145
msgid "Data and Statistics"
msgstr "Data en Statistieken"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:148
msgid "Quorum"
msgstr "Quorum"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:151
msgid "Minimum Discussion"
msgstr "Minimum Discussie"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:154
msgid "Ballot"
msgstr "Stembiljet"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:157
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:160
msgid "Outcome"
msgstr "Uitslag"
-#: ../../english/template/debian/votebar.wml:152
+#: ../../english/template/debian/votebar.wml:164
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "In&nbsp;afwachting&nbsp;van&nbsp;sponsors"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Ter&nbsp;discussie"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "In&nbsp;stemming"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Besloten"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Teruggetrokken"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Andere"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Home&nbsp;stempagina"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "How&nbsp;To"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Een&nbsp;voorstel&nbsp;voorleggen"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Een&nbsp;voorstel&nbsp;amenderen"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Een&nbsp;voorstel&nbsp;steunen"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Lees&nbsp;een&nbsp;resultaat"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Stem"
diff --git a/esperanto/po/cdimage.eo.po b/esperanto/po/cdimage.eo.po
index c871287f638..3e821c34b5f 100644
--- a/esperanto/po/cdimage.eo.po
+++ b/esperanto/po/cdimage.eo.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 " Key fingerprint"
-#: ../../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/esperanto/po/distrib.eo.po b/esperanto/po/distrib.eo.po
index 3ad2e27356e..607a96d6bec 100644
--- a/esperanto/po/distrib.eo.po
+++ b/esperanto/po/distrib.eo.po
@@ -129,61 +129,69 @@ msgid "ARM"
msgstr ""
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
-msgid "HP PA-RISC"
+msgid "Hard Float ABI ARM"
msgstr ""
#: ../../english/releases/arches.data:14
-msgid "Hurd 32-bit PC (i386)"
+msgid "HP PA-RISC"
msgstr ""
#: ../../english/releases/arches.data:15
-msgid "32-bit PC (i386)"
+msgid "Hurd 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:16
-msgid "Intel Itanium IA-64"
+msgid "32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:17
-msgid "kFreeBSD 32-bit PC (i386)"
+msgid "Intel Itanium IA-64"
msgstr ""
#: ../../english/releases/arches.data:18
-msgid "kFreeBSD 64-bit PC (amd64)"
+msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:19
-msgid "Motorola 680x0"
+msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
#: ../../english/releases/arches.data:20
-msgid "MIPS (big endian)"
+msgid "Motorola 680x0"
msgstr ""
#: ../../english/releases/arches.data:21
-msgid "MIPS (little endian)"
+msgid "MIPS (big endian)"
msgstr ""
#: ../../english/releases/arches.data:22
-msgid "PowerPC"
+msgid "MIPS (little endian)"
msgstr ""
#: ../../english/releases/arches.data:23
-msgid "IBM S/390"
+msgid "PowerPC"
msgstr ""
#: ../../english/releases/arches.data:24
-msgid "IBM System z"
+msgid "POWER Processors"
msgstr ""
#: ../../english/releases/arches.data:25
+msgid "IBM S/390"
+msgstr ""
+
+#: ../../english/releases/arches.data:26
+msgid "IBM System z"
+msgstr ""
+
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr ""
diff --git a/esperanto/po/doc.eo.po b/esperanto/po/doc.eo.po
index 20c3e6eda76..f536abefb79 100644
--- a/esperanto/po/doc.eo.po
+++ b/esperanto/po/doc.eo.po
@@ -9,7 +9,24 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-3\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,69 +338,95 @@ msgstr ""
msgid "Publisher:"
msgstr ""
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr ""
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr ""
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr ""
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr ""
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr ""
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr ""
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr ""
-#: ../../english/doc/manuals.defs:133 ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr ""
-#. 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 ""
+"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 ""
+
+#: ../../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 ""
-"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://packages.debian.org/git\">Git</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:158
+#: ../../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"
" and check out the <kbd>boot-floppies/documentation</kbd> module."
msgstr ""
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr ""
-#: ../../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 ""
-#: ../../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 ""
diff --git a/esperanto/po/newsevents.eo.po b/esperanto/po/newsevents.eo.po
index 04d26fd1ff2..375ef9d9393 100644
--- a/esperanto/po/newsevents.eo.po
+++ b/esperanto/po/newsevents.eo.po
@@ -27,27 +27,27 @@ msgstr ""
msgid "The newsletter for the Debian community"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr ""
@@ -336,8 +336,8 @@ msgstr ""
#: ../../english/template/debian/projectnews/footer.wml:6
#, fuzzy
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 ""
" <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
"<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
@@ -476,3 +476,13 @@ msgid ""
msgstr ""
"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
"\">Joey Hess</a>."
+
+#, fuzzy
+#~ 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 ""
+#~ " <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
+#~ "<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
+#~ "novaĵleteron ĉiusemajne en via poŝtkesto."
diff --git a/esperanto/po/organization.eo.po b/esperanto/po/organization.eo.po
index 0af1238050f..b461a86400e 100644
--- a/esperanto/po/organization.eo.po
+++ b/esperanto/po/organization.eo.po
@@ -71,7 +71,7 @@ msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr ""
@@ -81,11 +81,11 @@ msgid "Publicity"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr ""
-#. 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 ""
msgid "Technical Committee"
msgstr ""
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr ""
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr ""
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr ""
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr ""
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr ""
@@ -218,159 +218,152 @@ msgstr ""
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr ""
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr ""
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr ""
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr ""
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr ""
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr ""
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr ""
-#: ../../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."
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr ""
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr ""
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr ""
diff --git a/esperanto/po/others.eo.po b/esperanto/po/others.eo.po
index 53a782f930e..22a8d9a42ce 100644
--- a/esperanto/po/others.eo.po
+++ b/esperanto/po/others.eo.po
@@ -156,26 +156,6 @@ msgstr ""
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr ""
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr ""
@@ -220,22 +200,34 @@ msgstr ""
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr ""
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
msgstr ""
+#: ../../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 ""
diff --git a/esperanto/po/templates.eo.po b/esperanto/po/templates.eo.po
index 9c9ea96271d..e51788a1466 100644
--- a/esperanto/po/templates.eo.po
+++ b/esperanto/po/templates.eo.po
@@ -66,7 +66,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Reen al la <a href=\"m4_HOME/\">Debiana Projekta hejmpaĝo</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 "Hejmen"
@@ -107,7 +107,7 @@ msgid "Support"
msgstr "Ĝenerala helpo"
#: ../../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 "Angulo de disvolvantoj"
@@ -144,7 +144,7 @@ msgid "Miscellaneous"
msgstr "Aliaj kategorioj"
#: ../../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 "Akiri Debian"
@@ -199,7 +199,7 @@ msgstr "en livero 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -218,25 +218,25 @@ msgstr ""
"\">debian-www@lists.debian.org</a>. Pli da informoj pri kiel kontakti nin "
"troviĝas en la Debiana <a href=\"m4_HOME/contact\">paĝo pri kontakto</a>."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Laste modifita"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Kopirajto"
-#: ../../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> kaj aliaj;"
-#: ../../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 ""
"Legu la <a href=\"m4_HOME/license\" rel=\"copyright\">permesilajn kondiĉojn</"
"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."
@@ -298,140 +298,152 @@ msgid "Debian Books"
msgstr "Libroj pri Debian"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "Helpu Debianon"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Retpoŝtlistaj Arĥivoj"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Retpoŝtaj Listoj"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Socia kontrakto"
-#: ../../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 "Viziti aŭspicianton"
-#: ../../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 - la universala mastruma sistemo"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Datumbazo de disvolvantoj"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Help Debian"
msgid "Debian FAQ"
msgstr "Helpu Debianon"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Manlibro pri politiko de Debiano"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Referencoj de&nbsp;disvolvantoj"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Nova manlibro por pakzorgistoj"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Cimoj kiuj malebligas liveron"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Raportoj de Lintian"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Arĥivoj de la dissendolistoj de uzantoj"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Arĥivoj de la dissendolistoj de disvolvantoj"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Arĥivoj de la dissendolistoj de i18n/l10n"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Arĥivoj de la dissendolistoj de portado"
-#: ../../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 "Arĥivoj de la dissendolistoj de sistemo de spurado de cimoj"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Arĥivoj de la dissendolistoj de aliaj aferoj"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Libera programaro"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Disvolvado"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Helpi Debianon"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Cimraportoj"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Portadoj/Arĥitekturoj"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Manlibro pri instalado"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Vendistoj de KD"
-#: ../../english/template/debian/links.tags.wml:122
-msgid "CD ISO images"
+#: ../../english/template/debian/links.tags.wml:128
+#, fuzzy
+#| msgid "CD ISO images"
+msgid "CD/USB ISO images"
msgstr "KD kun bildoj ISO"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Reta instalado"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Antaŭinstalita"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Projekto Debian-Edu"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "Certigado de kvalito"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Sistemo de spurado de pakoj"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Superrigardo de pakoj de disvolvantoj de Debian"
@@ -514,163 +526,119 @@ msgstr ""
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Reen al la <a href=\"./\">paĝo pri Kiu uzas Debian</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "Listo de Konsultantoj"
-
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Reen al la <a href=\"./\">Paĝo de konsultantoj de Debian</a>."
-
-#~ msgid "Download with Jigdo"
-#~ msgstr "Elŝuti per Jigdo"
-
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Elŝuti per HTTP/FTP"
-
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Aĉeti KD-jn aŭ DVD-jn"
-
-#~ msgid "Network Install"
-#~ msgstr "Perreta instalado"
-
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Elŝuti"
-
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Alispeciaj"
-
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Artaĵoj"
-
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Spegulado"
-
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Speguloj de rsync"
-
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Elŝuti per Torrent"
+#~ msgid "Select a server near you"
+#~ msgstr "Elektu servilon proksiman"
-#~ msgid "Debian CD team"
-#~ msgstr "Debiana teamo pri KD"
+#~ msgid "More information:"
+#~ msgstr "Pli da informo:"
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Donacoj"
+#~ msgid "Taken by:"
+#~ msgstr "Prenita de"
-#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "proponita"
+#~ msgid "Nobody"
+#~ msgstr "Neniu"
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Diskutata"
+#~ msgid "Rating:"
+#~ msgstr "Poentoj"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Esperanta&nbsp;je&nbsp;Aŭspiciantoj"
+#~ msgid "More information"
+#~ msgstr "Pli da informo"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Diskutata"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Venontaj Aferoj"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Voĉdono&nbsp;Malfermita"
+#~ msgid "link may no longer be valid"
+#~ msgstr "eble la ligo ne plu estas valida"
-#~ msgid "Decided"
-#~ msgstr "Decidita"
+#~ msgid "When"
+#~ msgstr "Kiam"
-#~ msgid "Other"
-#~ msgstr "Alia"
+#~ msgid "Where"
+#~ msgstr "Kie"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Hejma&nbsp;Voĉdona&nbsp;Paĝo"
+#~ msgid "More Info"
+#~ msgstr "Pli da informo"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Kiel&nbsp;Fari"
+#~ msgid "Debian Involvement"
+#~ msgstr "Partopreno de Debiano"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Sendi&nbsp;Proponon"
+#~ msgid "Main Coordinator"
+#~ msgstr "Ĉefa Kunordiganto"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Modifi&nbsp;Proponon"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Projekto</th><th>Kunordiganto</th>"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Sekvi&nbsp;Proponon"
+#~ msgid "Related Links"
+#~ msgstr "Rilataj Ligoj"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Legi&nbsp;Rezulton"
+#~ msgid "Latest News"
+#~ msgstr "Lastaj Novaĵoj"
-#~ msgid "Vote"
-#~ msgstr "Voĉdono"
+#, fuzzy
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "Reen al la <a href=\"m4_HOME/\">Debiana Projekta hejmpaĝo</a>."
+#, fuzzy
#~ 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 ""
-#~ "Legu la <a href=\"m4_HOME/contact\">debianan kontaktpaĝon</a> por scii "
-#~ "kiel kontakti nin."
-
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (malĝusta ligo)"
-
-#~ msgid "Vulnerable"
-#~ msgstr "Koncernebla"
+#~ " <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
+#~ "<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
+#~ "novaĵleteron ĉiusemajne en via poŝtkesto."
-#~ msgid "Fixed in"
-#~ msgstr "Solvita je"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "<a href=\"../../\">Antaŭaj ekzempleroj</a> de tiu ĉi novaĵletero estas "
+#~ "haveblaj."
#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
-#~ msgid "discussed"
-#~ msgstr "diskutita"
-
-#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "neniu"
-
-#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Pli da informo"
-
-#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Pakoj Koncernataj"
-
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />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 ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</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=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
#, fuzzy
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Reen al la <a href=\"./\">Paĝo de konsultantoj de Debian</a>."
+
+#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
#~ msgstr ""
-#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ " <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
+#~ "<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
+#~ "novaĵleteron ĉiusemajne en via poŝtkesto."
#, fuzzy
#~ msgid ""
@@ -682,114 +650,158 @@ msgstr "Reen al la <a href=\"./\">paĝo pri Kiu uzas Debian</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>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ " <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
-#~ "<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
-#~ "novaĵleteron ĉiusemajne en via poŝtkesto."
-
-#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Reen al la <a href=\"./\">Paĝo de konsultantoj de Debian</a>."
+#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</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=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</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=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
#, fuzzy
+#~ msgid "No Requested packages"
+#~ msgstr "Pakoj Koncernataj"
+
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "Pli da informo"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "neniu"
+
+#~ msgid "discussed"
+#~ msgstr "diskutita"
+
+#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
#~ msgstr ""
#~ "<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
#~ "\">Joey Hess</a>."
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "<a href=\"../../\">Antaŭaj ekzempleroj</a> de tiu ĉi novaĵletero estas "
-#~ "haveblaj."
+#~ msgid "Fixed in"
+#~ msgstr "Solvita je"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Koncernebla"
+
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (malĝusta ligo)"
-#, fuzzy
#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
#~ msgstr ""
-#~ " <a href=\"m4_HOME/MailingLists/subscribe#debian-news\">Aliĝu</a> al la "
-#~ "<i>debian-news</i> retpoŝta dissendolisto kaj vi ricevos tiun ĉi "
-#~ "novaĵleteron ĉiusemajne en via poŝtkesto."
+#~ "Legu la <a href=\"m4_HOME/contact\">debianan kontaktpaĝon</a> por scii "
+#~ "kiel kontakti nin."
-#, fuzzy
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "Reen al la <a href=\"m4_HOME/\">Debiana Projekta hejmpaĝo</a>."
+#~ msgid "Vote"
+#~ msgstr "Voĉdono"
-#~ msgid "Latest News"
-#~ msgstr "Lastaj Novaĵoj"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Legi&nbsp;Rezulton"
-#~ msgid "Related Links"
-#~ msgstr "Rilataj Ligoj"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Sekvi&nbsp;Proponon"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Projekto</th><th>Kunordiganto</th>"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Modifi&nbsp;Proponon"
-#~ msgid "Main Coordinator"
-#~ msgstr "Ĉefa Kunordiganto"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Sendi&nbsp;Proponon"
-#~ msgid "Debian Involvement"
-#~ msgstr "Partopreno de Debiano"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kiel&nbsp;Fari"
-#~ msgid "More Info"
-#~ msgstr "Pli da informo"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Hejma&nbsp;Voĉdona&nbsp;Paĝo"
-#~ msgid "Where"
-#~ msgstr "Kie"
+#~ msgid "Other"
+#~ msgstr "Alia"
-#~ msgid "When"
-#~ msgstr "Kiam"
+#~ msgid "Decided"
+#~ msgstr "Decidita"
-#~ msgid "link may no longer be valid"
-#~ msgstr "eble la ligo ne plu estas valida"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Voĉdono&nbsp;Malfermita"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Venontaj Aferoj"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Diskutata"
-#~ msgid "More information"
-#~ msgstr "Pli da informo"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Esperanta&nbsp;je&nbsp;Aŭspiciantoj"
-#~ msgid "Rating:"
-#~ msgstr "Poentoj"
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "Diskutata"
-#~ msgid "Nobody"
-#~ msgstr "Neniu"
+#, fuzzy
+#~ msgid "Proposer"
+#~ msgstr "proponita"
-#~ msgid "Taken by:"
-#~ msgstr "Prenita de"
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Donacoj"
-#~ msgid "More information:"
-#~ msgstr "Pli da informo:"
+#~ msgid "Debian CD team"
+#~ msgstr "Debiana teamo pri KD"
-#~ msgid "Select a server near you"
-#~ msgstr "Elektu servilon proksiman"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Elŝuti per Torrent"
+
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Speguloj de rsync"
+
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Spegulado"
+
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Artaĵoj"
+
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Alispeciaj"
+
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Elŝuti"
+
+#~ msgid "Network Install"
+#~ msgstr "Perreta instalado"
+
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Aĉeti KD-jn aŭ DVD-jn"
+
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Elŝuti per HTTP/FTP"
+
+#~ msgid "Download with Jigdo"
+#~ msgstr "Elŝuti per Jigdo"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Reen al la <a href=\"./\">Paĝo de konsultantoj de Debian</a>."
+
+#~ msgid "List of Consultants"
+#~ msgstr "Listo de Konsultantoj"
diff --git a/esperanto/po/vendors.eo.po b/esperanto/po/vendors.eo.po
index 0c22917df95..4134ac05f26 100644
--- a/esperanto/po/vendors.eo.po
+++ b/esperanto/po/vendors.eo.po
@@ -9,92 +9,56 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-3\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr ""
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr ""
#. ###################
#. 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 ""
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr ""
diff --git a/esperanto/po/vote.eo.po b/esperanto/po/vote.eo.po
index 800b96488d3..ac570d0d35e 100644
--- a/esperanto/po/vote.eo.po
+++ b/esperanto/po/vote.eo.po
@@ -18,232 +18,248 @@ msgid "Time Line"
msgstr ""
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
#, fuzzy
msgid "Nominations"
msgstr "Donacoj"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr ""
-#: ../../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 "proponita"
-#: ../../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 "Diskutata"
-#: ../../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 "Esperanta&nbsp;je&nbsp;Aŭspiciantoj"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Diskutata"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Voĉdono&nbsp;Malfermita"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Decidita"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Alia"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Hejma&nbsp;Voĉdona&nbsp;Paĝo"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Kiel&nbsp;Fari"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Sendi&nbsp;Proponon"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Modifi&nbsp;Proponon"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Sekvi&nbsp;Proponon"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Legi&nbsp;Rezulton"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Voĉdono"
diff --git a/finnish/po/bugs.fi.po b/finnish/po/bugs.fi.po
index 3928a9e54c6..3bdb47141ee 100644
--- a/finnish/po/bugs.fi.po
+++ b/finnish/po/bugs.fi.po
@@ -155,155 +155,155 @@ msgstr "arkistoidut"
msgid "Archived and Unarchived"
msgstr "arkistoidut sekä arkistoimattomat"
-#~ msgid "Flags:"
-#~ msgstr "Liput:"
+#~ msgid "Exclude tag:"
+#~ msgstr "Älä sisällytä määrettä: "
-#~ msgid "active bugs"
-#~ msgstr "aktiiviset viat"
+#~ msgid "Include tag:"
+#~ msgstr "Sisällytä määre: "
-#~ msgid "display merged bugs only once"
-#~ msgstr "näytä yhdistetyt viat vain kerran"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ei järjestystä tilan tai vakavuuden perusteella"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "ei sisällysluetteloa yläotsakkeeseen"
+#~ msgid "wontfix"
+#~ msgstr "ei korjata"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "ei yhteenvetoa alaotsakkeeseen"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "proposed-updates"
-#~ msgstr "ehdotetut päivitykset"
+#~ msgid "unreproducible"
+#~ msgstr "ei toistettavissa"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testattava - ehdotetut päivitykset"
+#~ msgid "security"
+#~ msgstr "tietoturva"
-#~ msgid "Package version:"
-#~ msgstr "Paketin versio:"
+#~ msgid "patch"
+#~ msgstr "paikkaus"
-#~ msgid "Distribution:"
-#~ msgstr "Jakelu:"
+#~ msgid "moreinfo"
+#~ msgstr "lisätietoja"
-#~ msgid "bugs"
-#~ msgstr "viat"
+#~ msgid "l10n"
+#~ msgstr "lokalisointi"
-#~ msgid "open"
-#~ msgstr "avoin"
+#~ msgid "help"
+#~ msgstr "apua"
-#~ msgid "forwarded"
-#~ msgstr "siirretty eteenpäin"
+#~ msgid "fixed-upstream"
+#~ msgstr "korjattu-upstream"
-#~ msgid "pending"
-#~ msgstr "ratkaisematon"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "korjattu-experimentalissa"
-#~ msgid "fixed"
-#~ msgstr "korjattu"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "done"
-#~ msgstr "valmis"
+#~ msgid "confirmed"
+#~ msgstr "vahvistettu"
-#~ msgid "Include status:"
-#~ msgstr "Sisällytä tila: "
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "Exclude status:"
-#~ msgstr "Älä sisällytä tilaa: "
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-älävälitä"
-#~ msgid "critical"
-#~ msgstr "kriittinen"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "grave"
-#~ msgstr "haudanvakava"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-älävälitä"
-#~ msgid "serious"
-#~ msgstr "vakava"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "important"
-#~ msgstr "tärkeä"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-älävälitä"
-#~ msgid "minor"
-#~ msgstr "vähäpätöinen"
+#~ msgid "sarge"
+#~ msgstr "sarge"
-#~ msgid "wishlist"
-#~ msgstr "toive"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "Include severity:"
-#~ msgstr "Sisällytä vakavuus: "
+#~ msgid "potato"
+#~ msgstr "potato"
#~ msgid "Exclude severity:"
#~ msgstr "Älä sisällytä vakavuutta: "
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Sisällytä vakavuus: "
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "toive"
-#~ msgid "sarge"
-#~ msgstr "sarge"
+#~ msgid "minor"
+#~ msgstr "vähäpätöinen"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-älävälitä"
+#~ msgid "important"
+#~ msgstr "tärkeä"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "serious"
+#~ msgstr "vakava"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-älävälitä"
+#~ msgid "grave"
+#~ msgstr "haudanvakava"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "critical"
+#~ msgstr "kriittinen"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-älävälitä"
+#~ msgid "Exclude status:"
+#~ msgstr "Älä sisällytä tilaa: "
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Include status:"
+#~ msgstr "Sisällytä tila: "
-#~ msgid "confirmed"
-#~ msgstr "vahvistettu"
+#~ msgid "done"
+#~ msgstr "valmis"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "fixed"
+#~ msgstr "korjattu"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "korjattu-experimentalissa"
+#~ msgid "pending"
+#~ msgstr "ratkaisematon"
-#~ msgid "fixed-upstream"
-#~ msgstr "korjattu-upstream"
+#~ msgid "forwarded"
+#~ msgstr "siirretty eteenpäin"
-#~ msgid "help"
-#~ msgstr "apua"
+#~ msgid "open"
+#~ msgstr "avoin"
-#~ msgid "l10n"
-#~ msgstr "lokalisointi"
+#~ msgid "bugs"
+#~ msgstr "viat"
-#~ msgid "moreinfo"
-#~ msgstr "lisätietoja"
+#~ msgid "Distribution:"
+#~ msgstr "Jakelu:"
-#~ msgid "patch"
-#~ msgstr "paikkaus"
+#~ msgid "Package version:"
+#~ msgstr "Paketin versio:"
-#~ msgid "security"
-#~ msgstr "tietoturva"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testattava - ehdotetut päivitykset"
-#~ msgid "unreproducible"
-#~ msgstr "ei toistettavissa"
+#~ msgid "proposed-updates"
+#~ msgstr "ehdotetut päivitykset"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "ei yhteenvetoa alaotsakkeeseen"
-#~ msgid "wontfix"
-#~ msgstr "ei korjata"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "ei sisällysluetteloa yläotsakkeeseen"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ei järjestystä tilan tai vakavuuden perusteella"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "display merged bugs only once"
+#~ msgstr "näytä yhdistetyt viat vain kerran"
-#~ msgid "Include tag:"
-#~ msgstr "Sisällytä määre: "
+#~ msgid "active bugs"
+#~ msgstr "aktiiviset viat"
-#~ msgid "Exclude tag:"
-#~ msgstr "Älä sisällytä määrettä: "
+#~ msgid "Flags:"
+#~ msgstr "Liput:"
diff --git a/finnish/po/cdimage.fi.po b/finnish/po/cdimage.fi.po
index 4b325f78c22..fe8f396c969 100644
--- a/finnish/po/cdimage.fi.po
+++ b/finnish/po/cdimage.fi.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 " Key fingerprint"
-#: ../../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/finnish/po/countries.fi.po b/finnish/po/countries.fi.po
index 21d43231550..d5415ad1b6f 100644
--- a/finnish/po/countries.fi.po
+++ b/finnish/po/countries.fi.po
@@ -421,8 +421,8 @@ msgstr "Etelä-Afrikka"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#~ msgid "Great Britain"
-#~ msgstr "Iso-Britannia"
-
#~ msgid "Yugoslavia"
#~ msgstr "Jugoslavia"
+
+#~ msgid "Great Britain"
+#~ msgstr "Iso-Britannia"
diff --git a/finnish/po/distrib.fi.po b/finnish/po/distrib.fi.po
index 3e6597da12a..fa2c69b622f 100644
--- a/finnish/po/distrib.fi.po
+++ b/finnish/po/distrib.fi.po
@@ -129,112 +129,122 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
+#, fuzzy
+#| msgid "64-bit PC (amd64)"
+msgid "64-bit ARM (AArch64)"
+msgstr "64-bittinen 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-bittinen PC (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr "32-bittinen 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-bittinen PC (i386)"
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr "kFreeBSD 64-bittinen 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 "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "Search case sensitive"
-#~ msgstr "Kirjainkoosta riippumaton haku"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Salli haku myös sanan osista"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "yes"
-#~ msgstr "kyllä"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "no"
-#~ msgstr "ei"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "Case sensitive"
-#~ msgstr "Kirjainkoosta riippuva haku"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "paketit joista löytyy tämän nimisiä tiedostoja tai hakemistoja"
#~ msgid "all files in this package"
#~ msgstr "kaikki tämän paketin tiedostot"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "paketit joista löytyy tämän nimisiä tiedostoja tai hakemistoja"
+#~ msgid "Case sensitive"
+#~ msgstr "Kirjainkoosta riippuva haku"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "no"
+#~ msgstr "ei"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "yes"
+#~ msgstr "kyllä"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Salli haku myös sanan osista"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "Search case sensitive"
+#~ msgstr "Kirjainkoosta riippumaton haku"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
diff --git a/finnish/po/doc.fi.po b/finnish/po/doc.fi.po
index 42c936cb626..c2c0788b913 100644
--- a/finnish/po/doc.fi.po
+++ b/finnish/po/doc.fi.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"
@@ -39,15 +56,15 @@ msgstr ""
" asentamisen ja ylläpidon perusteita (kotona, töissä, yhdistyksissä tai\n"
" koulussa)."
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "Sarge-CD asennusohjelman kera ja valikoitu pakettilajitelma"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "Knoppix-live-CD"
-#: ../../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"
@@ -62,13 +79,13 @@ msgstr ""
" Debian-projektista ja laajan katsauksen Debianin ainutlaatuiseen\n"
" paketinhallintajärjestelmään."
-#: ../../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 "virallinen Debian GNU/Linux 3.1r0a \"sarge\" -DVD (i386)"
-#: ../../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"
@@ -96,7 +113,7 @@ msgstr ""
" Linuxin perusteita käsittelevän kirjallisuuden rinnalla\n"
" kartutettaessa Linux-kokemuksia Debianin filosofian mukaisesti."
-#: ../../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 -- "
@@ -112,11 +129,11 @@ msgstr ""
" verkkoasioihin. Samoin kuin ohjelmisto josta kirja kertoo on kirjakin\n"
" copyleft-lisensoitu ja saatavissa lähdetietojen muodossa."
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
msgid "Debian 2.2 ARM architecture"
msgstr "Debian 2.2 ARM-arkkitehtuurille"
-#: ../../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, "
@@ -147,7 +164,7 @@ msgstr ""
" vahvasti Debian-ARMiin ja oletettavasti työskentelet tässä jakelussa\n"
" ja hyvällä lykyllä Debian-pohjaisella isäntäkoneella myös."
-#: ../../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"
@@ -160,11 +177,11 @@ msgstr ""
" jännittävään tietokoneiden maailman oppaanaan Bill McCartyn\n"
" <q>Learning Debian GNU/Linux</q>."
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
msgid "Debian 2.1"
msgstr "Debian 2.1"
-#: ../../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"
@@ -176,11 +193,11 @@ msgstr ""
" graafisen käyttöliittymän, työpöytäjulkaisun, liikeasiat, hupijuttuja\n"
" ja multimediaa. 30 päivän ilmainen sähköpostituki sisältyy pakettiin."
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "DVD Debian Squeeze i386/amd64"
-#: ../../english/doc/books.data:166
+#: ../../english/doc/books.data:193
#, fuzzy
#| msgid ""
#| "The first French book about Debian is already in its fifth edition. It\n"
@@ -212,28 +229,27 @@ msgstr ""
" Debian-työkalujen käyttötaitojen kehittämiseen sekä ylläpitäjiä, jotka\n"
" haluavat rakentaa luotettavan verkon Debianin varaan."
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "2 versiota: Yksi ilman DVD:tä ja toinen kahdella DVD:llä (i386)"
-#: ../../english/doc/books.data:208
-msgid ""
-"An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-"mode=viewone&amp;titnr=254925022\">\n"
-" publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-"29.95\n"
-" euro (as of 2008)."
-msgstr ""
-"Vaihtoehtoinen <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-"mode=viewone&amp;titnr=254925022\">\n"
-" julkaisu</a> on saatavilla Lehmannin kirjakaupasta ja hintaa sillä on\n"
-" 29,95&nbsp;&euro; (vuonna 2008)."
-
-#: ../../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 "
@@ -242,7 +258,7 @@ 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)"
@@ -250,7 +266,7 @@ msgstr ""
"2 versiota: Yksi ilman romppua ja toinen sisältäen Virallisen rompun (i386, "
"contrib ja lähdekoodit)"
-#: ../../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"
@@ -279,11 +295,11 @@ msgstr ""
" asioilla kuten soittosarjareitittimen tai tiedostopalvelimen\n"
" windows-pohjaisille asiakkaille (Samba) suunnittelu ja pystyttäminen."
-#: ../../english/doc/books.data:295
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "Debian GNU/Linux 3.1 Sarge -asennuslevy (yksi CD)"
-#: ../../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"
@@ -293,13 +309,13 @@ msgstr ""
" ja kokeneemmille käyttäjille suunnattuja vinkkejä; eri asennustavat,\n"
" työpöydän mukautus, ongelmanratkaisu, tietotaidon hyödyntäminen jne."
-#: ../../english/doc/books.data:311
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
msgstr "Debian GNU/Linux 3.1r0 i386, kirjoittajan versio (DVD + CD)"
-#: ../../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"
@@ -319,11 +335,11 @@ msgstr ""
" työpöytääsi. Kirja soveltunee kaikille Debian-käyttäjille aloittelijoista\n"
" aina edistyneempiin käyttäjiin."
-#: ../../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"
@@ -338,11 +354,11 @@ msgstr ""
" Voit asentaa ja ottaa käyttöön Debian GNU/Linuxin japanilaisessa\n"
" ympäristössä helposti kustomoitujen CD:iden avulla."
-#: ../../english/doc/books.data:349
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "1 epävirallinen Woody, 3 Potato rev0"
-#: ../../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 "
@@ -360,11 +376,11 @@ msgstr ""
" myöskin ylläpitäjän oppaan, joka houkuttelee ihmisiä Koreasta\n"
" osallistumaan Debianin kehittämiseen."
-#: ../../english/doc/books.data:366
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr "Kolme virallista v2.2r3 romppua ja epävirallinen woodyn romppu"
-#: ../../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"
@@ -382,11 +398,11 @@ msgstr ""
" käteviä vihjeitä koreankielisen ympäristön pystyttämiseen\n"
" Debian-järjestelmään ja on hyvä uusille Debian-käyttäjille."
-#: ../../english/doc/books.data:391
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "Debian GNU/Linux 3.1r0 CD1"
-#: ../../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"
@@ -400,7 +416,7 @@ msgstr ""
" alkuunpääsemisessä Debianin tehokkaaseen\n"
" paketinhallintajärjestelmässä."
-#: ../../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 "
@@ -428,7 +444,7 @@ msgstr ""
" jokaiselle, joka haluaa oppia GNU/Linuxin syvällisesti. Tämä kirja\n"
" käsittelee Debian Sargea."
-#: ../../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 "
@@ -458,49 +474,73 @@ msgstr "mukana CD:"
msgid "Publisher:"
msgstr "Julkaisija:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Kirjoittajat:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Toimittajat:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Ylläpitäjä:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "Tila:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "Saatavuus:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "Viimeisin versio:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(versio <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 "teksti"
-#. 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 ""
-"Hae SGML-lähdeteksti <get-var ddp_pkg_loc />-paketille <a href=\"cvs\">SVN</"
-"a>:llä."
-#: ../../english/doc/manuals.defs:158
+#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
+#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+msgid "Web interface: "
+msgstr ""
+
+#: ../../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"
@@ -510,25 +550,44 @@ msgstr ""
"ext:<var>käyttäjätunnus</var>@cvs.debian.org:/cvs/debian-boot</kbd> ja "
"tarkista (check out) <kbd>boot-floppies/documentation</kbd>-moduuli."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "Tutki CVS-moduulia selaimella"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Debian-paketti"
-#: ../../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 "Debian-paketti (arkistoitu)"
-#: ../../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 "Kieli:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Hae SGML-lähdeteksti <get-var ddp_pkg_loc />-paketille <a href=\"cvs"
+#~ "\">SVN</a>:llä."
+
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "Vaihtoehtoinen <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " julkaisu</a> on saatavilla Lehmannin kirjakaupasta ja hintaa sillä on\n"
+#~ " 29,95&nbsp;&euro; (vuonna 2008)."
diff --git a/finnish/po/l10n.fi.po b/finnish/po/l10n.fi.po
index b22cd1c672d..b70eae8f474 100644
--- a/finnish/po/l10n.fi.po
+++ b/finnish/po/l10n.fi.po
@@ -95,8 +95,8 @@ msgstr "POT-tiedostot"
msgid "Hints for translators"
msgstr "Vinkkejä kääntäjille"
-#~ msgid "Translated templates"
-#~ msgstr "Käännetyt mallit"
-
#~ msgid "Original templates"
#~ msgstr "Alkuperäiset mallit"
+
+#~ msgid "Translated templates"
+#~ msgstr "Käännetyt mallit"
diff --git a/finnish/po/mailinglists.fi.po b/finnish/po/mailinglists.fi.po
index 629ef9970a3..471ae2b07a4 100644
--- a/finnish/po/mailinglists.fi.po
+++ b/finnish/po/mailinglists.fi.po
@@ -122,8 +122,8 @@ msgstr "avoin"
msgid "closed"
msgstr "suljettu"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Valitse listat joilta haluat pois:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Valitse listat joille haluat liittyä:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Valitse listat joilta haluat pois:"
diff --git a/finnish/po/newsevents.fi.po b/finnish/po/newsevents.fi.po
index 245965bb2a4..f76f0d6be6c 100644
--- a/finnish/po/newsevents.fi.po
+++ b/finnish/po/newsevents.fi.po
@@ -25,27 +25,27 @@ msgstr "s. <get-var page />"
msgid "The newsletter for the Debian community"
msgstr "Uutiskirje Debian-yhteisölle"
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr "Nimi:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "Sähköposti:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Aiemmat puheet:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Kielet:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Sijainti:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Aiheet:"
@@ -333,12 +333,17 @@ 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 ""
-"Saadaksesi tämän uutiskirjeen joka toinen viikko postilaatikkoosi, <a href="
-"\"https://lists.debian.org/debian-news/\">liity debian-news-postilistalle</a>."
+"Saadaksesi tämän uutiskirjeen viikottain postilaatikkoosi, <a href=\"https://"
+"lists.debian.org/debian-news/\">liity debian-news-postilistalle</a>."
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
@@ -459,3 +464,12 @@ msgid ""
msgstr ""
"Debianin viikkokatsausta toimittavat <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 ""
+#~ "Saadaksesi tämän uutiskirjeen joka toinen viikko postilaatikkoosi, <a "
+#~ "href=\"https://lists.debian.org/debian-news/\">liity debian-news-"
+#~ "postilistalle</a>."
diff --git a/finnish/po/organization.fi.po b/finnish/po/organization.fi.po
index 7ce647d5ee0..23cfdd0ed24 100644
--- a/finnish/po/organization.fi.po
+++ b/finnish/po/organization.fi.po
@@ -71,7 +71,7 @@ msgid "Officers"
msgstr "Virkailijat"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Jakelu"
@@ -81,11 +81,11 @@ msgid "Publicity"
msgstr "Julkisuus"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Tuki ja infrastruktuuri"
-#. 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 "Debianin puhtaat sekoitukset"
@@ -98,101 +98,101 @@ msgstr "Päällikkö"
msgid "Technical Committee"
msgstr "Tekninen komitea"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "sihteeri"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Kehitysprojektit"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP-arkistot"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP-hallinto"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "FTP-avustajat"
-#: ../../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 "Takaisinsiirrokset"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Takaisinsiirrosryhmä"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Yksittäiset paketit"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Versiohallinto"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Julkaisuryhmä"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Laadunvalvonta"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Käynnistyslevykkeet"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Julkistusmuistio"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD-raakakopiot"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Tuotanto"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Testaus"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Automattikääntäjien infrastruktuuri"
-#: ../../english/intro/organization.data:140
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Wanna-build-ryhmä"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Buildd-ylläpito"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Dokumentointi"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "WNPP-luettelo"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Live System -ryhmä"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Siirrokset"
@@ -220,83 +220,75 @@ msgstr "Lehdistösihteeri"
msgid "Partner Program"
msgstr "Kumppaniohjelma"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Tapahtumat"
-#: ../../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 "Käyttäjätuki"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Vianhallintajärjestelmä"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Postituslistojen hallinto ja arkistointi"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Uusien ylläpitäjien vastaanotto"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Debian-käyttäjätunnuksien hallinta"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Avainrenkaan ylläpitäjät (PGP ja 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-ylläpitäjien avainrengastiimi"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Tietoturvatiimi"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "Testattavan tietoturvatiimi"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Tietoturvatarkistus-projekti"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "WWW-sivusto"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Konsulttisivut"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "CD-jälleenmyyjien sivut"
-#: ../../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 "Linja"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Järjestelmäylläpito"
-#: ../../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."
@@ -305,7 +297,7 @@ msgstr ""
"kanssa tulee ongelmia esimerkiksi salasanojen kanssa, tai jos sinun pitää "
"saada asennettua ohjelmapaketti."
-#: ../../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 "
@@ -315,122 +307,116 @@ msgstr ""
"debian.org/machines.cgi\">Debianin koneet</a> -sivu, siellä pitäisi olla "
"kunkin koneen ylläpitäjän yhteystiedot."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP-kehittäjähakemiston ylläpito"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Ohjelmistopeilaukset"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Nimipalveluvastaavat"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Pakettiseurantajärjestelmä"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Laitteistolahjoitusten koordinointi"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Tilintarkastaja"
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Alioth-ylläpitäjät"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Debian Women -projekti"
-#: ../../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 lapsille (1-99 v)"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian terveydenhuollossa"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian oppilaitoksille"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian lakitoimistoille"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian toimintarajoitteisille henkilöille"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian terveydenhuollossa"
-#~ msgid "Vendors"
-#~ msgstr "Jälleenmyyjät"
+#~ msgid "Volatile Team"
+#~ msgstr "Volatile-ryhmä"
-#~ msgid "Handhelds"
-#~ msgstr "Kämmenlaitteet"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (Ei aktiivinen: ei julkaistu squeezen kanssa)"
-#~ msgid "Marketing Team"
-#~ msgstr "Markkinointiryhmä"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Mukautetut Debian-jakelut"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Avainten allekirjoituskoordinointi"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Julkaisuryhmä \"vakaalle\""
-#~ 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 ""
-#~ "Kunkin arkkitehtuurin buildd-ylläpitäjät löytyvät osoitteesta "
-#~ "<genericemail arch@buildd.debian.org>, esim. <genericemail i386@buildd."
-#~ "debian.org>."
+#~ msgid "Accountant"
+#~ msgstr "Kirjanpitäjä"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Jokaisen buildd:n ylläpitäjän nimi löytyy myös sivustolta <a href="
-#~ "\"http://www.buildd.net\">http://www.buildd.net</a>. Valitsemalla "
-#~ "arkkitehtuurin ja jakelun näet käytössä olevat buildd:t ja niiden "
-#~ "ylläpitäjät."
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Kansainvälinen käyttöjärjestelmä pöytämikrossasi"
-#~ msgid "Release Assistants"
-#~ msgstr "Versioavustajat"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian voittoa tavoittelemattomille järjestöille"
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "Versioavustajat \"vakaalle\""
+#~ msgid "APT Team"
+#~ msgstr "APT-työryhmä"
-#~ msgid "Release Wizard"
-#~ msgstr "Versiojohtajat"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux yritysjärjestelmiin"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debian-multimediajakelu"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Asennusjärjestelmä \"vakaalle\""
+
+#~ msgid "Internal Projects"
+#~ msgstr "Sisäiset projektit"
+
+#~ msgid "Mailing List Archives"
+#~ msgstr "Postilista-arkistot"
#~ msgid ""
#~ "This is not yet an official Debian internal project but it has announced "
@@ -439,38 +425,51 @@ msgstr "Debian terveydenhuollossa"
#~ "Tämä ei ole vielä virallinen Debianin sisäinen projekti, mutta on "
#~ "ilmoittanut aikomuksensa integrointiin."
-#~ msgid "Mailing List Archives"
-#~ msgstr "Postilista-arkistot"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debian-multimediajakelu"
-#~ msgid "Internal Projects"
-#~ msgstr "Sisäiset projektit"
+#~ msgid "Release Wizard"
+#~ msgstr "Versiojohtajat"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Asennusjärjestelmä \"vakaalle\""
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "Versioavustajat \"vakaalle\""
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux yritysjärjestelmiin"
+#~ msgid "Release Assistants"
+#~ msgstr "Versioavustajat"
-#~ msgid "APT Team"
-#~ msgstr "APT-työryhmä"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Jokaisen buildd:n ylläpitäjän nimi löytyy myös sivustolta <a href="
+#~ "\"http://www.buildd.net\">http://www.buildd.net</a>. Valitsemalla "
+#~ "arkkitehtuurin ja jakelun näet käytössä olevat buildd:t ja niiden "
+#~ "ylläpitäjät."
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian voittoa tavoittelemattomille järjestöille"
+#~ 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 ""
+#~ "Kunkin arkkitehtuurin buildd-ylläpitäjät löytyvät osoitteesta "
+#~ "<genericemail arch@buildd.debian.org>, esim. <genericemail i386@buildd."
+#~ "debian.org>."
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Kansainvälinen käyttöjärjestelmä pöytämikrossasi"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Avainten allekirjoituskoordinointi"
-#~ msgid "Accountant"
-#~ msgstr "Kirjanpitäjä"
+#~ msgid "Marketing Team"
+#~ msgstr "Markkinointiryhmä"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Julkaisuryhmä \"vakaalle\""
+#~ msgid "Handhelds"
+#~ msgstr "Kämmenlaitteet"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Mukautetut Debian-jakelut"
+#~ msgid "Vendors"
+#~ msgstr "Jälleenmyyjät"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (Ei aktiivinen: ei julkaistu squeezen kanssa)"
+#~ msgid "Security Audit Project"
+#~ msgstr "Tietoturvatarkistus-projekti"
-#~ msgid "Volatile Team"
-#~ msgstr "Volatile-ryhmä"
+#~ msgid "Testing Security Team"
+#~ msgstr "Testattavan tietoturvatiimi"
diff --git a/finnish/po/others.fi.po b/finnish/po/others.fi.po
index 3ba5ffd01b3..6d9d1963974 100644
--- a/finnish/po/others.fi.po
+++ b/finnish/po/others.fi.po
@@ -168,26 +168,6 @@ msgstr "[Debian] (pieni logo)"
msgid "same as the above"
msgstr "sama kuin yllä"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Hinnat:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Kuka:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Arkkitehtuuri:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Tiedot:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Missä:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Tuotteet"
@@ -232,22 +212,34 @@ msgstr "pinssejä"
msgid "basketball goals"
msgstr "koripallotelineitä"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "korvarenkaita"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "matkalaukkuja"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr "sateenvarjoja"
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
msgstr "tyynyliinoja"
+#: ../../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 ""
@@ -323,78 +315,69 @@ msgstr "Versio"
msgid "URL"
msgstr "URL"
-#~ msgid "p<get-var page />"
-#~ msgstr "s. <get-var page />"
-
-#~ msgid "Previous Talks:"
-#~ msgstr "Aiemmat puheet:"
-
-#~ msgid "Languages:"
-#~ msgstr "Kielet:"
-
-#~ msgid "Location:"
-#~ msgstr "Sijainti:"
-
-#~ msgid "Topics:"
-#~ msgstr "Aiheet:"
+#~ msgid "Name:"
+#~ msgstr "Nimi:"
-#~ msgid "beta 4"
-#~ msgstr "beta 4"
+#~ msgid "Company:"
+#~ msgstr "Yritys:"
-#~ msgid "rc2"
-#~ msgstr "rc2"
+#~ msgid "URL:"
+#~ msgstr "WWW-sivut:"
-#~ msgid "rc3"
-#~ msgstr "rc3"
+#~ msgid "or"
+#~ msgstr "tai"
-#~ msgid "rc3 (broken)"
-#~ msgstr "rc3 (rikki)"
+#~ msgid "Email:"
+#~ msgstr "Sähköposti:"
-#~ msgid "closed"
-#~ msgstr "suljettu"
+#~ msgid "Rates:"
+#~ msgstr "Hinnat:"
-#~ msgid "open"
-#~ msgstr "avoin"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Valmis muuttamaan"
-#~ msgid "Unsubscribe"
-#~ msgstr "Poistu"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "Listattu yhteensä <total_consultant> Debian-konsulttia <total_country> "
+#~ "maassa maailmanlaajuisesti."
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Valitse listat joilta haluat pois:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Postilistoille liittyminen"
#~ 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. "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
-#~ "Katso <a href=\"./#subunsub\">postilista</a> -sivulta kuinka poistut "
-#~ "sähköpostitse. Listoille voi <a href=\"subscribe\">liittyä täyttämällä "
+#~ "Katso <a href=\"./#subunsub\">postilista</a> -sivulta kuinka liityt "
+#~ "sähköpostitse. Listoilta voi <a href=\"unsubscribe\">poistua täyttämällä "
#~ "www-lomakkeen</a>. "
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Postilistoilta poistuminen"
-
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
#~ msgstr ""
-#~ "Muistathan noudattaa <a href=\"./#ads\">Debianin postilistojen "
-#~ "mainostuslinjausta</a>."
-
-#~ msgid "Clear"
-#~ msgstr "Tyhjennä"
+#~ "Huomaa, että useimmat Debianin postilistoista ovat julkisia foorumeita. "
+#~ "Kaikki niille lähetetyt sähköpostit julkaistaan julkisessa postilista-"
+#~ "arkistossa ja hakukoneet indeksoivat ne. Liittyessäsi Debianin "
+#~ "postilistoille käytä vain sellaista sähköpostiosoitetta jonka "
+#~ "julkaisemisen hyväksyt."
-#~ msgid "Subscribe"
-#~ msgstr "Liity"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Valitse listat joille haluat liittyä:"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Sähköpostiosoitteesi:"
+#~ msgid "No description given"
+#~ msgstr "Kuvausta ei annettu"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "on ainoastaan luettavaksi, kokoelmaversio."
+#~ msgid "Moderated:"
+#~ msgstr "Moderoitu:"
-#~ msgid "Subscription:"
-#~ msgstr "Liittyminen:"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Viestien lähettäminen sallittu vain listalle liittyneille."
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -402,66 +385,90 @@ msgstr "URL"
#~ "Ainoastaan Debian-kehittäjän allekirjoittamat viestit hyväksytään "
#~ "listalle."
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Viestien lähettäminen sallittu vain listalle liittyneille."
+#~ msgid "Subscription:"
+#~ msgstr "Liittyminen:"
-#~ msgid "Moderated:"
-#~ msgstr "Moderoitu:"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "on ainoastaan luettavaksi, kokoelmaversio."
-#~ msgid "No description given"
-#~ msgstr "Kuvausta ei annettu"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Sähköpostiosoitteesi:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Valitse listat joille haluat liittyä:"
+#~ msgid "Subscribe"
+#~ msgstr "Liity"
+
+#~ msgid "Clear"
+#~ msgstr "Tyhjennä"
#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Huomaa, että useimmat Debianin postilistoista ovat julkisia foorumeita. "
-#~ "Kaikki niille lähetetyt sähköpostit julkaistaan julkisessa postilista-"
-#~ "arkistossa ja hakukoneet indeksoivat ne. Liittyessäsi Debianin "
-#~ "postilistoille käytä vain sellaista sähköpostiosoitetta jonka "
-#~ "julkaisemisen hyväksyt."
+#~ "Muistathan noudattaa <a href=\"./#ads\">Debianin postilistojen "
+#~ "mainostuslinjausta</a>."
+
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Postilistoilta poistuminen"
#~ 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 ""
-#~ "Katso <a href=\"./#subunsub\">postilista</a> -sivulta kuinka liityt "
-#~ "sähköpostitse. Listoilta voi <a href=\"unsubscribe\">poistua täyttämällä "
+#~ "Katso <a href=\"./#subunsub\">postilista</a> -sivulta kuinka poistut "
+#~ "sähköpostitse. Listoille voi <a href=\"subscribe\">liittyä täyttämällä "
#~ "www-lomakkeen</a>. "
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Postilistoille liittyminen"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Valitse listat joilta haluat pois:"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "Listattu yhteensä <total_consultant> Debian-konsulttia <total_country> "
-#~ "maassa maailmanlaajuisesti."
+#~ msgid "Unsubscribe"
+#~ msgstr "Poistu"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Valmis muuttamaan"
+#~ msgid "open"
+#~ msgstr "avoin"
-#~ msgid "Rates:"
-#~ msgstr "Hinnat:"
+#~ msgid "closed"
+#~ msgstr "suljettu"
-#~ msgid "Email:"
-#~ msgstr "Sähköposti:"
+#~ msgid "rc3 (broken)"
+#~ msgstr "rc3 (rikki)"
-#~ msgid "or"
-#~ msgstr "tai"
+#~ msgid "rc3"
+#~ msgstr "rc3"
-#~ msgid "URL:"
-#~ msgstr "WWW-sivut:"
+#~ msgid "rc2"
+#~ msgstr "rc2"
-#~ msgid "Company:"
-#~ msgstr "Yritys:"
+#~ msgid "beta 4"
+#~ msgstr "beta 4"
-#~ msgid "Name:"
-#~ msgstr "Nimi:"
+#~ msgid "Topics:"
+#~ msgstr "Aiheet:"
+
+#~ msgid "Location:"
+#~ msgstr "Sijainti:"
+
+#~ msgid "Languages:"
+#~ msgstr "Kielet:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "Aiemmat puheet:"
+
+#~ msgid "p<get-var page />"
+#~ msgstr "s. <get-var page />"
+
+#~ msgid "Where:"
+#~ msgstr "Missä:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Tiedot:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Arkkitehtuuri:"
+
+#~ msgid "Who:"
+#~ msgstr "Kuka:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Hinnat:"
diff --git a/finnish/po/ports.fi.po b/finnish/po/ports.fi.po
index 8ffdb73d424..76bed6f535a 100644
--- a/finnish/po/ports.fi.po
+++ b/finnish/po/ports.fi.po
@@ -113,75 +113,65 @@ msgstr "Debian PowerPC:lle"
msgid "Debian for Sparc"
msgstr "Debian Sparcille"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "libc5-pohjainen Debian GNU/FreeBSD"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian kannettaviin"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian Sparc64:lle"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian AMD64:lle"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian S/390:lle"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian ARMille"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian MIPSille"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian Beowulfiin"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, LCD-ohjain, Compact Flash, UART, rinnakkaisportti, RTC, "
-#~ "näppäimistö, USB, Touchpad, äänipiiri"
+#~ msgid "Main"
+#~ msgstr "Pääsivu"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr ""
-#~ "Mips 16, Compact Flash, UART, rinnakkaisportti, RTC, äänipiiri, PCIC"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgstr ""
-#~ "Mips 16, RTC, näppäimistö, TouchPanel, äänipiiri, Compact-Flash, UART, "
-#~ "rinnakkaisportti"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian Motorola 680x0:lle"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "Vendor/Name"
+#~ msgstr "Toimittaja/Nimi"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256k sisäinen L2-välimuisti"
+#~ msgid "Date announced"
+#~ msgstr "Julkaistu"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, 64-bittinen ulkoinen väylä, ulkoinen L2-välimuisti"
+#~ msgid "Clock"
+#~ msgstr "Kellotaajuus"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, 64-bittinen ulkoinen väylä"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, 32-bittinen ulkoinen väylä"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr ""
-#~ "2&#215; 10/100 Ethernet, 4&#215; UART, IrDA, AC'97, I2C, 38&#215; Digital "
-#~ "I/O"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "ei FPU:ta, SDRAMC, ROMC, DMAC, PCIC, UART, ajastin"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "ei FPU:ta, SDRAMC, ROMC, UART, ajastin, PCMCIA, IrDA"
+#~ msgid "Specials"
+#~ msgstr "Erikoisuudet"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "ei FPU:ta, SDRAMC, ROMC, UART, ajastin, PCMCIA, LCD-ohjain, IrDA"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "Ei FPU:ta (R2010), ulkoinen välimuisti"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "ei FPU:ta, SDRAMC, ROMC, ajastin, PCMCIA, LCD-ohjain, IrDA"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "Ei FPU:ta (R3010)"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, PCIC, UART, ajastin"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Virtuaalinen indeksoitu L1-välimuisti, L2-välimuistin ohjain"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, UART, ajastin"
+#~ msgid "External L1 cache"
+#~ msgstr "Ulkoinen L1-välimuisti"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, UART, ajastin, I2C, LCD-ohjain"
+#~ msgid "Multiple chip CPU"
+#~ msgstr "monipiirisuoritin"
#~ msgid ""
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
@@ -190,62 +180,72 @@ msgstr "Debian Sparcille"
#~ "Mips16 isa-laajennus, ei FPU:ta, 512k flash, 16k ram, DMAC, UART, "
#~ "ajastin, I2C, Watchdog"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "monipiirisuoritin"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, UART, ajastin, I2C, LCD-ohjain"
-#~ msgid "External L1 cache"
-#~ msgstr "Ulkoinen L1-välimuisti"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, UART, ajastin"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Virtuaalinen indeksoitu L1-välimuisti, L2-välimuistin ohjain"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "ei FPU:ta, DRAMC, ROMC, DMAC, PCIC, UART, ajastin"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "Ei FPU:ta (R3010)"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "ei FPU:ta, SDRAMC, ROMC, ajastin, PCMCIA, LCD-ohjain, IrDA"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "Ei FPU:ta (R2010), ulkoinen välimuisti"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "ei FPU:ta, SDRAMC, ROMC, UART, ajastin, PCMCIA, LCD-ohjain, IrDA"
-#~ msgid "Specials"
-#~ msgstr "Erikoisuudet"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "ei FPU:ta, SDRAMC, ROMC, UART, ajastin, PCMCIA, IrDA"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "ei FPU:ta, SDRAMC, ROMC, DMAC, PCIC, UART, ajastin"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr ""
+#~ "2&#215; 10/100 Ethernet, 4&#215; UART, IrDA, AC'97, I2C, 38&#215; Digital "
+#~ "I/O"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, 32-bittinen ulkoinen väylä"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, 64-bittinen ulkoinen väylä"
-#~ msgid "Clock"
-#~ msgstr "Kellotaajuus"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, 64-bittinen ulkoinen väylä, ulkoinen L2-välimuisti"
-#~ msgid "Date announced"
-#~ msgstr "Julkaistu"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256k sisäinen L2-välimuisti"
-#~ msgid "Vendor/Name"
-#~ msgstr "Toimittaja/Nimi"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian Motorola 680x0:lle"
+#~ msgid ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgstr ""
+#~ "Mips 16, RTC, näppäimistö, TouchPanel, äänipiiri, Compact-Flash, UART, "
+#~ "rinnakkaisportti"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr ""
+#~ "Mips 16, Compact Flash, UART, rinnakkaisportti, RTC, äänipiiri, PCIC"
-#~ msgid "Main"
-#~ msgstr "Pääsivu"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, LCD-ohjain, Compact Flash, UART, rinnakkaisportti, RTC, "
+#~ "näppäimistö, USB, Touchpad, äänipiiri"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian Beowulfiin"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian MIPSille"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian ARMille"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian S/390:lle"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian AMD64:lle"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian Sparc64:lle"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian kannettaviin"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "libc5-pohjainen Debian GNU/FreeBSD"
diff --git a/finnish/po/stats.fi.po b/finnish/po/stats.fi.po
index 57e4e0971ca..3fca88b2b1d 100644
--- a/finnish/po/stats.fi.po
+++ b/finnish/po/stats.fi.po
@@ -25,75 +25,75 @@ msgstr "Yhteensä %d tavua käännettävänä."
msgid "There are %d strings to translate."
msgstr "Yhteensä %d merkkijonoa käännettävänä."
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Tämä käännös on vanhentunut"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Väärä käännösversio"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "Alkuperäinen on uudempi kuin tämä käännös"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "Alkuperäistä sivua ei enää ole olemassa"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "osumalukua ei saatavilla"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "osumaa"
-#: ../../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 "Unifoidut muutokset"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "Väritetyt muutokset"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Käännösyhteenveto"
-#: ../../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 "Ei käännetty"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Vanhentunut"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Käännetty"
-#: ../../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 "Ajan tasalla"
-#: ../../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 "tiedostoa"
-#: ../../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 "tavua"
-#: ../../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,137 +101,137 @@ msgstr ""
"Huom: sivuluettelot on lajiteltu suosion mukaan. Pidä osoitin sivun nimen "
"päällä nähdäksesi osumien lukumäärän."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Vanhetuneet käännökset"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "Tiedosto"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Muutokset"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Kommentti"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
#, fuzzy
#| msgid "Diff"
msgid "Diffstat"
msgstr "Muutokset"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Loki"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Käännös"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Ylläpitäjä"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Tila"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Kääntäjä"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Päiväys"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Kääntämättömät yleissivut"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Kääntämättömät yleissivut"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Kääntämättömät uutiset"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Kääntämättömät uutiset"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Kääntämättömät konsultti/käyttäjäsivut"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Kääntämättömät konsultti/käyttäjäsivut"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Kääntämättömät kansainväliset sivut"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Kääntämättömät kansainväliset sivut"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Käännetyt sivut (ajan tasalla)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Käännetyt mallinteet (PO-tiedostot)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "PO-käännöstilastot"
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr "Sumea"
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr "Kääntämättä"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Yhteensä"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Yhteensä:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Luotu työkalulla"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Käännetyt www-sivut"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Käännöstilastot sivumäärän mukaan"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Kieli"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Käännökset"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Käännetyt www-sivut (koon mukaan)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Käännöstilastot sivukoon mukaan"
diff --git a/finnish/po/templates.fi.po b/finnish/po/templates.fi.po
index 755f18a99c0..bb20a94a7d3 100644
--- a/finnish/po/templates.fi.po
+++ b/finnish/po/templates.fi.po
@@ -63,7 +63,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Takaisin <a href=\"m4_HOME/\">Debian-projektin kotisivulle</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 "Koti"
@@ -104,7 +104,7 @@ msgid "Support"
msgstr "Tuki"
#: ../../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 "Kehittäjien nurkkaus"
@@ -141,7 +141,7 @@ msgid "Miscellaneous"
msgstr "Sekalaista"
#: ../../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 "Debianin hankkiminen"
@@ -197,7 +197,7 @@ msgstr "versiossa 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -216,23 +216,23 @@ msgstr ""
"debian.org</a>. Muut yhteystiedot löytyvät <a href=\"m4_HOME/contact"
"\">kontaktisivulta</a>."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Viimeksi muutettu"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Tekijänoikeudet"
-#: ../../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> ja muut;"
-#: ../../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 "Katso <a href=\"m4_HOME/license\" rel=\"copyright\">lisenssiehtoja</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."
@@ -294,140 +294,150 @@ msgid "Debian Books"
msgstr "Debian-kirjallisuutta"
#: ../../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 "Postilistojen arkistot"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Postilistat"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Yhteisösopimus"
-#: ../../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 "Vierailethan sivuston sponsorilla"
-#: ../../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 - Kansainvälinen käyttöjärjestelmä"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Debian-sivujen sivustokartta"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Kehittäjätietokanta"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian"
msgid "Debian FAQ"
msgstr "Debian"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Debianin linjan kuvaus"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Kehittäjien käsikirja"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Uuden ylläpitäjän opas"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Julkaisun estävät viat"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Lintian-raportit"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Käyttäjien postilistojen arkistot"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Kehittäjien postilistojen arkistot"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "I18n/l10n-postilistojen arkistot"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Siirrosten postilistojen arkistot"
-#: ../../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 "Vianseurantajärjestelmän postilistojen arkistot"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Muiden postilistojen arkistot"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Vapaa ohjelmisto"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Kehitys"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Auta Debiania"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Vikailmoitukset"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Siirrokset/arkkitehtuurit"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Asennusopas"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "CD-toimittajat"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "CD/USB-ISO-vedokset"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Verkkoasennus"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Esiasennettu"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Debian-Edu-projekti"
-#: ../../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 "Laadunvalvonta"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Paketinseurantajärjestelmä"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Debian-kehittäjien pakettikatsaus"
@@ -511,506 +521,507 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Takaisin <a href=\"../\">Ketkä käyttävät Debiania?-sivulle</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "Konsulttilista"
-
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Takaisin <a href=\"./\">Debian-konsulttisivulle</a>."
+#~ msgid "Select a server near you"
+#~ msgstr "Valitse läheinen palvelin"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "More information:"
+#~ msgstr "Lisätietoa:"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Lataa jigdolla"
+#~ msgid "Taken by:"
+#~ msgstr "Ottanut:"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Lataa http/ftp:llä"
+#~ msgid "Nobody"
+#~ msgstr "Ei kukaan"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Osta CD:t/DVD:t"
+#~ msgid "Rating:"
+#~ msgstr "Aste:"
-#~ msgid "Network Install"
-#~ msgstr "Verkkoasennus"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Oletko havainnut ongelman sivuston ulkoasussa?"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Lataa verkosta"
+#~ msgid "Report it!"
+#~ msgstr "Ilmoita siitä!"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Sekalaista"
+#~ msgid "More information"
+#~ msgstr "Lisätietoa"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Kansikuvia"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Tulevia tapahtumia"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Peilaukset"
+#~ msgid "link may no longer be valid"
+#~ msgstr "linkki voi olla vanhentunut"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-peilit"
+#~ msgid "When"
+#~ msgstr "Milloin"
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Lataa torrentilla"
+#~ msgid "Where"
+#~ msgstr "Missä"
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Vedosten julkaisutiedotteet"
+#~ msgid "More Info"
+#~ msgstr "Lisätietoa"
-#~ msgid "Debian CD team"
-#~ msgstr "Debian-CD-ryhmä"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debianin osallisuus"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian cd:llä"
+#~ msgid "Main Coordinator"
+#~ msgstr "Pääkoordinoija"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />vukk"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Projekti</th><th>Koordinaattori</th>"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Related Links"
+#~ msgstr "Aiheeseen liittyviä linkkejä"
-#~ msgid "http_ftp"
-#~ msgstr "http/ftp"
+#~ msgid "Latest News"
+#~ msgstr "Tuoreimmat uutiset"
-#~ msgid "buy"
-#~ msgstr "osta"
+#~ msgid "Download calendar entry"
+#~ msgstr "Imuroi kalenterimerkintä"
-#~ msgid "net_install"
-#~ msgstr "verkkoasennus"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Takaisin: muihin <a href=\"./\">Debian-uutisiin</a> || <a href=\"m4_HOME/"
+#~ "\">Debian-projektin kotisivulle</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />sekalaista"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (poistettu osoite)"
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "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 ""
-#~ "Englanninkielinen <a href=\"/MailingLists/disclaimer\">julkinen "
-#~ "postilista</a> CD/DVD:ille:"
+#~ "Saadaksesi tämän uutiskirjeen joka toinen viikko postilaatikkoosi, <a "
+#~ "href=\"https://lists.debian.org/debian-news/\">liity debian-news-"
+#~ "postilistalle</a>."
-#~ msgid "Date"
-#~ msgstr "Päiväys"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "Uutiskirjeen <a href=\"../../\">vanhoja numeroita</a> on myös saatavilla."
-#~ msgid "Time Line"
-#~ msgstr "Aikajana"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debianin projektikatsausta toimittaa <a href=\"mailto:debian-"
+#~ "publicity@lists.debian.org\">%s</a>."
-#~ msgid "Nominations"
-#~ msgstr "Nimeämiset"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debianin projektikatsausta toimittavat <a href=\"mailto:debian-"
+#~ "publicity@lists.debian.org\">%s</a>."
-#~ msgid "Proposer"
-#~ msgstr "Ehdottaja"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Tämän Debianin projektikatsauksen toimitti <a href=\"mailto:debian-"
+#~ "publicity@lists.debian.org\">%s</a>."
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Ehdotuksen A ehdottaja"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Tämän Debianin projektikatsauksen toimittivat <a href=\"mailto:debian-"
+#~ "publicity@lists.debian.org\">%s</a>."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Ehdotuksen B ehdottaja"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "Tämän numeron käänsi %s."
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Ehdotuksen C ehdottaja"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "Tämän numeron käänsivät %s."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Ehdotuksen D ehdottaja"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "Tämän numeron käänsi %s."
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Ehdotuksen E ehdottaja"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "Tämän numeron käänsivät %s."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Ehdotuksen F ehdottaja"
+#~ msgid "List of Speakers"
+#~ msgstr "Lista puhujista"
-#~ msgid "Seconds"
-#~ msgstr "Kannatukset"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Takaisin <a href=\"./\">Debian-puhujasivulle</a>."
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Ehdotuksen A kannattajat"
+#~ 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>."
+#~ msgstr ""
+#~ "Saadaksesi tämän uutiskirjeen viikottain postilaatikkoosi, <a href="
+#~ "\"https://lists.debian.org/debian-news/\">liity debian-news-"
+#~ "postilistalle</a>."
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Ehdotuksen B kannattajat"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debianin viikkokatsausta toimittaa <a href=\"mailto:dwn@debian.org\">%s</"
+#~ "a>."
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Ehdotuksen C kannattajat"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debianin viikkokatsausta toimittavat <a href=\"mailto:dwn@debian.org\">"
+#~ "%s</a>."
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Ehdotuksen D kannattajat"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debianin viikkokatsausta toimittaa <a href=\"mailto:dwn@debian.org\">%s</"
+#~ "a>."
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Ehdotuksen E kannattajat"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debianin viikkokatsausta toimittavat <a href=\"mailto:dwn@debian.org\">"
+#~ "%s</a>."
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Ehdotuksen F kannattajat"
+#~ msgid "No requests for adoption"
+#~ msgstr "Ei adoptointipyyntöjä"
-#~ msgid "Opposition"
-#~ msgstr "Vastustus"
+#~ msgid "No orphaned packages"
+#~ msgstr "Ei orpoja paketteja"
-#~ msgid "Text"
-#~ msgstr "Teksti"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Ei paketteja odottamassa adoptiota"
-#~ msgid "Proposal A"
-#~ msgstr "Ehdotus A"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Ei paketteja odottamassa paketointia"
-#~ msgid "Proposal B"
-#~ msgstr "Ehdotus B"
+#~ msgid "No Requested packages"
+#~ msgstr "Ei pyydettyjä paketteja"
-#~ msgid "Proposal C"
-#~ msgstr "Ehdotus C"
+#~ msgid "No help requested"
+#~ msgstr "Ei pyydetty apua"
-#~ msgid "Proposal D"
-#~ msgstr "Ehdotus D"
+#~ msgid "in adoption since today."
+#~ msgstr "adoptiossa tästä päivästä lähtien."
-#~ msgid "Proposal E"
-#~ msgstr "Ehdotus E"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "adoptiossa eilisestä lähtien."
-#~ msgid "Proposal F"
-#~ msgstr "Ehdotus F"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s päivää adoptiossa."
-#~ msgid "Choices"
-#~ msgstr "Vaihtoehdot"
+#~ msgid "in preparation since today."
+#~ msgstr "valmistelussa tästä päivästä lähtien."
-#~ msgid "Majority Requirement"
-#~ msgstr "Enemmistövaatimus"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "valmistelussa eilisestä lähtien."
-#~ msgid "Outcome"
-#~ msgstr "Tulos"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s päivää valmistelussa."
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Kannatusta odottavat"
+#~ msgid "requested today."
+#~ msgstr "pyydetty tänään."
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Keskusteltavana"
+#~ msgid "requested yesterday."
+#~ msgstr "pyydetty eilen."
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Äänestys&nbsp;käynnissä"
+#~ msgid "requested %s days ago."
+#~ msgstr "pyydetty %s päivää sitten."
-#~ msgid "Decided"
-#~ msgstr "Päätetty"
+#~ msgid "package info"
+#~ msgstr "pakettitietoa"
-#~ msgid "Withdrawn"
-#~ msgstr "Vedetty pois"
+#~ msgid "License Information"
+#~ msgstr "Lisenssitiedot"
-#~ msgid "Other"
-#~ msgstr "Muu"
+#~ msgid "DLS Index"
+#~ msgstr "DLS-hakemisto"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Koti&nbsp;äänestyssivu"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Kuinka"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG-VUKK"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Ehdottaa"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Debian-Legal-arkisto"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Täydentää&nbsp;ehdotusta"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Seurata&nbsp;ehdotuksen&nbsp;kehitystä"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, versio %s: %s"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Lukea&nbsp;tulos"
+#~ msgid "Date published"
+#~ msgstr "Julkistuspäivämäärä"
-#~ msgid "Vote"
-#~ msgstr "Äänestää"
+#~ msgid "License"
+#~ msgstr "Lisenssi"
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgid "Version"
+#~ msgstr "Versio"
-#~ msgid "network install"
-#~ msgstr "verkkoasennus"
+#~ msgid "Summary"
+#~ msgstr "Yhteenveto"
-#~ msgid "buy pre-made images"
-#~ msgstr "osta valmiit romput"
+#~ msgid "Justification"
+#~ msgstr "Perustelu:"
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Takaisin muihin <a href=\"./\">Debian-uutisiin</a>."
+#~ msgid "Discussion"
+#~ msgstr "Keskusteltavana"
-#~ msgid "discussed"
-#~ msgstr "keskusteltu"
+#~ msgid "Original Summary"
+#~ msgstr "Alkuperäinen yhteenveto"
#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
#~ msgstr ""
-#~ "Katso <a href=\"./\">lisenssitietojen</a> sivulta yleiskatsausta Debianin "
-#~ "lisenssiyhteenvedoista (DLS)."
+#~ "Alkuperäinen yhteenveto, jonka valmisteli <summary-author/>, löytyy <a "
+#~ "href=\"<summary-url/>\">lista-arkistoista</a>."
-#~ msgid "Not Redistributable"
-#~ msgstr "Ei jaeltavissa"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Tämän yhteenvedon valmisteli <summary-author/>."
-#~ msgid "Non-Free"
-#~ msgstr "Epävapaa"
+#~ msgid "License text (translated)"
+#~ msgstr "Lisenssiteksti (käännetty)"
-#~ msgid "Free"
-#~ msgstr "Vapaa"
+#~ msgid "License text"
+#~ msgstr "Lisenssiteksti"
-#~ msgid "not redistributable"
-#~ msgstr "ei jaeltavissa"
+#~ msgid "free"
+#~ msgstr "vapaa"
#~ msgid "non-free"
#~ msgstr "epävapaa"
-#~ msgid "free"
-#~ msgstr "vapaa"
+#~ msgid "not redistributable"
+#~ msgstr "ei jaeltavissa"
-#~ msgid "License text"
-#~ msgstr "Lisenssiteksti"
+#~ msgid "Free"
+#~ msgstr "Vapaa"
-#~ msgid "License text (translated)"
-#~ msgstr "Lisenssiteksti (käännetty)"
+#~ msgid "Non-Free"
+#~ msgstr "Epävapaa"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Tämän yhteenvedon valmisteli <summary-author/>."
+#~ msgid "Not Redistributable"
+#~ msgstr "Ei jaeltavissa"
#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
#~ msgstr ""
-#~ "Alkuperäinen yhteenveto, jonka valmisteli <summary-author/>, löytyy <a "
-#~ "href=\"<summary-url/>\">lista-arkistoista</a>."
+#~ "Katso <a href=\"./\">lisenssitietojen</a> sivulta yleiskatsausta Debianin "
+#~ "lisenssiyhteenvedoista (DLS)."
-#~ msgid "Original Summary"
-#~ msgstr "Alkuperäinen yhteenveto"
+#~ msgid "discussed"
+#~ msgstr "keskusteltu"
-#~ msgid "Discussion"
-#~ msgstr "Keskusteltavana"
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Takaisin muihin <a href=\"./\">Debian-uutisiin</a>."
-#~ msgid "Justification"
-#~ msgstr "Perustelu:"
+#~ msgid "buy pre-made images"
+#~ msgstr "osta valmiit romput"
-#~ msgid "Summary"
-#~ msgstr "Yhteenveto"
+#~ msgid "network install"
+#~ msgstr "verkkoasennus"
-#~ msgid "Version"
-#~ msgstr "Versio"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgid "License"
-#~ msgstr "Lisenssi"
+#~ msgid "Vote"
+#~ msgstr "Äänestää"
-#~ msgid "Date published"
-#~ msgstr "Julkistuspäivämäärä"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Lukea&nbsp;tulos"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, versio %s: %s"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Seurata&nbsp;ehdotuksen&nbsp;kehitystä"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Täydentää&nbsp;ehdotusta"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Debian-Legal-arkisto"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Ehdottaa"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG-VUKK"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kuinka"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Koti&nbsp;äänestyssivu"
-#~ msgid "DLS Index"
-#~ msgstr "DLS-hakemisto"
+#~ msgid "Other"
+#~ msgstr "Muu"
-#~ msgid "License Information"
-#~ msgstr "Lisenssitiedot"
+#~ msgid "Withdrawn"
+#~ msgstr "Vedetty pois"
-#~ msgid "package info"
-#~ msgstr "pakettitietoa"
+#~ msgid "Decided"
+#~ msgstr "Päätetty"
-#~ msgid "requested %s days ago."
-#~ msgstr "pyydetty %s päivää sitten."
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Äänestys&nbsp;käynnissä"
-#~ msgid "requested yesterday."
-#~ msgstr "pyydetty eilen."
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Keskusteltavana"
-#~ msgid "requested today."
-#~ msgstr "pyydetty tänään."
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Kannatusta odottavat"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s päivää valmistelussa."
+#~ msgid "Outcome"
+#~ msgstr "Tulos"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "valmistelussa eilisestä lähtien."
+#~ msgid "Majority Requirement"
+#~ msgstr "Enemmistövaatimus"
-#~ msgid "in preparation since today."
-#~ msgstr "valmistelussa tästä päivästä lähtien."
+#~ msgid "Choices"
+#~ msgstr "Vaihtoehdot"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s päivää adoptiossa."
+#~ msgid "Proposal F"
+#~ msgstr "Ehdotus F"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "adoptiossa eilisestä lähtien."
+#~ msgid "Proposal E"
+#~ msgstr "Ehdotus E"
-#~ msgid "in adoption since today."
-#~ msgstr "adoptiossa tästä päivästä lähtien."
+#~ msgid "Proposal D"
+#~ msgstr "Ehdotus D"
-#~ msgid "No help requested"
-#~ msgstr "Ei pyydetty apua"
+#~ msgid "Proposal C"
+#~ msgstr "Ehdotus C"
-#~ msgid "No Requested packages"
-#~ msgstr "Ei pyydettyjä paketteja"
+#~ msgid "Proposal B"
+#~ msgstr "Ehdotus B"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Ei paketteja odottamassa paketointia"
+#~ msgid "Proposal A"
+#~ msgstr "Ehdotus A"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Ei paketteja odottamassa adoptiota"
+#~ msgid "Text"
+#~ msgstr "Teksti"
-#~ msgid "No orphaned packages"
-#~ msgstr "Ei orpoja paketteja"
+#~ msgid "Opposition"
+#~ msgstr "Vastustus"
-#~ msgid "No requests for adoption"
-#~ msgstr "Ei adoptointipyyntöjä"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Ehdotuksen F kannattajat"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debianin viikkokatsausta toimittavat <a href=\"mailto:dwn@debian.org\">"
-#~ "%s</a>."
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Ehdotuksen E kannattajat"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debianin viikkokatsausta toimittaa <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Ehdotuksen D kannattajat"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debianin viikkokatsausta toimittavat <a href=\"mailto:dwn@debian.org\">"
-#~ "%s</a>."
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Ehdotuksen C kannattajat"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debianin viikkokatsausta toimittaa <a href=\"mailto:dwn@debian.org\">%s</"
-#~ "a>."
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Ehdotuksen B kannattajat"
-#~ 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>."
-#~ msgstr ""
-#~ "Saadaksesi tämän uutiskirjeen viikottain postilaatikkoosi, <a href="
-#~ "\"https://lists.debian.org/debian-news/\">liity debian-news-postilistalle</"
-#~ "a>."
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Ehdotuksen A kannattajat"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Takaisin <a href=\"./\">Debian-puhujasivulle</a>."
+#~ msgid "Seconds"
+#~ msgstr "Kannatukset"
-#~ msgid "List of Speakers"
-#~ msgstr "Lista puhujista"
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Ehdotuksen F ehdottaja"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "Tämän numeron käänsivät %s."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Ehdotuksen E ehdottaja"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "Tämän numeron käänsi %s."
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Ehdotuksen D ehdottaja"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "Tämän numeron käänsivät %s."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Ehdotuksen C ehdottaja"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "Tämän numeron käänsi %s."
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Ehdotuksen B ehdottaja"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Tämän Debianin projektikatsauksen toimittivat <a href=\"mailto:debian-"
-#~ "publicity@lists.debian.org\">%s</a>."
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Ehdotuksen A ehdottaja"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Tämän Debianin projektikatsauksen toimitti <a href=\"mailto:debian-"
-#~ "publicity@lists.debian.org\">%s</a>."
+#~ msgid "Proposer"
+#~ msgstr "Ehdottaja"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debianin projektikatsausta toimittavat <a href=\"mailto:debian-"
-#~ "publicity@lists.debian.org\">%s</a>."
+#~ msgid "Nominations"
+#~ msgstr "Nimeämiset"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debianin projektikatsausta toimittaa <a href=\"mailto:debian-"
-#~ "publicity@lists.debian.org\">%s</a>."
+#~ msgid "Time Line"
+#~ msgstr "Aikajana"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "Uutiskirjeen <a href=\"../../\">vanhoja numeroita</a> on myös saatavilla."
+#~ msgid "Date"
+#~ msgstr "Päiväys"
#~ 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>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "Saadaksesi tämän uutiskirjeen joka toinen viikko postilaatikkoosi, <a "
-#~ "href=\"https://lists.debian.org/debian-news/\">liity debian-news-"
-#~ "postilistalle</a>."
+#~ "Englanninkielinen <a href=\"/MailingLists/disclaimer\">julkinen "
+#~ "postilista</a> CD/DVD:ille:"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (poistettu osoite)"
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />sekalaista"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Takaisin: muihin <a href=\"./\">Debian-uutisiin</a> || <a href=\"m4_HOME/"
-#~ "\">Debian-projektin kotisivulle</a>."
+#~ msgid "net_install"
+#~ msgstr "verkkoasennus"
-#~ msgid "Download calendar entry"
-#~ msgstr "Imuroi kalenterimerkintä"
+#~ msgid "buy"
+#~ msgstr "osta"
-#~ msgid "Latest News"
-#~ msgstr "Tuoreimmat uutiset"
+#~ msgid "http_ftp"
+#~ msgstr "http/ftp"
-#~ msgid "Related Links"
-#~ msgstr "Aiheeseen liittyviä linkkejä"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Projekti</th><th>Koordinaattori</th>"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />vukk"
-#~ msgid "Main Coordinator"
-#~ msgstr "Pääkoordinoija"
+#~ msgid "debian_on_cd"
+#~ msgstr "debian cd:llä"
-#~ msgid "Debian Involvement"
-#~ msgstr "Debianin osallisuus"
+#~ msgid "Debian CD team"
+#~ msgstr "Debian-CD-ryhmä"
-#~ msgid "More Info"
-#~ msgstr "Lisätietoa"
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Vedosten julkaisutiedotteet"
-#~ msgid "Where"
-#~ msgstr "Missä"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Lataa torrentilla"
-#~ msgid "When"
-#~ msgstr "Milloin"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-peilit"
-#~ msgid "link may no longer be valid"
-#~ msgstr "linkki voi olla vanhentunut"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Peilaukset"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Tulevia tapahtumia"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Kansikuvia"
-#~ msgid "More information"
-#~ msgstr "Lisätietoa"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Sekalaista"
-#~ msgid "Report it!"
-#~ msgstr "Ilmoita siitä!"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Lataa verkosta"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Oletko havainnut ongelman sivuston ulkoasussa?"
+#~ msgid "Network Install"
+#~ msgstr "Verkkoasennus"
-#~ msgid "Rating:"
-#~ msgstr "Aste:"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Osta CD:t/DVD:t"
-#~ msgid "Nobody"
-#~ msgstr "Ei kukaan"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Lataa http/ftp:llä"
-#~ msgid "Taken by:"
-#~ msgstr "Ottanut:"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Lataa jigdolla"
-#~ msgid "More information:"
-#~ msgstr "Lisätietoa:"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Select a server near you"
-#~ msgstr "Valitse läheinen palvelin"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Takaisin <a href=\"./\">Debian-konsulttisivulle</a>."
+
+#~ msgid "List of Consultants"
+#~ msgstr "Konsulttilista"
diff --git a/finnish/po/vendors.fi.po b/finnish/po/vendors.fi.po
index e5b100550e5..3f9c896986b 100644
--- a/finnish/po/vendors.fi.po
+++ b/finnish/po/vendors.fi.po
@@ -9,137 +9,130 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Toimittaja:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "Debian-sivun osoite:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Antaa mahdollisuuden lahjoittaa Debianille:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Maa:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Toimittaa kaikkialle maailmaan:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "Sähköposti:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "CD:n tyyppi:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "DVD:n tyyppi:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Arkkitehtuurit:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Toimittaja"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Antaa mahdollisuuden lahjoittaa Debianille"
-#: ../../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 "Arkkitehtuurit"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Toimittaa kaikkialle maailmaan"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Yhteydenotot"
#. ###################
#. 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 "Toimittajan sivu"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "sivu"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "sähköposti"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "Euroopassa"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "Joillekin alueille"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "lähdekoodi"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "ja"
-#~ msgid "Official CD"
-#~ msgstr "Virallinen CD"
+#~ msgid "updated monthly"
+#~ msgstr "uudistetaan kuukausittain"
-#~ msgid "Official DVD"
-#~ msgstr "Virallinen DVD"
+#~ msgid "updated twice weekly"
+#~ msgstr "uudistetaan kahdesti viikossa"
-#~ msgid "Development Snapshot"
-#~ msgstr "Kehitysversion vedos"
+#~ msgid "updated weekly"
+#~ msgstr "uudistetaan viikottain"
-#~ msgid "Vendor Release"
-#~ msgstr "Toimittajan oma versio"
+#~ msgid "reseller"
+#~ msgstr "jälleenmyyjä"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Useita versioita"
+#~ msgid "reseller of $var"
+#~ msgstr "$var:n jälleenmyyjä"
-#~ msgid "non-US included"
-#~ msgstr "non-US-osio mukana"
+#~ msgid "Custom Release"
+#~ msgstr "Räätälöity versio"
-#~ msgid "non-free included"
-#~ msgstr "non-free-osio mukana"
+#~ msgid "vendor additions"
+#~ msgstr "toimittajan lisäyksiä"
#~ msgid "contrib included"
#~ msgstr "contrib-osio mukana"
-#~ msgid "vendor additions"
-#~ msgstr "toimittajan lisäyksiä"
+#~ msgid "non-free included"
+#~ msgstr "non-free-osio mukana"
-#~ msgid "Custom Release"
-#~ msgstr "Räätälöity versio"
+#~ msgid "non-US included"
+#~ msgstr "non-US-osio mukana"
-#~ msgid "reseller of $var"
-#~ msgstr "$var:n jälleenmyyjä"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Useita versioita"
-#~ msgid "reseller"
-#~ msgstr "jälleenmyyjä"
+#~ msgid "Vendor Release"
+#~ msgstr "Toimittajan oma versio"
-#~ msgid "updated weekly"
-#~ msgstr "uudistetaan viikottain"
+#~ msgid "Development Snapshot"
+#~ msgstr "Kehitysversion vedos"
-#~ msgid "updated twice weekly"
-#~ msgstr "uudistetaan kahdesti viikossa"
+#~ msgid "Official DVD"
+#~ msgstr "Virallinen DVD"
-#~ msgid "updated monthly"
-#~ msgstr "uudistetaan kuukausittain"
+#~ msgid "Official CD"
+#~ msgstr "Virallinen CD"
+
+#~ msgid "Architectures:"
+#~ msgstr "Arkkitehtuurit:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD:n tyyppi:"
+
+#~ msgid "CD Type:"
+#~ msgstr "CD:n tyyppi:"
+
+#~ msgid "email:"
+#~ msgstr "Sähköposti:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Toimittaa kaikkialle maailmaan:"
+
+#~ msgid "Country:"
+#~ msgstr "Maa:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Antaa mahdollisuuden lahjoittaa Debianille:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian-sivun osoite:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Toimittaja:"
diff --git a/finnish/po/vote.fi.po b/finnish/po/vote.fi.po
index 1eddaa0553e..4e61ff04434 100644
--- a/finnish/po/vote.fi.po
+++ b/finnish/po/vote.fi.po
@@ -18,229 +18,251 @@ msgid "Time Line"
msgstr "Aikajana"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Nimeämiset"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Väittely"
-#: ../../english/template/debian/votebar.wml:25
+#: ../../english/template/debian/votebar.wml:28
msgid "Platforms"
msgstr "Vaaliohjelmat"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Proposer"
msgstr "Ehdottaja"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "Ehdotuksen A ehdottaja"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "Ehdotuksen B ehdottaja"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "Ehdotuksen C ehdottaja"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "Ehdotuksen D ehdottaja"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "Ehdotuksen E ehdottaja"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "Ehdotuksen F ehdottaja"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Seconds"
msgstr "Kannatukset"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
msgid "Proposal A Seconds"
msgstr "Ehdotuksen A kannattajat"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "Ehdotuksen B kannattajat"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "Ehdotuksen C kannattajat"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "Ehdotuksen D kannattajat"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "Ehdotuksen E kannattajat"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "Ehdotuksen F kannattajat"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
msgid "Opposition"
msgstr "Vastustus"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
msgid "Text"
msgstr "Teksti"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal A"
msgstr "Ehdotus A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "Ehdotus B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "Ehdotus C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "Ehdotus D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "Ehdotus E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "Ehdotus F"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
msgid "Choices"
msgstr "Vaihtoehdot"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
msgid "Amendment Proposer"
msgstr "Muutosehdotuksen tekijä"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
msgid "Amendment Seconds"
msgstr "Muutosehdotuksen kannattajat"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
msgid "Amendment Text"
msgstr "Muutosehdotuksen teksti"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
msgid "Amendment Proposer A"
msgstr "Muutosehdotuksen A tekijä"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "Muutosehdotuksen A kannattajat"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "Muutosehdotuksen A teksti"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "Muutosehdotuksen B tekijä"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "Muutosehdotuksen B kannattajat"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "Muutosehdotuksen B teksti"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "Muutosehdotuksen A tekijä"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "Muutosehdotuksen A kannattajat"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "Muutosehdotuksen A teksti"
+
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendments"
msgstr "Muutosehdotukset"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:139
msgid "Proceedings"
msgstr "Pöytäkirjat"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:142
msgid "Majority Requirement"
msgstr "Enemmistövaatimus"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:145
msgid "Data and Statistics"
msgstr "Tiedot ja tilastot"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:148
msgid "Quorum"
msgstr "Määrävaatimus"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:151
msgid "Minimum Discussion"
msgstr "Vähimmäismäärä keskustelua"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:154
msgid "Ballot"
msgstr "Äänestyslippu"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:157
msgid "Forum"
msgstr "Foorumi"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:160
msgid "Outcome"
msgstr "Tulos"
-#: ../../english/template/debian/votebar.wml:152
+#: ../../english/template/debian/votebar.wml:164
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Kannatusta odottavat"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Keskusteltavana"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Äänestys&nbsp;käynnissä"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Päätetty"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Vedetty pois"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Muu"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Koti&nbsp;äänestyssivu"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Kuinka"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Ehdottaa"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Täydentää&nbsp;ehdotusta"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Seurata&nbsp;ehdotuksen&nbsp;kehitystä"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Lukea&nbsp;tulos"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Äänestää"
diff --git a/french/po/cdimage.fr.po b/french/po/cdimage.fr.po
index fcbb7a37b57..20ed37b2953 100644
--- a/french/po/cdimage.fr.po
+++ b/french/po/cdimage.fr.po
@@ -14,19 +14,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:43 ../../english/CD/CD-keys.data:48
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
msgid " Key fingerprint"
msgstr " Empreinte de la clef"
-#: ../../english/devel/debian-installer/images.data:92
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "images ISO"
-#: ../../english/devel/debian-installer/images.data:93
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "fichiers Jigdo"
diff --git a/french/po/distrib.fr.po b/french/po/distrib.fr.po
index cbba277f15d..07201d1050e 100644
--- a/french/po/distrib.fr.po
+++ b/french/po/distrib.fr.po
@@ -137,82 +137,92 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
+#, fuzzy
+#| msgid "64-bit PC (amd64)"
+msgid "64-bit ARM (AArch64)"
+msgstr "PC 64 bits (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 "ARM avec unité de calcul flottant"
-#: ../../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 PC 32 bits (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr "PC 32 bits (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 PC 32 bits (i386)"
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr "kFreeBSD PC 64 bits (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 (gros-boutiste)"
-#: ../../english/releases/arches.data:21
+#: ../../english/releases/arches.data:22
msgid "MIPS (little endian)"
msgstr "MIPS (petit-boutiste)"
-#: ../../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 "System z"
-#: ../../english/releases/arches.data:25
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
#~ msgid "Intel IA-64"
#~ msgstr "Intel IA-64"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/french/po/doc.fr.po b/french/po/doc.fr.po
index 80764da17f5..05c60818da0 100644
--- a/french/po/doc.fr.po
+++ b/french/po/doc.fr.po
@@ -22,7 +22,24 @@ msgstr ""
"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\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"
@@ -47,7 +64,7 @@ msgstr ""
"pour sécuriser les services, les installations automatisées ou la "
"virtualisation avec Xen, KVM ou LXC."
-#: ../../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"
@@ -62,15 +79,15 @@ msgstr ""
" maintient le système lui-même que ce soit à la maison, au bureau, dans un\n"
" club ou une école."
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "CD de Sarge avec installateur et une sélection de paquets"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "CD autonome avec Knoppix"
-#: ../../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"
@@ -86,13 +103,13 @@ msgstr ""
" couverture détaillée du système unique de gestion de paquets de\n"
" Debian."
-#: ../../english/doc/books.data:77 ../../english/doc/books.data:180
-#: ../../english/doc/books.data:224 ../../english/doc/books.data:269
+#: ../../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 "DVD officiel de Debian GNU/Linux 3.1r0a <q>Sarge</q> (i386)"
-#: ../../english/doc/books.data:80 ../../english/doc/books.data:183
-#: ../../english/doc/books.data:227 ../../english/doc/books.data:272
+#: ../../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"
@@ -126,7 +143,7 @@ msgstr ""
"a>.\n"
" Note&nbsp;: cette édition ne contient pas de DVD."
-#: ../../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 -- "
@@ -142,11 +159,11 @@ msgstr ""
" aux problèmes de réseau. Comme les logiciels que ce livre décrit, les\n"
" sources du livre sont disponibles et protégées par un <q>copyleft</q>."
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
msgid "Debian 2.2 ARM architecture"
msgstr "Debian 2.2 architecture ARM"
-#: ../../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, "
@@ -181,7 +198,7 @@ msgstr ""
" basée sur Debian-ARM et le lecteur est supposé travailler avec cette\n"
" distribution et avoir aussi une machine Debian."
-#: ../../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"
@@ -194,11 +211,11 @@ msgstr ""
" GNU/Linux</q>, guidés par Bill McCarty, une douce introduction à cet\n"
" extraordinaire monde informatique."
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
msgid "Debian 2.1"
msgstr "Debian 2.1"
-#: ../../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"
@@ -213,11 +230,11 @@ msgstr ""
"gratuit\n"
" de 30&nbsp;jours, par courrier électronique."
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "DVD Debian Squeeze i386/amd64"
-#: ../../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"
@@ -238,15 +255,27 @@ msgstr ""
" des outils Debian et l'administrateur qui veut construire un réseau\n"
" fiable avec Debian."
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "Deux éditions : une sans DVD, l'autre avec 2 DVD (i386)"
-#: ../../english/doc/books.data:213
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr "Debian Squeeze, 6.0.1a, multiarchitecture (i386 et amd64) en DVD"
-#: ../../english/doc/books.data:216
+#: ../../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 "
@@ -260,7 +289,7 @@ msgstr ""
"fournit un manuel pratique pour tous les utilisateurs qui veulent en "
"apprendre plus sur Debian et l'éventail de services proposés."
-#: ../../english/doc/books.data:244
+#: ../../english/doc/books.data:287
msgid ""
"2 editions: One with no CD, the other with Official CD (i386, contrib and "
"sources)"
@@ -268,7 +297,7 @@ msgstr ""
"2 éditions : une sans CD, l'autre avec les CD officiels (i386, contrib et "
"sources)"
-#: ../../english/doc/books.data:247
+#: ../../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"
@@ -304,11 +333,11 @@ msgstr ""
"pour\n"
" clients Windows (Samba)."
-#: ../../english/doc/books.data:290
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "Installateur de Sarge Debian GNU/Linux 3.1 (CD)"
-#: ../../english/doc/books.data:293
+#: ../../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"
@@ -319,13 +348,13 @@ msgstr ""
" l'installation par différents moyens, la personnalisation du bureau,\n"
" le diagnostic, les connaissances utiles, etc."
-#: ../../english/doc/books.data:306
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
msgstr "Debian GNU/Linux 3.1r0 i386, édition de l'auteur (DVD et CD)"
-#: ../../english/doc/books.data:310
+#: ../../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"
@@ -344,11 +373,11 @@ msgstr ""
" décorer votre bureau. Ce livre peut être utile à tous les utilisateurs\n"
" Debian, des débutants aux utilisateurs avancés."
-#: ../../english/doc/books.data:325
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr "Édition de l'auteur Debian 2.2r0 i386 (3 CD)"
-#: ../../english/doc/books.data:328
+#: ../../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"
@@ -365,11 +394,11 @@ msgstr ""
" L'installation et le démarrage de l'environnement japonais sont facilités\n"
" par les CD taillés sur mesure pour cet environnement."
-#: ../../english/doc/books.data:344
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "1 CD Woody non officiel, 3 CD Potato rev0"
-#: ../../english/doc/books.data:347
+#: ../../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 "
@@ -388,11 +417,11 @@ msgstr ""
" Ce livre fournit également le <q>Guide du nouveau responsable</q>,\n"
" pour inciter des gens en Corée à devenir responsable Debian."
-#: ../../english/doc/books.data:361
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr "3 CD officiels Potato r3 et 1 CD Woody non officiel"
-#: ../../english/doc/books.data:364
+#: ../../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"
@@ -411,11 +440,11 @@ msgstr ""
" utiles pour configurer un système Debian GNU/Linux dans un environnement\n"
" coréen. Adapté aux nouveaux venus à Debian GNU/Linux."
-#: ../../english/doc/books.data:386
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "CD 1 de Debian GNU/Linux 3.1r0"
-#: ../../english/doc/books.data:389
+#: ../../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"
@@ -428,7 +457,7 @@ msgstr ""
" ftp, etc. Il vous aide également à utiliser GNU/Linux et le\n"
" système puissant de gestion des paquets de Debian."
-#: ../../english/doc/books.data:405
+#: ../../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 "
@@ -456,7 +485,7 @@ msgstr ""
" destiné aux étudiants et à tous ceux qui veulent apprendre GNU/Linux\n"
" en détail. Ce livre couvre Debian <em>Sarge</em>."
-#: ../../english/doc/books.data:428
+#: ../../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 "
@@ -521,7 +550,7 @@ msgstr "Dernière version :"
msgid "(version <get-var version />)"
msgstr "(version <get-var version />)"
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr "texte seul"
@@ -589,14 +618,24 @@ msgstr "Paquet Debian"
msgid "Debian package (archived)"
msgstr "Paquet Debian (archivé)"
-#: ../../english/releases/arches.data:32
+#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
msgid "PDF"
msgstr "PDF"
+#~ msgid "Language:"
+#~ msgstr "Langue :"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Utilisez <a href=\"cvs\">SVN</a> pour télécharger les fichiers sources au "
+#~ "format SGML pour <get-var ddp_pkg_loc />."
+
#~ msgid ""
#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
#~ "mode=viewone&amp;titnr=254925022\">\n"
@@ -608,13 +647,3 @@ msgstr "PDF"
#~ "mode=viewone&amp;titnr=254925022\">\n"
#~ " publication</a> alternative est disponible chez Lehmanns\n"
#~ " Fachbuchhandlung et coûte 29,95 € (en 2008)."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Utilisez <a href=\"cvs\">SVN</a> pour télécharger les fichiers sources au "
-#~ "format SGML pour <get-var ddp_pkg_loc />."
-
-#~ msgid "Language:"
-#~ msgstr "Langue :"
diff --git a/french/po/mailinglists.fr.po b/french/po/mailinglists.fr.po
index 5cf0b35b1e9..c883bc995bf 100644
--- a/french/po/mailinglists.fr.po
+++ b/french/po/mailinglists.fr.po
@@ -137,11 +137,11 @@ msgstr "ouverte"
msgid "closed"
msgstr "fermée"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr ""
+#~ "Veuillez choisir les listes auxquelles vous souhaitez vous abonner&nbsp;:"
+
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
#~ "Veuillez choisir les listes desquelles vous souhaitez vous "
#~ "désabonner&nbsp;:"
-
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr ""
-#~ "Veuillez choisir les listes auxquelles vous souhaitez vous abonner&nbsp;:"
diff --git a/french/po/newsevents.fr.po b/french/po/newsevents.fr.po
index 003e9fb5e15..abae96dc24d 100644
--- a/french/po/newsevents.fr.po
+++ b/french/po/newsevents.fr.po
@@ -33,27 +33,27 @@ msgstr "p<get-var page />"
msgid "The newsletter for the Debian community"
msgstr "La lettre d'information de la communauté Debian"
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr "Nom :"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "Courriel :"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Précédentes présentations :"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Langues :"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Emplacement :"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Sujets :"
@@ -422,16 +422,20 @@ msgstr ""
"couvre les sujets suivants :"
#: ../../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 ""
-"Pour recevoir cette gazette toutes les deux semaines dans votre boîte à "
-"lettres, abonnez-vous à la <a href=\"https://lists.debian.org/debian-news"
-"\">liste de diffusion debian-news</a> pour la version anglaise ou à la <a "
-"href=\"https://lists.debian.org/debian-news-french\">liste de diffusion "
-"debian-news-french</a> pour la version française."
+"Pour recevoir cette gazette chaque semaine dans votre boîte à lettres, "
+"abonnez-vous à la <a href=\"https://lists.debian.org/debian-news\">liste de "
+"diffusion debian-news</a> pour la version anglaise ou à la <a href=\"https://"
+"lists.debian.org/debian-news-french\">liste de diffusion debian-news-french</"
+"a> pour la version française."
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
@@ -566,13 +570,24 @@ msgstr ""
"href=\"mailto:dwn@debian.org\">%s</a>."
#, fuzzy
-#~| msgid "Debian Latest News"
-#~ msgid "Debian Project News"
-#~ msgstr "Dernières nouvelles de Debian"
-
-#, fuzzy
#~| msgid "Debian News"
#~ msgid ""
#~ "Debian Project\n"
#~ "News"
#~ msgstr "Actualités Debian"
+
+#, fuzzy
+#~| msgid "Debian Latest News"
+#~ msgid "Debian Project News"
+#~ msgstr "Dernières nouvelles de Debian"
+
+#~ 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 ""
+#~ "Pour recevoir cette gazette toutes les deux semaines dans votre boîte à "
+#~ "lettres, abonnez-vous à la <a href=\"https://lists.debian.org/debian-news"
+#~ "\">liste de diffusion debian-news</a> pour la version anglaise ou à la <a "
+#~ "href=\"https://lists.debian.org/debian-news-french\">liste de diffusion "
+#~ "debian-news-french</a> pour la version française."
diff --git a/french/po/organization.fr.po b/french/po/organization.fr.po
index 5b73160d5d7..6f397d397f1 100644
--- a/french/po/organization.fr.po
+++ b/french/po/organization.fr.po
@@ -85,7 +85,7 @@ msgid "Officers"
msgstr "Directeurs"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribution"
@@ -95,11 +95,11 @@ msgid "Publicity"
msgstr "Publicité"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Assistance et infrastructure"
-#. 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 "Debian Pure Blends"
@@ -112,79 +112,79 @@ msgstr "Chef du projet"
msgid "Technical Committee"
msgstr "Comité technique"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Secrétaire"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Projets de développement"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Archives FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "Responsables du FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Assistants pour le FTP"
-#: ../../english/intro/organization.data:98
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "Conseillers pour le FTP"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Rétroportages"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Équipe en charge des rétroportages"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Paquets individuels"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Organisation des nouvelles versions"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Équipe de publication"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Assurance qualité"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Équipe du système d'installation"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Notes de publication"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Images CD"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Production"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Test"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Infrastructure des empaqueteurs automatiques"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Équipe en charge de wanna-build"
@@ -232,71 +232,71 @@ msgstr "Contact presse"
msgid "Partner Program"
msgstr "Programme de partenariat"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Événements"
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Brèves de Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Assistance aux utilisateurs"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Système de suivi des bogues"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administration et archives des listes de diffusion"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Secrétariat des nouveaux membres"
-#: ../../english/intro/organization.data:336
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Responsables des comptes de Debian"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Responsable du fichier de clefs (PGP et GPG)"
-#: ../../english/intro/organization.data:344
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Responsables du fichier de clefs des mainteneurs Debian (DM)"
-#: ../../english/intro/organization.data:348
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Équipe de sécurité"
-#: ../../english/intro/organization.data:363
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Pages web"
-#: ../../english/intro/organization.data:371
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Page des consultants"
-#: ../../english/intro/organization.data:376
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Pages des revendeurs de CD"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:383
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Normes"
-#: ../../english/intro/organization.data:388
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Administration système"
-#: ../../english/intro/organization.data:389
+#: ../../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."
@@ -305,7 +305,7 @@ msgstr ""
"des machines Debian, en particulier les problèmes de mots de passe ou si "
"vous souhaitez l'installation d'un nouveau paquet."
-#: ../../english/intro/organization.data:397
+#: ../../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 "
@@ -316,93 +316,99 @@ msgstr ""
"\">machines Debian</a>, elle pourrait contenir des informations fournies par "
"l'administrateur de la machine."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Administrateur de la base LDAP des développeurs"
-#: ../../english/intro/organization.data:399
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Miroirs"
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Responsable DNS"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Système de suivi de paquets"
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Coordination des dons de machines"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Commissaire aux comptes"
-#: ../../english/intro/organization.data:416
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+#: ../../english/intro/organization.data:413
+#, fuzzy
+#| msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Demandes d'utilisation de <a href=\"m4_HOME/trademark\">marque déposée</a>"
-#: ../../english/intro/organization.data:417
-msgid "current Debian Project Leader"
-msgstr "Chef du projet actuel"
-
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Administration d'Alioth"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Projet Debian Women"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "Responsables de DebConf"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Anti-harcèlement"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:436
+msgid "Outreach"
+msgstr ""
+
+#: ../../english/intro/organization.data:446
msgid "Debian for children from 1 to 99"
msgstr "Debian pour les enfants de 1 à 99 ans"
-#: ../../english/intro/organization.data:450
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian pour la pratique médicale et la recherche"
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian pour l'éducation"
-#: ../../english/intro/organization.data:458
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian dans les organismes juridiques"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian pour les personnes handicapées"
-#: ../../english/intro/organization.data:466
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian pour la science et la recherche associée"
-#~ msgid "Summer of Code 2013 Administrators"
-#~ msgstr "Administrateurs du Summer of Code 2013"
+#~ msgid "Testing Security Team"
+#~ msgstr "Équipe de sécurité de testing"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (inactif : non publié avec Squeeze)"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projet d'audit de sécurité"
+
+#~ msgid "Vendors"
+#~ msgstr "Revendeurs"
#~ msgid "Volatile Team"
#~ msgstr "Équipe en charge de volatile"
-#~ msgid "Vendors"
-#~ msgstr "Revendeurs"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (inactif : non publié avec Squeeze)"
-#~ msgid "Security Audit Project"
-#~ msgstr "Projet d'audit de sécurité"
+#~ msgid "Summer of Code 2013 Administrators"
+#~ msgstr "Administrateurs du Summer of Code 2013"
-#~ msgid "Testing Security Team"
-#~ msgstr "Équipe de sécurité de testing"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Chef du projet actuel"
diff --git a/french/po/others.fr.po b/french/po/others.fr.po
index 843791b58e4..7ec5d1b3834 100644
--- a/french/po/others.fr.po
+++ b/french/po/others.fr.po
@@ -166,26 +166,6 @@ msgstr "[Debian] (mini-bouton)"
msgid "same as the above"
msgstr "identique à ci-dessus"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Désiré :"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Demandeur :"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Architectures :"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Spécifications :"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Localisation :"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Produits"
@@ -336,3 +316,18 @@ msgstr "Version"
#: ../../english/y2k/l10n.data:36
msgid "URL"
msgstr "URL"
+
+#~ msgid "Where:"
+#~ msgstr "Localisation :"
+
+#~ msgid "Specifications:"
+#~ msgstr "Spécifications :"
+
+#~ msgid "Architecture:"
+#~ msgstr "Architectures :"
+
+#~ msgid "Who:"
+#~ msgstr "Demandeur :"
+
+#~ msgid "Wanted:"
+#~ msgstr "Désiré :"
diff --git a/french/po/ports.fr.po b/french/po/ports.fr.po
index 6e52c3a3282..b3ae6e433fd 100644
--- a/french/po/ports.fr.po
+++ b/french/po/ports.fr.po
@@ -117,32 +117,32 @@ msgstr "Debian pour PowerPC"
msgid "Debian for Sparc"
msgstr "Debian pour Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian pour portables"
-
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian pour Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian pour AMD64"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian pour S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian pour ARM"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian pour MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian pour Beowulf"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian pour Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Menu principal"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Main"
-#~ msgstr "Menu principal"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian pour Motorola 680x0"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian pour Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian pour MIPS"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian pour ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian pour S/390"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian pour AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian pour Sparc64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian pour portables"
diff --git a/french/po/stats.fr.po b/french/po/stats.fr.po
index a194000146a..77e78e9faaa 100644
--- a/french/po/stats.fr.po
+++ b/french/po/stats.fr.po
@@ -31,75 +31,75 @@ msgstr "%d octets sont à traduire."
msgid "There are %d strings to translate."
msgstr "%d chaînes sont à traduire."
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Cette traduction est trop incomplète"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Mauvaise version de traduction"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "L'original est plus récent que sa traduction"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "L'original n'existe plus"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "Nombre de visites indisponible"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "visites"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Cliquer pour récupérer les statistiques du différentiel"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "Différentiel unifié"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "Différentiel coloré"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Vue globale des traductions pour la langue :"
-#: ../../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 "Non traduites"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Incomplètes"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Traduites"
-#: ../../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 "À jour"
-#: ../../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 "fichiers"
-#: ../../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 "octets"
-#: ../../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."
@@ -107,135 +107,135 @@ msgstr ""
"Remarque : les listes de pages sont classées par popularité. Le nombre de "
"visites apparaît lorsque le pointeur passe sur le nom de la page."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Traductions incomplètes"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "Fichier"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Différentiel"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Commentaire"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Statistiques du différentiel"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Journal"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Traduction"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Responsable"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "État"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Traducteur"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Date"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Pages générales non traduites"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Pages générales non traduites"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Nouvelles non traduites"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Nouvelles non traduites"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Pages de consultants et d'utilisateurs non traduites"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Pages de consultants et d'utilisateurs non traduites"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Pages internationales non traduites"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Pages internationales non traduites"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Pages web traduites (à jour)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Chaînes traduites (fichiers PO)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Statistiques de traduction des fichiers PO"
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr "Approximatives"
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr "Non traduites"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Total :"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Page créée avec"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Pages web traduites"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Statistiques de traduction par nombre de pages"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Langue"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Traductions"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Pages web traduites (par taille)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Statistiques de traduction par taille de pages"
diff --git a/french/po/templates.fr.po b/french/po/templates.fr.po
index 9ea9b91e1c5..9d4f75c17b2 100644
--- a/french/po/templates.fr.po
+++ b/french/po/templates.fr.po
@@ -72,7 +72,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Retour à la <a href=\"m4_HOME/\">page d'accueil de Debian</a>."
#: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:149
+#: ../../english/template/debian/links.tags.wml:152
msgid "Home"
msgstr "Accueil"
@@ -113,7 +113,7 @@ msgid "Support"
msgstr "Assistance"
#: ../../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 "Le coin du développeur"
@@ -150,7 +150,7 @@ msgid "Miscellaneous"
msgstr "Divers"
#: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:107
msgid "Getting Debian"
msgstr "Obtenir Debian"
@@ -302,142 +302,148 @@ msgid "Debian Books"
msgstr "Livres Debian"
#: ../../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 "Archives des listes de diffusion"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Listes de diffusion"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Notre contrat social"
-#: ../../english/template/debian/links.tags.wml:49
+#: ../../english/template/debian/links.tags.wml:52
msgid "Code of Conduct"
msgstr "Code de conduite"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:55
msgid "Visit the site sponsor"
msgstr "Le site de notre sponsor"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr "Debian 5.0 - Le système d'exploitation universel"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Plan du site web Debian"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Base de données des développeurs"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr "FAQ Debian"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Charte Debian"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Référence du développeur Debian"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Guide du nouveau responsable"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Bogues critiques"
-#: ../../english/template/debian/links.tags.wml:79
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Rapports Lintian"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Archives des listes de diffusion pour utilisateurs"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Archives des listes de diffusion pour développeurs"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Archives des listes de diffusion pour l'internationalisation"
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Archives des listes de diffusion pour les portages"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:98
msgid "Archives for mailing lists of the Bug tracking system"
msgstr "Archives des listes de diffusion pour le système de suivi des bogues"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Archives des listes de diffusion de la section «&nbsp;divers&nbsp;»"
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Logiciel libre"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Développement"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Aider Debian"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Rapports de bogues"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Portages/Architectures"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Manuel d'installation"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Vendeurs de CD"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "Images ISO de CD/USB"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Installation par le réseau"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Préinstallée"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Projet Debian-Edu"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr "Alioth &ndash; Debian GForge"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "Assurance Qualité"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Système de suivi des paquets"
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Vue d'ensemble des paquets d'un responsable Debian"
@@ -520,32 +526,32 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Retour à la <a href=\"../\">page des utilisateurs de Debian</a>."
-#~ msgid ""
-#~ "<a href=\"m4_HOME/devel/website/using_cvs\">Checkout repository</a> | <a "
-#~ "href=\"http://anonscm.debian.org/viewvc/webwml/webwml/\">Browse "
-#~ "repository</a>"
-#~ msgstr ""
-#~ "<a href=\"m4_HOME/devel/website/using_cvs\">Récupérer les sources</a> | "
-#~ "<a href=\"http://anonscm.debian.org/viewvc/webwml/webwml/\">Naviguer dans "
-#~ "le dépôt</a>"
-
-#~ msgid "Select a server near you"
-#~ msgstr "Choisissez un serveur proche de vous"
+#~ msgid "More information:"
+#~ msgstr "Plus d'informations :"
-#~ msgid "Report it!"
-#~ msgstr "Signalez-le !"
+#~ msgid "Taken by:"
+#~ msgstr "Pris en charge par :"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Avez-vous découvert un problème dans la mise en page du site ?"
+#~ msgid "Nobody"
+#~ msgstr "Personne"
#~ msgid "Rating:"
#~ msgstr "Classement&nbsp;"
-#~ msgid "Nobody"
-#~ msgstr "Personne"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Avez-vous découvert un problème dans la mise en page du site ?"
-#~ msgid "Taken by:"
-#~ msgstr "Pris en charge par :"
+#~ msgid "Report it!"
+#~ msgstr "Signalez-le !"
-#~ msgid "More information:"
-#~ msgstr "Plus d'informations :"
+#~ msgid "Select a server near you"
+#~ msgstr "Choisissez un serveur proche de vous"
+
+#~ msgid ""
+#~ "<a href=\"m4_HOME/devel/website/using_cvs\">Checkout repository</a> | <a "
+#~ "href=\"http://anonscm.debian.org/viewvc/webwml/webwml/\">Browse "
+#~ "repository</a>"
+#~ msgstr ""
+#~ "<a href=\"m4_HOME/devel/website/using_cvs\">Récupérer les sources</a> | "
+#~ "<a href=\"http://anonscm.debian.org/viewvc/webwml/webwml/\">Naviguer dans "
+#~ "le dépôt</a>"
diff --git a/french/po/vendors.fr.po b/french/po/vendors.fr.po
index cce02384686..90840b33775 100644
--- a/french/po/vendors.fr.po
+++ b/french/po/vendors.fr.po
@@ -10,92 +10,85 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Vendeur :"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL de la page Debian :"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Accepte une donation à Debian :"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Pays :"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Expédition internationale :"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "mél :"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Type de CD :"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Type de DVD :"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Architectures :"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Vendeur"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Accepte une donation à Debian"
-#: ../../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 "Architectures"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Expédition internationale"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Contact"
#. ###################
#. 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 "Vendeur"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "page"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "courriel"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "en Europe"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "Dans certaines zones"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "source"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "et"
+
+#~ msgid "Architectures:"
+#~ msgstr "Architectures :"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Type de DVD :"
+
+#~ msgid "CD Type:"
+#~ msgstr "Type de CD :"
+
+#~ msgid "email:"
+#~ msgstr "mél :"
+
+#~ msgid "Ship International:"
+#~ msgstr "Expédition internationale :"
+
+#~ msgid "Country:"
+#~ msgstr "Pays :"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Accepte une donation à Debian :"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL de la page Debian :"
+
+#~ msgid "Vendor:"
+#~ msgstr "Vendeur :"
diff --git a/french/po/vote.fr.po b/french/po/vote.fr.po
index 3545fe60bdc..2e5dc89672a 100644
--- a/french/po/vote.fr.po
+++ b/french/po/vote.fr.po
@@ -22,229 +22,251 @@ msgid "Time Line"
msgstr "Calendrier"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Nominations"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Débat"
-#: ../../english/template/debian/votebar.wml:25
+#: ../../english/template/debian/votebar.wml:28
msgid "Platforms"
msgstr "Plates-formes"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Proposer"
msgstr "Déposant"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "Déposant de la proposition A"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "Déposant de la proposition B"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "Déposant de la proposition C"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "Déposant de la proposition D"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "Déposant de la proposition E"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "Déposant de la proposition F"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Seconds"
msgstr "Parrains"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
msgid "Proposal A Seconds"
msgstr "Parrains de la proposition A"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "Parrains de la proposition B"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "Parrains de la proposition C"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "Parrains de la proposition D"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "Parrains de la proposition E"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "Parrains de la proposition F"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
msgid "Opposition"
msgstr "Opposition"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
msgid "Text"
msgstr "Texte"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal A"
msgstr "Proposition A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "Proposition B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "Proposition C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "Proposition D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "Proposition E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "Proposition F"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
msgid "Choices"
msgstr "Choix"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
msgid "Amendment Proposer"
msgstr "Déposant de l'amendement"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
msgid "Amendment Seconds"
msgstr "Parrains de l'amendement"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
msgid "Amendment Text"
msgstr "Texte de l'amendement"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
msgid "Amendment Proposer A"
msgstr "Déposant de l'amendement A"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "Parrains de l'amendement A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "Texte de l'amendement A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "Déposant de l'amendement B"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "Parrains de l'amendement B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "Texte de l'amendement B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "Déposant de l'amendement A"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "Parrains de l'amendement A"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "Texte de l'amendement A"
+
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendments"
msgstr "Amendements"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:139
msgid "Proceedings"
msgstr "Compte-rendu"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:142
msgid "Majority Requirement"
msgstr "Majorités requises"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:145
msgid "Data and Statistics"
msgstr "Données et statistiques"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:148
msgid "Quorum"
msgstr "Quorum"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:151
msgid "Minimum Discussion"
msgstr "Discussion minimale"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:154
msgid "Ballot"
msgstr "Bulletin"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:157
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:160
msgid "Outcome"
msgstr "Résultat"
-#: ../../english/template/debian/votebar.wml:152
+#: ../../english/template/debian/votebar.wml:164
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "En&nbsp;attente&nbsp;de&nbsp;sponsors"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "En&nbsp;discussion"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Vote&nbsp;ouvert"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Décidé"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Annulé"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Autre"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Page&nbsp;d'accueil&nbsp;des&nbsp;votes"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Aide"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Soumettre&nbsp;une&nbsp;proposition"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Amender&nbsp;une&nbsp;proposition"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Appuyer&nbsp;une&nbsp;proposition"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Lire&nbsp;un&nbsp;résultat"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Vote"
diff --git a/galician/po/cdimage.gl.po b/galician/po/cdimage.gl.po
index 60b528b9df4..44913225a4e 100644
--- a/galician/po/cdimage.gl.po
+++ b/galician/po/cdimage.gl.po
@@ -13,18 +13,16 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\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 " Pegada dixital da chave"
-#: ../../english/devel/debian-installer/images.data:90
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "Imaxes ISO"
-#: ../../english/devel/debian-installer/images.data:91
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "Ficheiros «Jigdo»"
@@ -124,4 +122,3 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Lista de correo pública</a> de fala "
"inglesa para CDs/DVDs:"
-
diff --git a/galician/po/consultants.gl.po b/galician/po/consultants.gl.po
index 72f5b2dbc10..ef46baa5eda 100644
--- a/galician/po/consultants.gl.po
+++ b/galician/po/consultants.gl.po
@@ -75,4 +75,3 @@ msgstr "Lista de asesores técnicos"
#: ../../english/template/debian/consultant.wml:9
msgid "Back to the <a href=\"./\">Debian consultants page</a>."
msgstr "Volver á <a href=\"./\">páxina de asesores técnicos de Debian</a>."
-
diff --git a/galician/po/distrib.gl.po b/galician/po/distrib.gl.po
index ca208103da9..6087e10e4bf 100644
--- a/galician/po/distrib.gl.po
+++ b/galician/po/distrib.gl.po
@@ -132,61 +132,71 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
+#, fuzzy
+#| msgid "64-bit PC (amd64)"
+msgid "64-bit ARM (AArch64)"
+msgstr "PC de 64 bits (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 "Hard Float ABI ARM"
-#: ../../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 para PC de 32 bits (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr "PC de 32 bits (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 para PC de 32 bits (i386)"
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr "kFreeBSD para PC de 64 bits (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 "IBM System z"
-#: ../../english/releases/arches.data:25
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr "SPARC"
diff --git a/galician/po/doc.gl.po b/galician/po/doc.gl.po
index 47fae7c165a..1f4611c29fe 100644
--- a/galician/po/doc.gl.po
+++ b/galician/po/doc.gl.po
@@ -12,127 +12,24 @@ msgstr ""
"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/doc/books.def:41
-msgid "email:"
-msgstr "correo electrónico:"
-
-#: ../../english/doc/books.def:45
-msgid "Available at:"
-msgstr "Dispoñíbel en:"
-
-#: ../../english/doc/books.def:48
-msgid "CD Included:"
-msgstr "CD incluído:"
-
-#: ../../english/doc/books.def:51
-msgid "Publisher:"
-msgstr "Editorial:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Autores:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Editores:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Mantedor:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Estado:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Dispoñibilidade:"
-
-#: ../../english/doc/manuals.defs:92
-msgid "Latest version:"
-msgstr "Última versión:"
-
-#: ../../english/doc/manuals.defs:108
-msgid "(version <get-var version />)"
-msgstr "(versión <get-var version />)"
-
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:34
-msgid "plain text"
-msgstr "texto plano"
-
-#: ../../english/doc/manuals.defs:154
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
-msgstr ""
-"As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-"href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a>."
-
-#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
-msgid "Web interface: "
-msgstr "Interface web: "
-
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
-msgid "VCS interface: "
-msgstr "Interface VCS: "
-
-#: ../../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 ""
-"As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-"href="
-"\"https://packages.debian.org/cvs\">CVS</a>."
-
-#: ../../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 ""
-"As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-"href="
-"\"https://packages.debian.org/subversion\">Subversion</a>."
-
-#: ../../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 ""
-"As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
-"href="
-"\"https://packages.debian.org/git\">Git</a>."
-
-#: ../../english/doc/manuals.defs:188
+#: ../../english/doc/books.data:32
msgid ""
-"CVS sources working copy: set <code>CVSROOT</code>\n"
-" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-" and check out the <kbd>boot-floppies/documentation</kbd> module."
+"\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 ""
-"Copia de traballo das fontes en CVS: poña <code>CVSROOT</code>\n"
-" a <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-" e obteña o módulo <kbd>boot-floppies/documentation</kbd>."
-
-#: ../../english/doc/manuals.defs:193
-msgid "CVS via web"
-msgstr "CVS vía web"
-
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
-msgid "Debian package"
-msgstr "paquete Debian"
-
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
-msgid "Debian package (archived)"
-msgstr "paquete Debian (arquivado)"
-#: ../../english/doc/books.data:30
+#: ../../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"
@@ -157,7 +54,7 @@ msgstr ""
"avanzados como a configuración de SELinux para asegurar servizos, "
"instalacións automatizadas ou virtualización mediante Xen, KVM ou LXC."
-#: ../../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"
@@ -170,15 +67,15 @@ msgstr ""
"exhaustivo coa asistencia básica ao usuario que instala e mantén o sistema "
"el mesmo (tanto se é na casa como na oficina, en asociacións ou na escola)."
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "CD de Sarge co instalador e unha selección de paquetes"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "Live Cd con Knoppix"
-#: ../../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"
@@ -192,13 +89,13 @@ msgstr ""
"información básica do proxecto e unha cobertura extensa do sistema de "
"xestión de paquetes de Debian."
-#: ../../english/doc/books.data:77 ../../english/doc/books.data:180
-#: ../../english/doc/books.data:224 ../../english/doc/books.data:269
+#: ../../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 "Debian GNU/Linux 3.1r0a «sarge» oficial en DVD (i386)"
-#: ../../english/doc/books.data:80 ../../english/doc/books.data:183
-#: ../../english/doc/books.data:227 ../../english/doc/books.data:272
+#: ../../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"
@@ -224,7 +121,7 @@ msgstr ""
"estándar de Linux para comezar a experiencia propia en Linux ca filosofía de "
"abaixo a arriba de Debian. "
-#: ../../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 -- "
@@ -239,11 +136,11 @@ msgstr ""
"que o software que o libro describe, este libro ten «copyleft» e as fontes "
"están dispoñíbeis."
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
msgid "Debian 2.2 ARM architecture"
msgstr "Debian 2.2 arquitectura ARM"
-#: ../../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, "
@@ -274,7 +171,7 @@ msgstr ""
"baseada moi de preto en Debian ARM e asúmese que se traballará en esa "
"distribución e preferiblemente tendo tamén unha máquina baseada en Debian."
-#: ../../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"
@@ -287,11 +184,11 @@ msgstr ""
"guiados por Bill McCarty en <q>Learning Debian GNU/Linux (Aprendendo Debian "
"GNU/Linux)</q>."
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
msgid "Debian 2.1"
msgstr "Debian 2.1"
-#: ../../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"
@@ -304,11 +201,11 @@ msgstr ""
"simpáticas e multimedia. Inclúe 30 días de asistencia gratuíta por correo "
"electrónico."
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "DVD Debian Squeeze i386/amd64"
-#: ../../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"
@@ -327,15 +224,27 @@ msgstr ""
"mellorar o seu dominio das ferramentas de Debian e ao administrador que "
"quere construír unha rede fiábel con Debian."
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "dúas edicións: unha sen DVD, a outra con dous DVDs (i386)"
-#: ../../english/doc/books.data:213
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 e amd64) en DVD"
-#: ../../english/doc/books.data:216
+#: ../../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 "
@@ -348,14 +257,14 @@ msgstr ""
"versión actual 6.0) e ofrece un manual práctico para todos os usuarios que "
"queiran aprender máis sobre Debian e o seu abanico de servizos."
-#: ../../english/doc/books.data:244
+#: ../../english/doc/books.data:287
msgid ""
"2 editions: One with no CD, the other with Official CD (i386, contrib and "
"sources)"
msgstr ""
"Dúas edicións: Unha sen CD, outra co CD oficial (i386, contrib e fontes)"
-#: ../../english/doc/books.data:247
+#: ../../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"
@@ -383,11 +292,11 @@ msgstr ""
"administración do sistema, como planificar e construír un encamiñador «dial-"
"in» ou un servidor para clientes baseados en Windows (Samba)."
-#: ../../english/doc/books.data:290
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "Instalador de Debian GNU/Linux 3.1 Sarge (un só CD)"
-#: ../../english/doc/books.data:293
+#: ../../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"
@@ -398,13 +307,13 @@ msgstr ""
"medios, a personalización do escritorio, resolución de problemas e unha "
"proveitosa lista de receitas, entre outras cousas."
-#: ../../english/doc/books.data:306
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
msgstr "Debian GNU/Linux 3.1r0 i386, edición do autor (DVD + CD)"
-#: ../../english/doc/books.data:310
+#: ../../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"
@@ -422,11 +331,11 @@ msgstr ""
"Este libro pode ser útil para todos os usuarios de Debian, desde os "
"principiantes aos usuarios avanzados."
-#: ../../english/doc/books.data:325
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr "Debian 2.2r0 i386 edición do autor (3 CDs)"
-#: ../../english/doc/books.data:328
+#: ../../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"
@@ -441,11 +350,11 @@ msgstr ""
"servidores e demais. Poderá instalar e comezar a usar o ambiente en xaponés "
"de Debian GNU/Linux de forma doada cos CDs personalizados."
-#: ../../english/doc/books.data:344
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "un non oficial de Woody e tres de Potato rev0"
-#: ../../english/doc/books.data:347
+#: ../../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 "
@@ -461,11 +370,11 @@ msgstr ""
"en Debian GNU/Linux. Este libro tamén inclúe unha guía para mantedores, o "
"que estimula a xente en Corea a converterse en mantedores oficiais de Debian."
-#: ../../english/doc/books.data:361
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr "Tres CDs oficiais de Potato r3 e un CD non oficial de Woody"
-#: ../../english/doc/books.data:364
+#: ../../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"
@@ -482,11 +391,11 @@ msgstr ""
"consellos para configurar Debian para un ambiente en lingua coreana, e tamén "
"resulta bo para os non iniciados."
-#: ../../english/doc/books.data:386
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "Debian GNU/Linux 3.1r0 CD1"
-#: ../../english/doc/books.data:389
+#: ../../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"
@@ -498,7 +407,7 @@ msgstr ""
"devasas, correos electrónicos, ftp entre outros. Tamén lle axuda a comezar "
"usando GNU/Linux e o potente sistema de xestión de paquetes de Debian."
-#: ../../english/doc/books.data:405
+#: ../../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 "
@@ -525,7 +434,7 @@ msgstr ""
"estudantes e a calquera que queira aprender GNU/Linux en profundidade. Este "
"libro basease en Debian Sarge."
-#: ../../english/doc/books.data:428
+#: ../../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 "
@@ -541,15 +450,138 @@ msgstr ""
"de ler levarao da man para acadar obxectivos específicos co sistema "
"operativo Debian GNU/Linux."
-#: ../../english/releases/arches.data:32
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../../english/doc/books.def:41
+msgid "email:"
+msgstr "correo electrónico:"
+
+#: ../../english/doc/books.def:45
+msgid "Available at:"
+msgstr "Dispoñíbel en:"
+
+#: ../../english/doc/books.def:48
+msgid "CD Included:"
+msgstr "CD incluído:"
+
+#: ../../english/doc/books.def:51
+msgid "Publisher:"
+msgstr "Editorial:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Autores:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Editores:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Mantedor:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Dispoñibilidade:"
+
+#: ../../english/doc/manuals.defs:92
+msgid "Latest version:"
+msgstr "Última versión:"
+
+#: ../../english/doc/manuals.defs:108
+msgid "(version <get-var version />)"
+msgstr "(versión <get-var version />)"
+
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
+msgid "plain text"
+msgstr "texto plano"
+
+#: ../../english/doc/manuals.defs:154
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+msgstr ""
+"As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
+"href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
+
+#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
+#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+msgid "Web interface: "
+msgstr "Interface web: "
+
+#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+msgid "VCS interface: "
+msgstr "Interface VCS: "
+
+#: ../../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 ""
+"As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
+"href=\"https://packages.debian.org/cvs\">CVS</a>."
+
+#: ../../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 ""
+"As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
+"href=\"https://packages.debian.org/subversion\">Subversion</a>."
+
+#: ../../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 ""
+"As últimas fontes <get-var srctype /> están dispoñíbeis no repositorio <a "
+"href=\"https://packages.debian.org/git\">Git</a>."
+
+#: ../../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"
+" and check out the <kbd>boot-floppies/documentation</kbd> module."
+msgstr ""
+"Copia de traballo das fontes en CVS: poña <code>CVSROOT</code>\n"
+" a <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+" e obteña o módulo <kbd>boot-floppies/documentation</kbd>."
+
+#: ../../english/doc/manuals.defs:193
+msgid "CVS via web"
+msgstr "CVS vía web"
+
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+msgid "Debian package"
+msgstr "paquete Debian"
+
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+msgid "Debian package (archived)"
+msgstr "paquete Debian (arquivado)"
+
+#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
msgid "PDF"
msgstr "PDF"
#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Use <a href=\"cvs\">SVN</a> para descargar o texto fonte en SGML de <get-"
+#~ "var ddp_pkg_loc />."
+
+#~ 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 "
@@ -561,10 +593,3 @@ msgstr "PDF"
#~ " publicación </a> alternativa en Lehmanns Fachbuchhandlung e custa "
#~ "29.95\n"
#~ " euros (en 2008)."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Use <a href=\"cvs\">SVN</a> para descargar o texto fonte en SGML de <get-"
-#~ "var ddp_pkg_loc />."
diff --git a/galician/po/newsevents.gl.po b/galician/po/newsevents.gl.po
index 231c7d58fad..6ac35c40cfc 100644
--- a/galician/po/newsevents.gl.po
+++ b/galician/po/newsevents.gl.po
@@ -28,27 +28,27 @@ msgstr "p<get-var page />"
msgid "The newsletter for the Debian community"
msgstr "O boletín de novas da comunidade Debian"
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr "Nome:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "Correo electrónico:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Charlas anteriores:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Idiomas:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Localización:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Temas:"
@@ -238,13 +238,12 @@ msgid ""
"announcements."
msgstr ""
"Teña en conta que esta é unha selección dos avisos de seguridade máis "
-"importantes das últimas "
-"semanas. Se precisa estar ao día dos avisos de seguridade publicados polo "
-"equipo de seguridade de Debian, subscríbase á <a href=\"<get-var url-dsa />\">"
-" "
-"lista de correo de seguridade</a> (e á <a href=\"<get-var url-bpo />lista "
-"independente de «backports»</a> e á <get-var url-stable-announce />lista de "
-"actualizacións de «stable»</a>) para recibir avisos."
+"importantes das últimas semanas. Se precisa estar ao día dos avisos de "
+"seguridade publicados polo equipo de seguridade de Debian, subscríbase á <a "
+"href=\"<get-var url-dsa />\"> lista de correo de seguridade</a> (e á <a "
+"href=\"<get-var url-bpo />lista independente de «backports»</a> e á <get-var "
+"url-stable-announce />lista de actualizacións de «stable»</a>) para recibir "
+"avisos."
#: ../../english/template/debian/projectnews/boilerplates.wml:176
msgid ""
@@ -258,16 +257,13 @@ msgid ""
"stable /></q>, the oldstable distribution) for announcements."
msgstr ""
"Teña en conta que esta é unha selección dos avisos de seguridade máis "
-"importantes das últimas "
-"semanas. Se precisa estar ao día dos avisos de seguridade publicados polo "
-"equipo de seguridade de Debian, subscríbase á <a href=\"<get-var url-dsa />\">"
-" "
-"lista de correo de seguridade</a> (e á <a href=\"<get-var url-bpo />lista "
-"independente de «backports»</a> e á <get-var url-stable-announce />lista de "
-"actualizacións de «stable»</a> ou á <a href="
-"\"<get-var url-volatile-announce />\">lista de «volatile»</a> para <q><"
-"get-var old-"
-"stable /></q>) para recibir avisos."
+"importantes das últimas semanas. Se precisa estar ao día dos avisos de "
+"seguridade publicados polo equipo de seguridade de Debian, subscríbase á <a "
+"href=\"<get-var url-dsa />\"> lista de correo de seguridade</a> (e á <a "
+"href=\"<get-var url-bpo />lista independente de «backports»</a> e á <get-var "
+"url-stable-announce />lista de actualizacións de «stable»</a> ou á <a href="
+"\"<get-var url-volatile-announce />\">lista de «volatile»</a> para <q><get-"
+"var old-stable /></q>) para recibir avisos."
#: ../../english/template/debian/projectnews/boilerplates.wml:185
msgid ""
@@ -275,8 +271,7 @@ msgid ""
"package: "
msgstr ""
"O equipo da versión estábel de Debian publicou un anuncio de actualización "
-"para "
-"o paquete:"
+"para o paquete:"
#: ../../english/template/debian/projectnews/boilerplates.wml:187
#: ../../english/template/debian/projectnews/boilerplates.wml:200
@@ -309,7 +304,8 @@ msgstr "Léaos coidadosamente e tome as medidas oportunas."
#: ../../english/template/debian/projectnews/boilerplates.wml:198
msgid "Debian's Backports Team released advisories for these packages: "
msgstr ""
-"O equipo de «backports» de Debian publicou avisos para os seguintes paquetes: "
+"O equipo de «backports» de Debian publicou avisos para os seguintes "
+"paquetes: "
#: ../../english/template/debian/projectnews/boilerplates.wml:211
msgid ""
@@ -345,14 +341,12 @@ msgid ""
"America</a>, <a href=\"<get-var events-ml-na />\">North America</a>."
msgstr ""
"Pode atopar máis información sobre os eventos relacionados con Debian e "
-"sobre charlas na <a href=\"<get-var events-section />\">sección de eventos<"
-"/a> do "
-"sitio web de Debian, ou subscribíndose a unha das nosas listas de correos de "
-"eventos "
-"para diferentes rexións: <a href=\"<get-var events-ml-eu />\">Europa</a>, <a "
-"href=\"<get-var events-"
-"ml-nl />\">Holanda</a>, <a href=\"<get-var events-ml-ha />\">América Latina<"
-"/a>, <a href=\"<get-var events-ml-na />\">América do Norte</a>."
+"sobre charlas na <a href=\"<get-var events-section />\">sección de eventos</"
+"a> do sitio web de Debian, ou subscribíndose a unha das nosas listas de "
+"correos de eventos para diferentes rexións: <a href=\"<get-var events-ml-eu /"
+">\">Europa</a>, <a href=\"<get-var events-ml-nl />\">Holanda</a>, <a href="
+"\"<get-var events-ml-ha />\">América Latina</a>, <a href=\"<get-var events-"
+"ml-na />\">América do Norte</a>."
#: ../../english/template/debian/projectnews/boilerplates.wml:300
msgid ""
@@ -363,11 +357,10 @@ msgid ""
"Events Team</a>."
msgstr ""
"Quere organizar un posto de Debian ou unha festa de instalacións? Está ao "
-"tanto "
-"de outros eventos relacionados con Debian? Deu unha charla sobre Debian que "
-"quere ligar na <a href=\"<get-var events-talks />\">páxina de charlas</a>? "
-"Envíe un "
-"correo ao <a href=\"<get-var events-team />\">equipo de eventos de Debian</a>."
+"tanto de outros eventos relacionados con Debian? Deu unha charla sobre "
+"Debian que quere ligar na <a href=\"<get-var events-talks />\">páxina de "
+"charlas</a>? Envíe un correo ao <a href=\"<get-var events-team />\">equipo "
+"de eventos de Debian</a>."
#: ../../english/template/debian/projectnews/boilerplates.wml:322
msgid ""
@@ -399,10 +392,9 @@ msgid ""
"Debian Project News. Please welcome <get-var eval-newcontributors-name-list /"
"> into our project!"
msgstr ""
-"<get-var eval-newcontributors-text-list /> desde o último número das novas de "
-"Debian. "
-"Déalle a benvida a <get-var eval-newcontributors-name-list /> ao noso "
-"proxecto!"
+"<get-var eval-newcontributors-text-list /> desde o último número das novas "
+"de Debian. Déalle a benvida a <get-var eval-newcontributors-name-list /> ao "
+"noso proxecto!"
#: ../../english/template/debian/projectnews/boilerplates.wml:394
msgid ""
@@ -410,18 +402,23 @@ msgid ""
"news />\">miscellaneous news for developers</a> has been released and covers "
"the following topics:"
msgstr ""
-"Publicouse o <get-var issue-devel-news /> número das <a href=\"<get-var "
-"url-devel-"
-"news />\">novas variadas para os desenvolvedores</a> e toca os seguintes "
-"temas:"
+"Publicouse o <get-var issue-devel-news /> número das <a href=\"<get-var url-"
+"devel-news />\">novas variadas para os desenvolvedores</a> e toca os "
+"seguintes temas:"
#: ../../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 ""
-"Para recibir este boletín quincenal no seu correo, <a href=\"https://lists."
-"debian.org/debian-news/\">subscríbase á lista de correo debian-news</a>."
+"Para recibir este boletín semanalmente no seu correo, <a href=\"https://"
+"lists.debian.org/debian-news/\">subscríbase á lista de correos debian-news</"
+"a>."
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
@@ -506,8 +503,9 @@ 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>."
msgstr ""
-"Para recibir este boletín semanalmente no seu correo, <a href=\"https://lists."
-"debian.org/debian-news/\">subscríbase á lista de correos debian-news</a>."
+"Para recibir este boletín semanalmente no seu correo, <a href=\"https://"
+"lists.debian.org/debian-news/\">subscríbase á lista de correos debian-news</"
+"a>."
#. One editor name only
#: ../../english/template/debian/weeklynews/footer.wml:15
@@ -545,3 +543,11 @@ msgstr ""
"<void id=\"plural\" />Este número das novas semanais de Debian foi editado "
"por <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 ""
+#~ "Para recibir este boletín quincenal no seu correo, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscríbase á lista de correo debian-"
+#~ "news</a>."
diff --git a/galician/po/organization.gl.po b/galician/po/organization.gl.po
index 31fbce9711a..64119e16d7d 100644
--- a/galician/po/organization.gl.po
+++ b/galician/po/organization.gl.po
@@ -74,7 +74,7 @@ msgid "Officers"
msgstr "Dirixentes"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribución"
@@ -84,11 +84,11 @@ msgid "Publicity"
msgstr "Publicidade"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Asistencia e infraestrutura"
-#. 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 "Debian Pure Blends"
@@ -101,99 +101,99 @@ msgstr "Líder"
msgid "Technical Committee"
msgstr "Comité técnico"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Secretaría"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Proxectos de desenvolvemento"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Arquivos FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "Xestores do FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Asistentes do FTP"
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "Magos do FTP"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Equipo de backports"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Paquetes individuais"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Xestión das publicacións"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Equipo de publicación"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Garantía de calidade"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Equipo do sistema de instalación"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Notas da publicación"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Imaxes de CD"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Produción"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Probas"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Infraestrutura de construción automática"
-#: ../../english/intro/organization.data:140
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Equipo de peticións de construción"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Administración de buildd"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Documentación"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Lista de paquetes que precisan traballo e por crear"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Equipo do sistema Live"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Adaptacións"
@@ -221,79 +221,71 @@ msgstr "Contacto coa prensa"
msgid "Partner Program"
msgstr "Programa de socios"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Eventos"
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Novas breves de Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Asistencia ao usuario"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Sistema de seguimento dos informes de fallos"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administración das listas de correo o dos seus arquivos"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Recepción de novos membros"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Xestores de contas de Debian"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Mantedores dos chaveiros (PGP e GPG)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Mantedores do chaveiro de mantedores de Debian (DM)"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Equipo de seguridade"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "Equipo de seguridade en testing"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Proxecto de auditoría de seguridade"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Páxinas web"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Páxina de asesores técnicos"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Páxina de vendedores de CDs"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Planeta Debian"
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Políticas"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Administración de sistemas"
-#: ../../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."
@@ -302,7 +294,7 @@ msgstr ""
"de Debian, incluídos problemas cos contrasinais ou se precisa que se instale "
"un paquete."
-#: ../../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 "
@@ -312,75 +304,86 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">máquinas Debian</a>. Debería conter "
"información dos administradores de cada máquina."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Administrador do directorio LDAP de desenvolvedores"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Réplicas"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Mantedor do DNS"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Sistema de seguimento de paquetes"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Coordinador das doazóns de hardware"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Auditor"
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+#: ../../english/intro/organization.data:413
+#, fuzzy
+#| msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr "Peticións de uso da<a href=\"m4_HOME/trademark\">marca</a>"
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
-msgstr "Actual líder do proxecto Debian"
-
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Administradores de alioth"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Proxecto muller Debian"
-#: ../../english/intro/organization.data:443
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "Presidencias DebConf"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Anti-acoso"
-#: ../../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 para nenos de 1 a 99"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian para práctica e investigación médica"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian para a educación"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian en oficinas legais"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian para persoas con discapacidades"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian para investigación científica e relacionada"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Actual líder do proxecto Debian"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "Proxecto de auditoría de seguridade"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "Equipo de seguridade en testing"
diff --git a/galician/po/others.gl.po b/galician/po/others.gl.po
index 1949691133a..6bba9722226 100644
--- a/galician/po/others.gl.po
+++ b/galician/po/others.gl.po
@@ -60,6 +60,42 @@ msgstr "<void id=\"d-i\" />Descoñecido"
msgid "Unavailable"
msgstr "Non dispoñíbel"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "O recuncho dos novos membros"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Primeiro paso"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Segundo paso"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Terceiro paso"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Cuarto paso"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Quinto paso"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Sexto paso"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Sétimo paso"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Lista de verificación para os aspirantes"
+
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -123,6 +159,10 @@ msgstr "[Funciona con Debian]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (botón pequeno)"
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "o mesmo que arriba"
+
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Produtos"
@@ -167,30 +207,66 @@ msgstr "chapas"
msgid "basketball goals"
msgstr "canastras"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "pendentes"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "maletas"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr "paraugas"
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
msgstr "fundas para almofadas"
-#: ../../english/misc/merchandise.def:59
+#: ../../english/misc/merchandise.def:54
msgid "keychains"
msgstr "cadeas de chaves"
-#: ../../english/misc/merchandise.def:63
+#: ../../english/misc/merchandise.def:57
msgid "Swiss army knives"
msgstr "Navallas suízas"
+#: ../../english/misc/merchandise.def:61
+msgid "USB-Sticks"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Canto tempo leva usando Debian?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "É vostede un desenvolvedor de Debian?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "En que áreas de Debian está implicado?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Que fixo que lle interesara traballar con Debian?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+"Ten algún consello para as mulleres interesadas en implicarse máis en Debian?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr "Está implicado nalgún outro grupo de mulleres na tecnoloxía? Cales?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Algo máis acerca de vostede..."
+
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "Ben"
@@ -235,95 +311,17 @@ msgstr "Versión"
msgid "URL"
msgstr "URL"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "O recuncho dos novos membros"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Primeiro paso"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Segundo paso"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Terceiro paso"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Cuarto paso"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Quinto paso"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Sexto paso"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Sétimo paso"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Lista de verificación para os aspirantes"
-
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Requirido:"
+#~ msgid "Where:"
+#~ msgstr "Onde:"
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Quen:"
+#~ msgid "Specifications:"
+#~ msgstr "Especificacións:"
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Arquitectura:"
+#~ msgid "Architecture:"
+#~ msgstr "Arquitectura:"
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Especificacións:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Onde:"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "o mesmo que arriba"
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Canto tempo leva usando Debian?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "É vostede un desenvolvedor de Debian?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "En que áreas de Debian está implicado?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Que fixo que lle interesara traballar con Debian?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-"Ten algún consello para as mulleres interesadas en implicarse máis en Debian?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr "Está implicado nalgún outro grupo de mulleres na tecnoloxía? Cales?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Algo máis acerca de vostede..."
+#~ msgid "Who:"
+#~ msgstr "Quen:"
+#~ msgid "Wanted:"
+#~ msgstr "Requirido:"
diff --git a/galician/po/stats.gl.po b/galician/po/stats.gl.po
index fb1493cf3f6..bbc797e5fa6 100644
--- a/galician/po/stats.gl.po
+++ b/galician/po/stats.gl.po
@@ -28,75 +28,75 @@ msgstr "Hai %d bytes por traducir."
msgid "There are %d strings to translate."
msgstr "Hai %d cadeas por traducir."
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Esta tradución está demasiado desfasada"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "A versión da tradución é incorrecta"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "O orixinal é máis recente que esta tradución"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "O orixinal xa non existe"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "non hai número de visitas"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "visitas"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Pulse para obter datos de «diffstat»"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "«diff» unificado"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "«diff» coloreado"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Resumo da tradución para o"
-#: ../../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 "Sen traducir"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Desfasado"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Traducido"
-#: ../../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 "Actualizado"
-#: ../../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 "ficheiros"
-#: ../../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 "bytes"
-#: ../../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."
@@ -104,134 +104,134 @@ msgstr ""
"Nota: as listas de páxinas están ordenadas por popularidade. Pase por riba "
"do nome da páxina para ver o número de visitas."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Traducións desfasadas"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "Ficheiro"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Diferenzas"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Comentario"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Rexistro"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Tradución"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Mantedor"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Estado"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Tradutor"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Data"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "As páxinas xerais non están traducidas"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Páxinas xerais sen traducir"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "As novas non están traducidas"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Novas non traducidas"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "As páxinas de usuarios/asistentes técnicos non están traducidas"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Páxinas de asistentes técnicos/usuarios non traducidas"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "As páxinas internacionais non están traducidas"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Páxinas internacionais non traducidas"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Páxinas traducidas (actualizadas)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Modelos traducidos (ficheiros PO)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Estatísticas de traducións PO"
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr "Dubidosas"
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr "Sen traducir"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Total:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Creado con"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Páxinas web traducidas"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Estatísticas de tradución por número de páxinas"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Idioma"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Traducións"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Páxinas web traducidas (por tamaño)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Estatísticas de tradución por tamaño de páxina"
diff --git a/galician/po/templates.gl.po b/galician/po/templates.gl.po
index 731145f4a12..beca461b3b8 100644
--- a/galician/po/templates.gl.po
+++ b/galician/po/templates.gl.po
@@ -60,7 +60,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Volver á <a href=\"m4_HOME/\">páxina de inicio do proxecto Debian</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 "Inicio"
@@ -101,7 +101,7 @@ msgid "Support"
msgstr "Asistencia"
#: ../../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 "Recuncho dos desenvolvedores"
@@ -138,12 +138,11 @@ msgid "Miscellaneous"
msgstr "Miscelánea"
#: ../../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 "Obter Debian"
#: ../../english/template/debian/common_translation.wml:82
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "A bitácora de Debian"
@@ -192,7 +191,7 @@ msgstr "na versión 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 "
@@ -206,25 +205,25 @@ msgstr ""
"de contacto de Debian</a>. O código fonte do sitio web está <a href="
"\"m4_HOME/devel/website/using_cvs\">dispoñíbel</a>."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Modificado por última vez"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Copyright"
-#: ../../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> e outras;"
-#: ../../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 ""
"Consulte <a href=\"m4_HOME/license\" rel=\"copyright\">os termos da licenza</"
"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."
@@ -288,138 +287,150 @@ msgid "Debian Books"
msgstr "Libros de Debian"
#: ../../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 "Arquivos das listas de correo"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Listas de correo"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Contrato social"
-#: ../../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 "Visite o sitio do patrocinador"
-#: ../../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 - O sistema operativo universal"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Mapa do sitio web de Debian"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Base de datos de desenvolvedores"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr "FAQ de Debian"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Manual de políticas de Debian"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Referencia dos desenvolvedores"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Guía do novo mantedor"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Fallos críticos para a publicación"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Informes de «Lintian»"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Arquivos das listas de correo de usuarios"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Arquivos das listas de desenvolvedores"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Arquivos das listas de correo de i18n/l10n"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Arquivos das listas de correo das adaptacións"
-#: ../../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 "Arquivos das listas de correo do sistema de seguimento de fallos"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Arquivos das listas de correo misceláneas"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Software libre"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Desenvolvemento"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Axuda a Debian"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Informes de fallos"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Adaptacións/Arquitecturas"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Manual de instalación"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Vendedores de CDs"
-#: ../../english/template/debian/links.tags.wml:122
-msgid "CD ISO images"
+#: ../../english/template/debian/links.tags.wml:128
+#, fuzzy
+#| msgid "CD ISO images"
+msgid "CD/USB ISO images"
msgstr "Imaxes ISO de CD"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Instalación por rede"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Preinstalado"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Proxecto Debian-Edu"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr "Alioth &ndash; O «GForge» de Debian"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "Garantía de calidade"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Sistema de seguimento de paquetes"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Vista xeral dos paquetes dos desenvolvedores de Debian"
@@ -501,4 +512,3 @@ msgstr "URL"
#: ../../english/template/debian/users.wml:7
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Volver á <a href=\"../\">páxina «Quen está a usar Debian?»</a>."
-
diff --git a/galician/po/vendors.gl.po b/galician/po/vendors.gl.po
index a4255a80447..1fbfa8cbf3a 100644
--- a/galician/po/vendors.gl.po
+++ b/galician/po/vendors.gl.po
@@ -12,92 +12,85 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Vendedor:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL da páxina de Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Permite contribucións a Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "País:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Envíos internacionais:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "correo:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Tipo de CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Tipo de DVD"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Arquitecturas:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Vendedor"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Permite contribucións"
-#: ../../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 "Arquitecturas"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Envíos internacionais"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Contacto"
#. ###################
#. 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 "Páxina principal do vendedor"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "páxina"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "correo"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "en Europa"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "A algunhas áreas"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "fonte"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "e"
+
+#~ msgid "Architectures:"
+#~ msgstr "Arquitecturas:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Tipo de DVD"
+
+#~ msgid "CD Type:"
+#~ msgstr "Tipo de CD:"
+
+#~ msgid "email:"
+#~ msgstr "correo:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Envíos internacionais:"
+
+#~ msgid "Country:"
+#~ msgstr "País:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Permite contribucións a Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL da páxina de Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Vendedor:"
diff --git a/galician/po/vote.gl.po b/galician/po/vote.gl.po
index 7482784b81e..7476816f994 100644
--- a/galician/po/vote.gl.po
+++ b/galician/po/vote.gl.po
@@ -21,229 +21,251 @@ msgid "Time Line"
msgstr "Liña de tempo"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Nomeamentos"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Debate"
-#: ../../english/template/debian/votebar.wml:25
+#: ../../english/template/debian/votebar.wml:28
msgid "Platforms"
msgstr "Plataformas"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Proposer"
msgstr "Propoñente"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "Propoñente da proposta A"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "Propoñente da proposta B"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "Propoñente da proposta B"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "Propoñente da proposta D"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "Propoñente da proposta E"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "Propoñente da proposta F"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Seconds"
msgstr "Avalistas"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
msgid "Proposal A Seconds"
msgstr "Avalan a proposta A"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "Avalan a proposta B"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "Avalan a proposta C"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "Avalan a proposta D"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "Avalan a proposta E"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "Avalan a proposta F"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
msgid "Opposition"
msgstr "Oposición"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
msgid "Text"
msgstr "Texto"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal A"
msgstr "Proposta A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "Proposta B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "Proposta C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "Proposta D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "Proposta E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "Proposta F"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
msgid "Choices"
msgstr "Opcións"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
msgid "Amendment Proposer"
msgstr "Propoñente de emendas"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
msgid "Amendment Seconds"
msgstr "Avalistas da emenda"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
msgid "Amendment Text"
msgstr "Texto da emenda"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
msgid "Amendment Proposer A"
msgstr "Propoñente de emenda A"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "Avalistas da emenda A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "Texto da emenda A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "Propoñente de emenda B"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "Avalistas da emenda B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "Texto da emenda B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "Propoñente de emenda A"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "Avalistas da emenda A"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "Texto da emenda A"
+
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendments"
msgstr "Emendas"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:139
msgid "Proceedings"
msgstr "Procedementos"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:142
msgid "Majority Requirement"
msgstr "Requirimento de maioría"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:145
msgid "Data and Statistics"
msgstr "Datos e estatísticas"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:148
msgid "Quorum"
msgstr "Quórum"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:151
msgid "Minimum Discussion"
msgstr "Discusión mínima"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:154
msgid "Ballot"
msgstr "Votación"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:157
msgid "Forum"
msgstr "Foro"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:160
msgid "Outcome"
msgstr "Resultado"
-#: ../../english/template/debian/votebar.wml:152
+#: ../../english/template/debian/votebar.wml:164
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Agardando&nbsp;por&nbsp;patrocinadores"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "En&nbsp;discusión"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Votación&nbps;aberta"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Decidida"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Retirada"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Outra"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Páxina de inicio das votacións"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Receita"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Enviar unha proposta"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Emendar unha proposta"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Seguir unha proposta"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Ler un resultado"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Votar"
diff --git a/german/po/cdimage.de.po b/german/po/cdimage.de.po
index 63c253e0dc4..ef08f0b189b 100644
--- a/german/po/cdimage.de.po
+++ b/german/po/cdimage.de.po
@@ -15,16 +15,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../english/CD/CD-keys.data:5 ../../english/CD/CD-keys.data:9
-#: ../../english/CD/CD-keys.data:14
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
msgid " Key fingerprint"
msgstr " Schl.-Fingerabdruck"
-#: ../../english/devel/debian-installer/images.data:92
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "ISO-Abbilder"
-#: ../../english/devel/debian-installer/images.data:93
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "Jigdo-Dateien"
diff --git a/german/po/doc.de.po b/german/po/doc.de.po
index 87b492c38d9..3152c5762cc 100644
--- a/german/po/doc.de.po
+++ b/german/po/doc.de.po
@@ -611,6 +611,16 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
+#~ msgid "Language:"
+#~ msgstr "Sprache:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Verwenden Sie <a href=\"cvs\">SVN</a>, um den SGML-Quelltext für <get-var "
+#~ "ddp_pkg_loc /> herunterzuladen."
+
#~ msgid ""
#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
#~ "mode=viewone&amp;titnr=254925022\">\n"
@@ -622,13 +632,3 @@ msgstr "PDF"
#~ "mode=viewone&amp;titnr=254925022\">\n"
#~ " Ausgabe</a> von Lehmanns Fachbuchhandlung ist für 29,95 € erhältlich\n"
#~ " (Stand 2008)."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Verwenden Sie <a href=\"cvs\">SVN</a>, um den SGML-Quelltext für <get-var "
-#~ "ddp_pkg_loc /> herunterzuladen."
-
-#~ msgid "Language:"
-#~ msgstr "Sprache:"
diff --git a/german/po/mailinglists.de.po b/german/po/mailinglists.de.po
index 2adc5ec3fb4..957805f1e94 100644
--- a/german/po/mailinglists.de.po
+++ b/german/po/mailinglists.de.po
@@ -136,8 +136,8 @@ msgstr "offen"
msgid "closed"
msgstr "geschlossen"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Bitte wählen Sie die Listen, die Sie abbestellen möchten:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Bitte wählen Sie die Listen, die Sie abonnieren möchten:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Bitte wählen Sie die Listen, die Sie abbestellen möchten:"
diff --git a/german/po/organization.de.po b/german/po/organization.de.po
index 4f5030949c4..5d18bf6efd7 100644
--- a/german/po/organization.de.po
+++ b/german/po/organization.de.po
@@ -80,17 +80,17 @@ msgid "Officers"
msgstr "Direktoren"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:79
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribution"
#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:221
+#: ../../english/intro/organization.data:220
msgid "Publicity"
msgstr "Öffentlichkeitsarbeit"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Unterstützung und Infrastruktur"
@@ -107,191 +107,191 @@ msgstr "Projektleiter"
msgid "Technical Committee"
msgstr "Technischer Ausschuss"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Schriftführer"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Entwicklungs-Projekte"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP-Archive"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "FTP-Master"
-#: ../../english/intro/organization.data:89
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "FTP-Mitarbeiter"
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "FTP-Berater"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Backports-Team"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Individuelle Pakete"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Release-Verwaltung"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Release-Team"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Qualitätssicherung"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Installationssystem-Team"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Veröffentlichungshinweise"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD-Images"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Produktion"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Testing"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Autobuilding-Infrastruktur"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Wanna-build-Team"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Buildd-Administration"
-#: ../../english/intro/organization.data:167
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Dokumentation"
-#: ../../english/intro/organization.data:172
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Liste der Arbeit-bedürfenden und voraussichtlichen Pakete"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Live-System-Team"
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Portierungen"
-#: ../../english/intro/organization.data:211
+#: ../../english/intro/organization.data:210
msgid "Special Configurations"
msgstr "Spezielle Konfigurationen"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:213
msgid "Laptops"
msgstr "Laptops"
-#: ../../english/intro/organization.data:215
+#: ../../english/intro/organization.data:214
msgid "Firewalls"
msgstr "Firewalls"
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:215
msgid "Embedded systems"
msgstr "Eingebettete Systeme"
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:223
msgid "Press Contact"
msgstr "Pressekontakt"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:229
msgid "Partner Program"
msgstr "Partner-Programm"
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Veranstaltungen"
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Neuigkeiten von Debian"
-#: ../../english/intro/organization.data:248
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Benutzer-Unterstützung"
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Fehlerdatenbank"
-#: ../../english/intro/organization.data:320
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Mailinglisten-Verwaltung und -Archive"
-#: ../../english/intro/organization.data:328
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Empfang (Front desk) für neue Mitglieder"
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Debian-Konten-Verwalter"
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Schlüsselring-Verwalter (PGP und GPG)"
-#: ../../english/intro/organization.data:343
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Schlüsselring-Betreuer für Debian-Betreuer (DM)"
-#: ../../english/intro/organization.data:347
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Sicherheitsteam"
-#: ../../english/intro/organization.data:362
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Webseiten"
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Beraterseite"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "CD-Distributoren-Seite"
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Policy"
-#: ../../english/intro/organization.data:386
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "System-Administration"
-#: ../../english/intro/organization.data:387
+#: ../../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."
@@ -300,7 +300,7 @@ msgstr ""
"Maschinen aufgetreten sind, auch wenn es sich um Passwort-Probleme handelt "
"oder wenn neue Pakete installiert werden sollen."
-#: ../../english/intro/organization.data:397
+#: ../../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 "
@@ -311,105 +311,104 @@ msgstr ""
"Rechner</a>, sie sollte Administrator-Informationen für jede Maschine "
"enthalten."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP-Entwickler-Verzeichnis-Verwalter"
-#: ../../english/intro/organization.data:399
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Spiegel"
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "DNS-Verwalter"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Paketverfolgungs-System"
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Hardware-Spenden-Koordination"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Kassenprüfer"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:413
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Anfragen zur Verwendung der <a name=\"trademark\" href=\"m4_HOME/trademark"
"\">Handelsmarken</a>"
-#: ../../english/intro/organization.data:417
-msgid "current Debian Project Leader"
-msgstr "derzeitiger Debian-Projektleiter"
-
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Alioth-Administratoren"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Debian-Women-Projekt"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "DebConf-Leitung"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Gegen Mobbing/Belästigung"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:436
msgid "Outreach"
msgstr "Outreach"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:446
msgid "Debian for children from 1 to 99"
msgstr "Debian für Kinder von 1 bis 99"
-#: ../../english/intro/organization.data:452
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian für die medizinische Praxis und Forschung"
-#: ../../english/intro/organization.data:455
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian für Bildung"
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian in Rechtsanwaltskanzleien"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian für Behinderte"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian für die Wissenschaft und zugehörige Forschung"
-#~ msgid "Testing Security Team"
-#~ msgstr "Testing-Sicherheitsteam"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (nicht aktiv: wurde nicht mit Squeeze veröffentlicht)"
-#~ msgid "Security Audit Project"
-#~ msgstr "Sicherheits-Audit-Projekt"
+#~ msgid "Vendors"
+#~ msgstr "Distributoren"
-#~ msgid "Volatile Team"
-#~ msgstr "Volatile-Team"
+#~ msgid "Handhelds"
+#~ msgstr "Handheldcomputer"
+
+#~ msgid "Marketing Team"
+#~ msgstr "Marketing-Team"
#~ msgid "Key Signing Coordination"
#~ msgstr "Schlüssel-Signierungs-Koordination"
-#~ msgid "Marketing Team"
-#~ msgstr "Marketing-Team"
+#~ msgid "Volatile Team"
+#~ msgstr "Volatile-Team"
-#~ msgid "Handhelds"
-#~ msgstr "Handheldcomputer"
+#~ msgid "Security Audit Project"
+#~ msgstr "Sicherheits-Audit-Projekt"
-#~ msgid "Vendors"
-#~ msgstr "Distributoren"
+#~ msgid "Testing Security Team"
+#~ msgstr "Testing-Sicherheitsteam"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (nicht aktiv: wurde nicht mit Squeeze veröffentlicht)"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "derzeitiger Debian-Projektleiter"
diff --git a/german/po/others.de.po b/german/po/others.de.po
index e658386adb0..f2cbc165900 100644
--- a/german/po/others.de.po
+++ b/german/po/others.de.po
@@ -318,17 +318,17 @@ msgstr "Version"
msgid "URL"
msgstr "Links"
-#~ msgid "Where:"
-#~ msgstr "Wo:"
+#~ msgid "Wanted:"
+#~ msgstr "Benötigt:"
-#~ msgid "Specifications:"
-#~ msgstr "Spezifikationen:"
+#~ msgid "Who:"
+#~ msgstr "Wer:"
#~ msgid "Architecture:"
#~ msgstr "Architektur:"
-#~ msgid "Who:"
-#~ msgstr "Wer:"
+#~ msgid "Specifications:"
+#~ msgstr "Spezifikationen:"
-#~ msgid "Wanted:"
-#~ msgstr "Benötigt:"
+#~ msgid "Where:"
+#~ msgstr "Wo:"
diff --git a/german/po/ports.de.po b/german/po/ports.de.po
index 0471a9fd144..b0627b02790 100644
--- a/german/po/ports.de.po
+++ b/german/po/ports.de.po
@@ -118,32 +118,32 @@ msgstr "Debian für PowerPC"
msgid "Debian for Sparc"
msgstr "Debian für Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian für Laptops"
-
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian für Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian für AMD64"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian für S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian für ARM"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian für MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian für Beowulf"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian für Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "Hauptseite"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Main"
-#~ msgstr "Hauptseite"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian für Motorola 680x0"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian für Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian für MIPS"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian für ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian für S/390"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian für AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian für Sparc64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian für Laptops"
diff --git a/german/po/stats.de.po b/german/po/stats.de.po
index dd47a6fe103..c0286e22ada 100644
--- a/german/po/stats.de.po
+++ b/german/po/stats.de.po
@@ -30,80 +30,75 @@ msgstr "Es sind %d Byte zu übersetzen."
msgid "There are %d strings to translate."
msgstr "Es sind %d Zeichenketten zu übersetzen."
-#. TRANSLATORS: The first string is hostname of the debian website mirror, second string is date and time.
-#: ../../english/template/debian/stats_tags.wml:23
-msgid "Hit data from %s, gathered %s."
-msgstr "Zugriffsdaten von %s, erfasst am %s."
-
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Diese Übersetzung ist zu alt"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Falsche Version übersetzt"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "Das Original ist aktueller als diese Übersetzung"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "Das Original existiert nicht mehr"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "Keine Zugriffszahlen"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "Zugriffe"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Klicken Sie, um diffstat-Daten zu erhalten"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "Einheitliche Unterschiede"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "Farbige Unterschiede"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Zusammenfassung der Übersetzung für"
-#: ../../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 "Nicht übersetzt"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Veraltet"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Übersetzt"
-#: ../../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 "Aktuell"
-#: ../../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 "Dateien"
-#: ../../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."
@@ -112,137 +107,140 @@ msgstr ""
"sortiert. Bewegen Sie den Mauszeiger auf den Seitennamen, um die Anzahl der "
"Zugriffe zu sehen."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Veraltete Übersetzungen"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "Datei"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Unterschiede"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Kommentar"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Protokoll"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Übersetzung"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Betreuer"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Übersetzer"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Datum"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Allgemeine Seiten, die nicht übersetzt sind"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Nicht übersetzte allgemeine Seiten"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Nachrichten, die nicht übersetzt sind"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Nicht übersetzte Nachrichten"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Berater-/Benutzerseiten, die nicht übersetzt sind"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Nicht übersetzte Berater-/Benutzerseiten"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Internationale Seiten, die nicht übersetzt sind"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Nicht übersetzte internationale Seiten"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Übersetzte Seiten (aktuell)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Übersetzte Vorlagen (PO-Dateien)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Statistik der PO-Übersetzung"
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr "Ungenau"
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr "Nicht übersetzt"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Insgesamt"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Insgesamt:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Erzeugt mit"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Übersetzte Webseiten"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Übersetzungsstatistik nach der Seitenanzahl"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Sprache"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Übersetzungen"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Übersetzte Webseiten (nach Größe)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Übersetzungsstatistik nach der Seitengröße"
#~ msgid "Origin"
#~ msgstr "Original"
+
+#~ msgid "Hit data from %s, gathered %s."
+#~ msgstr "Zugriffsdaten von %s, erfasst am %s."
diff --git a/german/po/templates.de.po b/german/po/templates.de.po
index 2fa9ef3fcd2..bd20a10f3c1 100644
--- a/german/po/templates.de.po
+++ b/german/po/templates.de.po
@@ -515,23 +515,23 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Zurück zur Seite »<a href=\"../\">Wer verwendet Debian?</a>«."
-#~ msgid "Select a server near you"
-#~ msgstr "Wählen Sie einen Server in Ihrer Nähe"
+#~ msgid "More information:"
+#~ msgstr "Weitere Informationen:"
-#~ msgid "Report it!"
-#~ msgstr "Melden Sie es!"
+#~ msgid "Taken by:"
+#~ msgstr "Übernommen von:"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Haben Sie ein Problem im Layout der Site entdeckt?"
+#~ msgid "Nobody"
+#~ msgstr "Niemandem"
#~ msgid "Rating:"
#~ msgstr "Bewertung:"
-#~ msgid "Nobody"
-#~ msgstr "Niemandem"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Haben Sie ein Problem im Layout der Site entdeckt?"
-#~ msgid "Taken by:"
-#~ msgstr "Übernommen von:"
+#~ msgid "Report it!"
+#~ msgstr "Melden Sie es!"
-#~ msgid "More information:"
-#~ msgstr "Weitere Informationen:"
+#~ msgid "Select a server near you"
+#~ msgstr "Wählen Sie einen Server in Ihrer Nähe"
diff --git a/german/po/vendors.de.po b/german/po/vendors.de.po
index e12f2edc029..b8d187bc2c0 100644
--- a/german/po/vendors.de.po
+++ b/german/po/vendors.de.po
@@ -14,106 +14,95 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Distributor:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL der Debian-Seite:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Erlaubt eine Spende an Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Land:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Versand ins Ausland:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "E-Mail:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Art der CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "DVD-Typ:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-#, fuzzy
-#| msgid "CD Type:"
-msgid "BD Type:"
-msgstr "Art der CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:15
-#, fuzzy
-#| msgid "CD Type:"
-msgid "USB Type:"
-msgstr "Art der CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:16
-msgid "Architectures:"
-msgstr "Architekturen:"
-
-#: ../../english/CD/vendors/vendors.CD.def:28
msgid "Vendor"
msgstr "Händler"
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Erlaubt Spenden"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../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:31
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr "Architekturen"
-#: ../../english/CD/vendors/vendors.CD.def:32
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Versand ins Ausland"
-#: ../../english/CD/vendors/vendors.CD.def:33
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Kontakt"
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:58
+#: ../../english/CD/vendors/vendors.CD.def:44
msgid "Vendor Home"
msgstr "Name des Händlers"
-#: ../../english/CD/vendors/vendors.CD.def:84
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "Seite"
-#: ../../english/CD/vendors/vendors.CD.def:85
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "E-Mail"
-#: ../../english/CD/vendors/vendors.CD.def:128
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "innerhalb Europas"
-#: ../../english/CD/vendors/vendors.CD.def:132
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "in bestimmten Gebieten"
-#: ../../english/CD/vendors/vendors.CD.def:136
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "Quellcode"
-#: ../../english/CD/vendors/vendors.CD.def:140
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "und"
+
+#~ msgid "Architectures:"
+#~ msgstr "Architekturen:"
+
+#, fuzzy
+#~| msgid "CD Type:"
+#~ msgid "USB Type:"
+#~ msgstr "Art der CD:"
+
+#, fuzzy
+#~| msgid "CD Type:"
+#~ msgid "BD Type:"
+#~ msgstr "Art der CD:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD-Typ:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Art der CD:"
+
+#~ msgid "email:"
+#~ msgstr "E-Mail:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Versand ins Ausland:"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Erlaubt eine Spende an Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL der Debian-Seite:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Distributor:"
diff --git a/greek/po/bugs.el.po b/greek/po/bugs.el.po
index 72886e11979..478ba76fa25 100644
--- a/greek/po/bugs.el.po
+++ b/greek/po/bugs.el.po
@@ -167,146 +167,146 @@ msgstr "παλαιότερα προβλήματα"
msgid "Archived and Unarchived"
msgstr ""
-#~ msgid "Exclude tag:"
-#~ msgstr "Χωρίς ετικέτα:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Συμπεριλαμβάνει ετικέτα:"
+#~ msgid "Flags:"
+#~ msgstr "Σημάνσεις:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "ενεργά προβλήματα"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "εμφάνισε τα συγχωνευμένα σφάλματα μια φορά"
-#~ msgid "wontfix"
-#~ msgstr "χωρίς λύση"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "χωρίς ταξινόμηση ανα κατάσταση ή σοβαρότητα"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "χωρίς εμφάνιση περιεχομένων στην κεφαλίδα"
-#~ msgid "unreproducible"
-#~ msgstr "μη επαναλαμβανόμενο"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "χωρίς εμφάνιση στατιστικών στο υποσέλιδο"
-#~ msgid "security"
-#~ msgstr "ασφάλεια"
+#~ msgid "proposed-updates"
+#~ msgstr "προτεινόμενες ενημερώσεις"
-#~ msgid "patch"
-#~ msgstr "εππίραμα"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "προτεινόμενες ενημερώσεις δοκιμαστικού"
-#~ msgid "moreinfo"
-#~ msgstr "περισσότερα"
+#~ msgid "Package version:"
+#~ msgstr "Έκδοση πακέτου"
-#~ msgid "l10n"
-#~ msgstr "τοπικοποίηση"
+#~ msgid "Distribution:"
+#~ msgstr "Διανομή:"
-#~ msgid "help"
-#~ msgstr "βοήθεια"
+#~ msgid "bugs"
+#~ msgstr "προβλήματα"
-#~ msgid "fixed-upstream"
-#~ msgstr "διορθωμένο upstream"
+#~ msgid "open"
+#~ msgstr "ανοιχτό"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "διορθωμένο στο πειραματικό"
+#~ msgid "forwarded"
+#~ msgstr "προωθημένο"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "εκκρεμές"
-#~ msgid "confirmed"
-#~ msgstr "επιβεβαιωμένο"
+#~ msgid "fixed"
+#~ msgstr "διορθωμένο"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "έτοιμο"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "Include status:"
+#~ msgstr "Συμπεριέλαβε κατάσταση:"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "Exclude status:"
+#~ msgstr "Άνευ κατάστασης:"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "critical"
+#~ msgstr "κρίσιμο"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "grave"
+#~ msgstr "σοβαρότατο"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "serious"
+#~ msgstr "σοβαρό"
-#~ msgid "Exclude severity:"
-#~ msgstr "Άνευ σοβαρότητας:"
+#~ msgid "important"
+#~ msgstr "σημαντικό"
-#~ msgid "Include severity:"
-#~ msgstr "Συμπεριέλαβε σοβαρότητα:"
+#~ msgid "minor"
+#~ msgstr "ασήμαντο"
#~ msgid "wishlist"
#~ msgstr "επιθυμία"
-#~ msgid "minor"
-#~ msgstr "ασήμαντο"
+#~ msgid "Include severity:"
+#~ msgstr "Συμπεριέλαβε σοβαρότητα:"
-#~ msgid "important"
-#~ msgstr "σημαντικό"
+#~ msgid "Exclude severity:"
+#~ msgstr "Άνευ σοβαρότητας:"
-#~ msgid "serious"
-#~ msgstr "σοβαρό"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "grave"
-#~ msgstr "σοβαρότατο"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "critical"
-#~ msgstr "κρίσιμο"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "Άνευ κατάστασης:"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "Include status:"
-#~ msgstr "Συμπεριέλαβε κατάσταση:"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "done"
-#~ msgstr "έτοιμο"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "διορθωμένο"
+#~ msgid "confirmed"
+#~ msgstr "επιβεβαιωμένο"
-#~ msgid "pending"
-#~ msgstr "εκκρεμές"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "προωθημένο"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "διορθωμένο στο πειραματικό"
-#~ msgid "open"
-#~ msgstr "ανοιχτό"
+#~ msgid "fixed-upstream"
+#~ msgstr "διορθωμένο upstream"
-#~ msgid "bugs"
-#~ msgstr "προβλήματα"
+#~ msgid "help"
+#~ msgstr "βοήθεια"
-#~ msgid "Distribution:"
-#~ msgstr "Διανομή:"
+#~ msgid "l10n"
+#~ msgstr "τοπικοποίηση"
-#~ msgid "Package version:"
-#~ msgstr "Έκδοση πακέτου"
+#~ msgid "moreinfo"
+#~ msgstr "περισσότερα"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "προτεινόμενες ενημερώσεις δοκιμαστικού"
+#~ msgid "patch"
+#~ msgstr "εππίραμα"
-#~ msgid "proposed-updates"
-#~ msgstr "προτεινόμενες ενημερώσεις"
+#~ msgid "security"
+#~ msgstr "ασφάλεια"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "χωρίς εμφάνιση στατιστικών στο υποσέλιδο"
+#~ msgid "unreproducible"
+#~ msgstr "μη επαναλαμβανόμενο"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "χωρίς εμφάνιση περιεχομένων στην κεφαλίδα"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "χωρίς ταξινόμηση ανα κατάσταση ή σοβαρότητα"
+#~ msgid "wontfix"
+#~ msgstr "χωρίς λύση"
-#~ msgid "display merged bugs only once"
-#~ msgstr "εμφάνισε τα συγχωνευμένα σφάλματα μια φορά"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "ενεργά προβλήματα"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Σημάνσεις:"
+#~ msgid "Include tag:"
+#~ msgstr "Συμπεριλαμβάνει ετικέτα:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Χωρίς ετικέτα:"
diff --git a/greek/po/cdimage.el.po b/greek/po/cdimage.el.po
index 0bd27e42a38..e5e235866f0 100644
--- a/greek/po/cdimage.el.po
+++ b/greek/po/cdimage.el.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 " Key fingerprint"
-#: ../../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/greek/po/distrib.el.po b/greek/po/distrib.el.po
index 0e984a256a0..91e4486bed9 100644
--- a/greek/po/distrib.el.po
+++ b/greek/po/distrib.el.po
@@ -133,103 +133,111 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
+msgid "Hard Float ABI ARM"
+msgstr ""
+
+#: ../../english/releases/arches.data:14
#, fuzzy
#| msgid "HP PA/RISC"
msgid "HP PA-RISC"
msgstr "HP PA/RISC"
-#: ../../english/releases/arches.data:14
+#: ../../english/releases/arches.data:15
#, fuzzy
#| msgid "Hurd (i386)"
msgid "Hurd 32-bit PC (i386)"
msgstr "Hurd (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:16
+#: ../../english/releases/arches.data:17
#, fuzzy
#| msgid "Intel IA-64"
msgid "Intel Itanium IA-64"
msgstr "Intel IA-64"
-#: ../../english/releases/arches.data:17
+#: ../../english/releases/arches.data:18
msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
-#: ../../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 ""
-#: ../../english/releases/arches.data:21
+#: ../../english/releases/arches.data:22
msgid "MIPS (little endian)"
msgstr ""
-#: ../../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 "non-US"
-#~ msgstr "εκτός-ΗΠ"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "πακέτα που περιέχουν ονόματα αρχείων ή καταλόγους σαν και αυτό"
-#~ msgid "Search case sensitive"
+#~ msgid "all files in this package"
+#~ msgstr "όλα τα αρχεία αυτού του πακέτου"
+
+#~ msgid "Case sensitive"
#~ msgstr "Με έλεγχο Κεφαλαίων/Πεζών"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Ερευνα και σε τμήματα λέξεων"
+#~ msgid "no"
+#~ msgstr "όχι"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "yes"
+#~ msgstr "ναί"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
#~ msgid "AMD64"
#~ msgstr "AMD64"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "yes"
-#~ msgstr "ναί"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "no"
-#~ msgstr "όχι"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Ερευνα και σε τμήματα λέξεων"
-#~ msgid "Case sensitive"
+#~ msgid "Search case sensitive"
#~ msgstr "Με έλεγχο Κεφαλαίων/Πεζών"
-#~ msgid "all files in this package"
-#~ msgstr "όλα τα αρχεία αυτού του πακέτου"
-
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "πακέτα που περιέχουν ονόματα αρχείων ή καταλόγους σαν και αυτό"
+#~ msgid "non-US"
+#~ msgstr "εκτός-ΗΠ"
diff --git a/greek/po/doc.el.po b/greek/po/doc.el.po
index b57440a2281..f3e0df532d3 100644
--- a/greek/po/doc.el.po
+++ b/greek/po/doc.el.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,53 +338,73 @@ msgstr "CD που περιλαμβάνει:"
msgid "Publisher:"
msgstr "Εκδότης:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Συγγραφείς:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Συντάκτες:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Συντηρητές:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "Κατάσταση:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "Διαθεσιμότητα:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "Τελευταία έκδοση:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(εκδοση <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 "καθαρό κείμενο"
-#. 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
-#, fuzzy
-#| msgid ""
-#| "Use <a href=\"cvs\">CVS</a> to download the SGML source text for <get-var "
-#| "ddp_pkg_loc />."
+#: ../../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 ""
+
+#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+msgid "VCS interface: "
msgstr ""
-"Χρησιμοποιήστε <a href=\"cvs\">CVS</a> για κατέβασμα του κώδικα SGML του "
-"<get-var ddp_pkg_loc />."
-#: ../../english/doc/manuals.defs:158
+#: ../../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"
@@ -374,30 +414,41 @@ msgstr ""
" σε <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" καί εξάγετε το πακέτο <kbd>boot-floppies/documentation</kbd>."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "CVS μέσω διαδικτύου"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Πακέτο του Debian"
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
#, fuzzy
#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Πακέτο του Debian"
-#: ../../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 "Γλώσσα:"
+
#~ msgid "Latest version in development:"
#~ msgstr "Υπο ανάπτυξη έκδοση:"
-#~ msgid "Language:"
-#~ msgstr "Γλώσσα:"
+#, fuzzy
+#~| msgid ""
+#~| "Use <a href=\"cvs\">CVS</a> to download the SGML source text for <get-"
+#~| "var ddp_pkg_loc />."
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Χρησιμοποιήστε <a href=\"cvs\">CVS</a> για κατέβασμα του κώδικα SGML του "
+#~ "<get-var ddp_pkg_loc />."
diff --git a/greek/po/l10n.el.po b/greek/po/l10n.el.po
index 3659ec43ff7..9d1d4e2e7c8 100644
--- a/greek/po/l10n.el.po
+++ b/greek/po/l10n.el.po
@@ -93,8 +93,8 @@ msgstr "Αρχεία POT"
msgid "Hints for translators"
msgstr "Υποδείξεις για μεταφραστές"
-#~ msgid "Original templates"
-#~ msgstr "Αυθεντικά πρότυπα"
-
#~ msgid "Translated templates"
#~ msgstr "Μεταφρασμένα πρότυπα"
+
+#~ msgid "Original templates"
+#~ msgstr "Αυθεντικά πρότυπα"
diff --git a/greek/po/mailinglists.el.po b/greek/po/mailinglists.el.po
index e1aa3097143..47259bbf71e 100644
--- a/greek/po/mailinglists.el.po
+++ b/greek/po/mailinglists.el.po
@@ -118,8 +118,8 @@ msgstr "ανοικτό"
msgid "closed"
msgstr "κλειστό"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Παρακαλούμε επιλέξτε τους καταλόγους για κατάργηση συνδρομής:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Επιλέξτε σε ποιους καταλόγους θέλετε συνδρομή:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Παρακαλούμε επιλέξτε τους καταλόγους για κατάργηση συνδρομής:"
diff --git a/greek/po/newsevents.el.po b/greek/po/newsevents.el.po
index 659ec4357cc..49aae5a972b 100644
--- a/greek/po/newsevents.el.po
+++ b/greek/po/newsevents.el.po
@@ -27,27 +27,27 @@ msgstr "p<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 "Όνομα:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "Ηλ.Διεύθυνση:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Γλώσσες:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Τοποθεσία:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Θέματα:"
@@ -338,11 +338,12 @@ 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>."
+#| "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 ""
"Για να λαμβάνετε αυτό το φυλλάδιο καθε εβδομάδα, κάντε <a href=\"https://"
"lists.debian.org/debian-news/\">συνδρομή</a> στον κατάλογο συνδρομητών "
@@ -487,3 +488,17 @@ msgid ""
msgstr ""
"<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους <a "
"href=\"mailto:dwn@debian.org\">%s</a>."
+
+#, 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>."
+#~ msgstr ""
+#~ "Για να λαμβάνετε αυτό το φυλλάδιο καθε εβδομάδα, κάντε <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">συνδρομή</a> στον κατάλογο συνδρομητών "
+#~ "debian-news."
diff --git a/greek/po/organization.el.po b/greek/po/organization.el.po
index f9dd1bd8c3c..bd27430a519 100644
--- a/greek/po/organization.el.po
+++ b/greek/po/organization.el.po
@@ -73,7 +73,7 @@ msgid "Officers"
msgstr "Aξιωματούχοι"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Διανομή"
@@ -83,11 +83,11 @@ msgid "Publicity"
msgstr "Δημοσιότητα"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Υποστήριξη και Εσωτερική Δομή"
-#. 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 ""
@@ -100,109 +100,109 @@ msgstr "Επικεφαλής"
msgid "Technical Committee"
msgstr "Τεχνική Επιτροπή"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Γραμματέας"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Έργα Ανάπτυξης"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Αρχειοθήκες FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
#, fuzzy
msgid "FTP Assistants"
msgstr "Βοηθοί Έκδοσης"
-#: ../../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 "Μεμονωμένα Πακέτα"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Διεύθυνση Έκδοσης"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "Σημειώσεις Έκδοσης"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Εξασφάλιση Ποιότητας"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Ομάδα Συστήματος Εγκατάστασης"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Σημειώσεις Έκδοσης"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Είδωλα CD"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Παραγωγή"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Υπό έλεγχο"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Υποστήριξη και Εσωτερική Δομή"
-#: ../../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
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Διαχείριση Συστήματος"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Τεκμηρίωση"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
#, fuzzy
msgid "Work-Needing and Prospective Packages list"
msgstr "Κατάλογος Αναμενόμενων και Πακέτων που χρειάζονται Εργασία"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
#, fuzzy
#| msgid "Installation System Team"
msgid "Live System Team"
msgstr "Ομάδα Συστήματος Εγκατάστασης"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Αρχιτεκτονικές"
@@ -230,86 +230,76 @@ msgstr "Υπεύθυνος Τύπου"
msgid "Partner Program"
msgstr "Πρόγραμμα Συνεργατών"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Γεγονότα"
-#: ../../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 "Υποστήριξη χρηστών"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Σύστημα Ανίχνευσης Σφάλματος"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
#, fuzzy
#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Διαχείριση Συνδρομητικών Καταλόγων"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Υποδοχή Νέων Συντηρητών"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
#, fuzzy
msgid "Debian Account Managers"
msgstr "Διαχειριστές Λογαριασμών Προγραμματιστών"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Διαχειριστές Διαβάθμισης (PGP και GPG)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Ομάδα Ασφάλειας"
-#: ../../english/intro/organization.data:360
-#, fuzzy
-#| msgid "Security Team"
-msgid "Testing Security Team"
-msgstr "Ομάδα Ασφάλειας"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Εργο επιθεώρησης ασφάλειας"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Ιστοσελίδες"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Σελίδα Συμβούλων"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Σελίδα Πωλητών CD"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Πολιτική"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Διαχείριση Συστήματος"
-#: ../../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."
@@ -318,7 +308,7 @@ msgstr ""
"προβλήματα με τα μηχανήματα του Debian (συμπεριλαμβανομένων και των κωδικών "
"πρόσβασης ή ανάγκη για εγκατάσταση πακέτων)."
-#: ../../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 "
@@ -328,141 +318,150 @@ msgstr ""
"<a href=https://db.debian.org/machines.cgi>Debian Machines</a>, περιλαμβάνει "
"πληροφορίες (ανά μηχάνημα) για τους διαχειριστές."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Διαχειριστής Ανάπτυξης Υπηρεσιών LDAP"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Καθεπτρισμοί"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Συντηρητής DNS"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Σύστημα Ιχνηλάτησης Πακέτων"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Συντονισμός Δωρεών Υλικού"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Διαχειριστές Alioth"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
#, fuzzy
#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Έργα Ανάπτυξης"
-#: ../../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 για παιδιά από 1 έως 99"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian για ιατρική πρακτική και έρευνα"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian για την εκπαίδευση"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian σε νομικά γραφεία"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian για άτομα με ειδικές ανάγκες"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian για ιατρική πρακτική και έρευνα"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Σύστημα Εγκατάστασης για τη ``stable''"
+#, fuzzy
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Debian Διανομή Πολυμέσων"
-#~ msgid "Mailing list"
-#~ msgstr "Συνδρομητικός κατάλογος"
+#~ msgid "Release Assistants"
+#~ msgstr "Βοηθοί Έκδοσης"
-#~ msgid "Installation"
-#~ msgstr "Εγκατάσταση"
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "Επικεφαλής έκδοσής για τη ``stable''"
-#~ msgid "Delegates"
-#~ msgstr "Απεσταλμένοι"
+#~ msgid "Vendors"
+#~ msgstr "Πωλητές"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Αυτό δεν είναι ακόμα ένα επίσημο εσωτερικό έργο αλλά, έχει ανακοινωθεί η "
-#~ "πρόθεση ενσωμάτωσης του."
+#~ msgid "APT Team"
+#~ msgstr "Ομάδα APT"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debian Διανομή Πολυμέσων"
+#~ msgid "Handhelds"
+#~ msgstr "Υπολ. παλάμης"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux για Μεγάλες Επιχειρήσεις"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Αρχειοθήκες Συνδρομητικών Καταλόγων"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian για μή-κερδοσκοπικούς οργανισμούς"
+#, fuzzy
+#~ msgid "Security Testing Team"
+#~ msgstr "Ομάδα Ασφάλειας"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Το Διεθνές Λειτουργικό Σύστημα στην επιφάνεια εργασίας σας"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Συντονισμός Υπογραφών Κλειδιών"
#~ msgid "Accountant"
#~ msgstr "Λογιστήριο"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Συντονισμός Υπογραφών Κλειδιών"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Το Διεθνές Λειτουργικό Σύστημα στην επιφάνεια εργασίας σας"
-#, fuzzy
-#~ msgid "Security Testing Team"
-#~ msgstr "Ομάδα Ασφάλειας"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian για μή-κερδοσκοπικούς οργανισμούς"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Αρχειοθήκες Συνδρομητικών Καταλόγων"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux για Μεγάλες Επιχειρήσεις"
-#~ msgid "Handhelds"
-#~ msgstr "Υπολ. παλάμης"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debian Διανομή Πολυμέσων"
-#~ msgid "APT Team"
-#~ msgstr "Ομάδα APT"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Αυτό δεν είναι ακόμα ένα επίσημο εσωτερικό έργο αλλά, έχει ανακοινωθεί η "
+#~ "πρόθεση ενσωμάτωσης του."
-#~ msgid "Vendors"
-#~ msgstr "Πωλητές"
+#~ msgid "Delegates"
+#~ msgstr "Απεσταλμένοι"
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "Επικεφαλής έκδοσής για τη ``stable''"
+#~ msgid "Installation"
+#~ msgstr "Εγκατάσταση"
-#~ msgid "Release Assistants"
-#~ msgstr "Βοηθοί Έκδοσης"
+#~ msgid "Mailing list"
+#~ msgstr "Συνδρομητικός κατάλογος"
+
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Σύστημα Εγκατάστασης για τη ``stable''"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "Εργο επιθεώρησης ασφάλειας"
#, fuzzy
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Debian Διανομή Πολυμέσων"
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Ομάδα Ασφάλειας"
diff --git a/greek/po/others.el.po b/greek/po/others.el.po
index 265b323c069..ad4955191b5 100644
--- a/greek/po/others.el.po
+++ b/greek/po/others.el.po
@@ -166,27 +166,6 @@ msgstr ""
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:22
-#, fuzzy
-msgid "Who:"
-msgstr "Τηλέφωνο:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr ""
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Προϊόντα"
@@ -231,22 +210,34 @@ msgstr "σήματα"
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "σκουλαρίκια"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
msgstr ""
+#: ../../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 ""
@@ -322,57 +313,66 @@ msgstr "Έκδοση"
msgid "URL"
msgstr "Διεύθυνση"
-#~ msgid "Name:"
-#~ msgstr "Όνομα:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
-#~ msgid "Company:"
-#~ msgstr "Εταιρεία:"
+#~ msgid "Languages:"
+#~ msgstr "Γλώσσες:"
-#~ msgid "URL:"
-#~ msgstr "Διεύθυνση:"
+#~ msgid "Location:"
+#~ msgstr "Τοποθεσία:"
-#~ msgid "or"
-#~ msgstr "ή"
+#~ msgid "Topics:"
+#~ msgstr "Θέματα:"
-#~ msgid "Email:"
-#~ msgstr "Ηλ.Διεύθυνση:"
+#~ msgid "Q"
+#~ msgstr "Ε"
-#~ msgid "Rates:"
-#~ msgstr "Χρεώσεις:"
+#~ msgid "developers only"
+#~ msgstr "μόνο για προγραμματιστές"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Ενδιαφέρεται για μεταφορά"
+#~ msgid "closed"
+#~ msgstr "κλειστό"
+
+#~ msgid "open"
+#~ msgstr "ανοικτό"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Κατάργηση"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Παρακαλούμε επιλέξτε τους καταλόγους για κατάργηση συνδρομής:"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ "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 ""
-#~ "Υπάρχουν <total_consultant> σύμβουλοι του Debian σε <total_country> "
-#~ "χώρες "
+#~ "Δείτε τη σελίδα <a href=\"./#subunsub\">Συνδρομητικοί κατάλογοι</a> για "
+#~ "πληροφορίες διαγραφής μέσω ηλ. ταχυδρομείου. Υπάρχει επίσης διαθέσιμη μια "
+#~ "σελίδα <a href=\"subscribe\">εγγραφής</a> για την δημιουργία συνδρομής. "
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Συνδρομή σε κατάλογο"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Κατάργηση Συνδρομής"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Δείτε τη σελίδα <a href=\"./#subunsub\">Συνδρομητικοί κατάλογοι</a> για "
-#~ "πληροφορίες εγγραφής μέσω ηλ. ταχυδρομείου. Υπάρχει επίσης διαθέσιμη μια "
-#~ "σελίδα <a href=\"unsubscribe\">διαγραφής</a> για την κατάργηση συνδρομής. "
+#~ "Παρακαλούμε σεβαστείτε την <a href=\"./#ads\">Πολιτική διαφημίσεων "
+#~ "συνδρομητικών καταλόγων του Debian</a>."
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Επιλέξτε σε ποιους καταλόγους θέλετε συνδρομή:"
+#~ msgid "Clear"
+#~ msgstr "Καθαρισμός"
-#~ msgid "No description given"
-#~ msgstr "Δεν δόθηκε περιγραφή"
+#~ msgid "Subscribe"
+#~ msgstr "Συνδρομή"
-#~ msgid "Moderated:"
-#~ msgstr "Ελεγχόμενη:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Η Ηλεκτρονική σας Διεύθυνση:"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Αποστολή μηνυμάτων μόνο από συνδρομητές."
+#~ msgid "Subscription:"
+#~ msgstr "Συνδρομή:"
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -380,63 +380,58 @@ msgstr "Διεύθυνση"
#~ "Αυτή η λίστα λαμβάνει μηνύματα που είναι υπογεγραμένα μόνο από Debian "
#~ "Προγραμματιστή."
-#~ msgid "Subscription:"
-#~ msgstr "Συνδρομή:"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Αποστολή μηνυμάτων μόνο από συνδρομητές."
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Η Ηλεκτρονική σας Διεύθυνση:"
+#~ msgid "Moderated:"
+#~ msgstr "Ελεγχόμενη:"
-#~ msgid "Subscribe"
-#~ msgstr "Συνδρομή"
+#~ msgid "No description given"
+#~ msgstr "Δεν δόθηκε περιγραφή"
-#~ msgid "Clear"
-#~ msgstr "Καθαρισμός"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Επιλέξτε σε ποιους καταλόγους θέλετε συνδρομή:"
#~ 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 ""
-#~ "Παρακαλούμε σεβαστείτε την <a href=\"./#ads\">Πολιτική διαφημίσεων "
-#~ "συνδρομητικών καταλόγων του Debian</a>."
+#~ "Δείτε τη σελίδα <a href=\"./#subunsub\">Συνδρομητικοί κατάλογοι</a> για "
+#~ "πληροφορίες εγγραφής μέσω ηλ. ταχυδρομείου. Υπάρχει επίσης διαθέσιμη μια "
+#~ "σελίδα <a href=\"unsubscribe\">διαγραφής</a> για την κατάργηση συνδρομής. "
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Κατάργηση Συνδρομής"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Συνδρομή σε κατάλογο"
#~ 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. "
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "Δείτε τη σελίδα <a href=\"./#subunsub\">Συνδρομητικοί κατάλογοι</a> για "
-#~ "πληροφορίες διαγραφής μέσω ηλ. ταχυδρομείου. Υπάρχει επίσης διαθέσιμη μια "
-#~ "σελίδα <a href=\"subscribe\">εγγραφής</a> για την δημιουργία συνδρομής. "
-
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Παρακαλούμε επιλέξτε τους καταλόγους για κατάργηση συνδρομής:"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Κατάργηση"
+#~ "Υπάρχουν <total_consultant> σύμβουλοι του Debian σε <total_country> "
+#~ "χώρες "
-#~ msgid "open"
-#~ msgstr "ανοικτό"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Ενδιαφέρεται για μεταφορά"
-#~ msgid "closed"
-#~ msgstr "κλειστό"
+#~ msgid "Rates:"
+#~ msgstr "Χρεώσεις:"
-#~ msgid "developers only"
-#~ msgstr "μόνο για προγραμματιστές"
+#~ msgid "Email:"
+#~ msgstr "Ηλ.Διεύθυνση:"
-#~ msgid "Q"
-#~ msgstr "Ε"
+#~ msgid "or"
+#~ msgstr "ή"
-#~ msgid "Topics:"
-#~ msgstr "Θέματα:"
+#~ msgid "URL:"
+#~ msgstr "Διεύθυνση:"
-#~ msgid "Location:"
-#~ msgstr "Τοποθεσία:"
+#~ msgid "Company:"
+#~ msgstr "Εταιρεία:"
-#~ msgid "Languages:"
-#~ msgstr "Γλώσσες:"
+#~ msgid "Name:"
+#~ msgstr "Όνομα:"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#, fuzzy
+#~ msgid "Who:"
+#~ msgstr "Τηλέφωνο:"
diff --git a/greek/po/ports.el.po b/greek/po/ports.el.po
index c166a3f2b86..8ae99f4fcb5 100644
--- a/greek/po/ports.el.po
+++ b/greek/po/ports.el.po
@@ -113,65 +113,65 @@ msgstr "Debian για PowerPC"
msgid "Debian for Sparc"
msgstr "Debian για Sparc"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "βασισμένο σε libc5 Debian GNU/FreeBSD"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian για Φορητούς"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian για Sparc64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian για AMD64"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian για S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian για ARM"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian για MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian για Beowulf"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "Χωρίς FPU (R3010)"
+#~ msgid "Main"
+#~ msgstr "Κύρια"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "Χωρίς FPU (R2010), εξωτερικές caches"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Specials"
-#~ msgstr "Εξειδικευμένα"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian για Motorola 680x0"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "Vendor/Name"
+#~ msgstr "Πωλητής/Ονομα"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "Date announced"
+#~ msgstr "Ημερομηνία ανακοίνωσης"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "Clock"
+#~ msgstr "Ρολόι"
#~ msgid "ICache"
#~ msgstr "ICache"
-#~ msgid "Clock"
-#~ msgstr "Ρολόι"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "Date announced"
-#~ msgstr "Ημερομηνία ανακοίνωσης"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "Vendor/Name"
-#~ msgstr "Πωλητής/Ονομα"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian για Motorola 680x0"
+#~ msgid "Specials"
+#~ msgstr "Εξειδικευμένα"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "Χωρίς FPU (R2010), εξωτερικές caches"
-#~ msgid "Main"
-#~ msgstr "Κύρια"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "Χωρίς FPU (R3010)"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian για Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian για MIPS"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian για ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian για S/390"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian για AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian για Sparc64"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian για Φορητούς"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "βασισμένο σε libc5 Debian GNU/FreeBSD"
diff --git a/greek/po/templates.el.po b/greek/po/templates.el.po
index 757efb85f3e..e81e9f30cbb 100644
--- a/greek/po/templates.el.po
+++ b/greek/po/templates.el.po
@@ -66,7 +66,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Πίσω στην <a href=\"m4_HOME/\">Κεντρική σελίδα του Debian</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 "Κεντρική Σελίδα"
@@ -107,7 +107,7 @@ msgid "Support"
msgstr "Υποστήριξη"
#: ../../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 "Η γωνία του προγραμματιστή"
@@ -144,7 +144,7 @@ msgid "Miscellaneous"
msgstr "Διάφορα"
#: ../../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 "Αποκτώντας το Debian"
@@ -200,7 +200,7 @@ msgstr "στην έκδοση 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -222,24 +222,24 @@ msgstr ""
"\"mailto:debian-l10n-greek@lists.debian.org\">debian-l10n-greek@lists.debian."
"org</a>"
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Τελευταία τροποποίηση"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Πνευματικά δικαιώματα"
-#: ../../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 ""
-#: ../../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 ""
"Δείτε τους <a href=\"m4_HOME/license\" rel=\"copyright\">όρους χρήσης</a>"
-#: ../../english/template/debian/footer.wml:111
+#: ../../english/template/debian/footer.wml:112
#, fuzzy
#| msgid ""
#| "Debian is a registered trademark of Software in the Public Interest, Inc."
@@ -308,140 +308,152 @@ msgid "Debian Books"
msgstr "Βιβλία Debian"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "Βοήθεια"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Αρχειοθήκη συνδρομητικών καταλόγων"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Συνδρομητικοί κατάλογοι"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Κοινωνικό συμβόλαιο"
-#: ../../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 "Επισκεφθείτε το χορηγό των σελίδων"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Χάρτης σελίδων του Debian"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Βάση δεδομένων προγραμματιστών"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Βιβλία Debian"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Το εγχειρίδιο της πολιτικής του Debian"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Πληροφορίες προγραμματιστών"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Οδηγίες για επίδοξους συντηρητές"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Κρίσιμα λάθη της έκδοσης"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Αναφορές Lintian"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Αρχειοθήκη απο τον συνδρομητικό κατάλογο των χρηστών"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Αρχειοθήκη απο τον συνδρομητικό κατάλογο των προγραμματιστών"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Αρχειοθήκη απο τον συνδρομητικό κατάλογο i18n/l10n"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Αρχειοθήκη απο τον συνδρομητικό κατάλογο των αρχιτεκτονικών"
-#: ../../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 "Αρχειοθήκη απο τον συνδρομητικό κατάλογο του Συσ.Ταξ. Λαθών"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Αρχειοθήκη απο τον γενικό συνδρομητικό κατάλογο"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Ελεύθερο Λογισμικό"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Ανάπτυξη"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Βοήθεια"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Αναφορές σφαλμάτων"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Αρχιτεκτονικές"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Οδηγίες εγκατάστασης"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Πωλητές Δίσκων"
-#: ../../english/template/debian/links.tags.wml:122
-msgid "CD ISO images"
+#: ../../english/template/debian/links.tags.wml:128
+#, fuzzy
+#| msgid "CD ISO images"
+msgid "CD/USB ISO images"
msgstr "Είδωλα ISO"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Δικτυακή εγκατάσταση"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Προ εγκατεστημένο"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Κωδικό όνομα Debian-Edu"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr ""
@@ -531,246 +543,165 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Πίσω στην σελίδα των <a href=\"./\">ομιλητών του Debian</a>."
-#~ msgid "More information"
-#~ msgstr "Περισσότερες πληροφορίες"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Επερχόμενα γεγονότα"
-
-#~ msgid "link may no longer be valid"
-#~ msgstr "Ο σύνδεσμος μπορεί να μήν είναι έγκυρος"
+#~ msgid "Select a server near you"
+#~ msgstr "Επιλέξτε έναν κοντινό σας εξυπηρετητή"
-#~ msgid "When"
-#~ msgstr "Πότε"
+#~ msgid "More information:"
+#~ msgstr "Περισσότερες πληροφορίες:"
-#~ msgid "Where"
-#~ msgstr "Που"
+#~ msgid "Taken by:"
+#~ msgstr "Το ανέλαβε ο:"
-#~ msgid "More Info"
-#~ msgstr "Περισσότερες πληροφορίες"
+#~ msgid "Nobody"
+#~ msgstr "Κανένας"
-#~ msgid "Debian Involvement"
-#~ msgstr "Συμμετοχή Debian"
+#~ msgid "Rating:"
+#~ msgstr "Κατάταξη"
-#~ msgid "Main Coordinator"
-#~ msgstr "Κύριος συντονιστής"
+#~ msgid "List of Consultants"
+#~ msgstr "Κατάλογος συμβούλων"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Συντονιστής της</th><th>εργασίας</th>"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">συμβούλων του Debian</a>."
-#~ msgid "Related Links"
-#~ msgstr "Σχετικοί σύνδεσμοι"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Latest News"
-#~ msgstr "Τελευταία Νέα"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Μεταφόρτωση με Jigdo"
-#~ msgid "Download calendar entry"
-#~ msgstr "Λήψη ημερολογιακής εγγραφής"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "λήψη μέσω HTTP/FTP"
-#, fuzzy
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "Πίσω στην <a href=\"m4_HOME/\">Κεντρική σελίδα του Debian</a>."
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Αγορά CD ή DVD"
-#, 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>."
-#~ msgstr ""
-#~ "Για να λαμβάνετε αυτό το φυλλάδιο καθε εβδομάδα, κάντε <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">συνδρομή</a> στον κατάλογο συνδρομητών "
-#~ "debian-news."
+#~ msgid "Network Install"
+#~ msgstr "Δικτυακή Eγκατάσταση"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "υπάρχουν διαθέσιμα <a href=\"../../\">Παλαιότερα τεύχη</a>."
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Μεταφόρτωση"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
-#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Διάφορα"
-#, 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>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Καλιτεχνικά"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
-#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Καθρεπτισμοί"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Καθρεπτισμοί Rsync"
-#, fuzzy
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τον %s."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Μεταφόρτωση με Torrent"
-#, fuzzy
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τους %s."
+#~ msgid "Debian CD team"
+#~ msgstr "Ομάδα CD του Debian"
-#, fuzzy
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr ""
-#~ "<void id=\"singularfemale\" />Το παρόν τεύχος των ΕΝ μεταφράστηκε απο την "
-#~ "%s."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_σε_cd"
-#, fuzzy
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr ""
-#~ "<void id=\"pluralfemale\" />Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τις "
-#~ "%s."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />συχνές ερωτήσεις"
-#~ msgid "List of Speakers"
-#~ msgstr "Κατάλογος Ομιλητών"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">ομιλητών του Debian</a>."
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ 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 ""
-#~ "Για να λαμβάνετε αυτό το φυλλάδιο καθε εβδομάδα, κάντε <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">συνδρομή</a> στον κατάλογο συνδρομητών "
-#~ "debian-news."
+#~ msgid "buy"
+#~ msgstr "αγορά"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
-#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "net_install"
+#~ msgstr "δικτυακή_εγκατάσταση"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "d id=\"misc-bottom\" />διάφορα"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
-#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Nominations"
+#~ msgstr "Δωρεές"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Debate"
+#~ msgstr "Ομάδα CD του Debian"
#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "Περισσότερες πληροφορίες"
+#~ msgid "Proposer"
+#~ msgstr "πρόταση"
#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Πακέτα που επηρεάζονται"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Συζήτηση"
-#~ msgid "License Information"
-#~ msgstr "Πληροφορίες Αδειας Χρήσης"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Σε αναμονή χορηγών"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Σε εξέλιξη"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Version %s: %s"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Έχει αρχίσει ψηφοφορία"
-#~ msgid "Date published"
-#~ msgstr "Ημερομηνία Εκδοσης"
+#~ msgid "Decided"
+#~ msgstr "Έχει αποφασιστεί"
-#~ msgid "License"
-#~ msgstr "Αδεια Χρήσης"
+#~ msgid "Withdrawn"
+#~ msgstr "αποσύρθηκε"
-#~ msgid "Version"
-#~ msgstr "Εκδοση"
+#~ msgid "Other"
+#~ msgstr "Άλλα"
-#~ msgid "Summary"
-#~ msgstr "Σύνοψη"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Κεντρική σελίδα ψηφοφορίας"
-#~ msgid "Discussion"
-#~ msgstr "Συζήτηση"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Πώς να ψηφίσετε"
-#~ msgid "free"
-#~ msgstr "ελευθερο"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Κάντε τις προτάσεις σας"
-#~ msgid "non-free"
-#~ msgstr "μη-ελευθερο"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Πρόταση τροπολογίας"
-#~ msgid "Free"
-#~ msgstr "Ελεύθερο"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Ακολουθία πρότασης"
-#~ msgid "Non-Free"
-#~ msgstr "Μη-Ελεύθερο"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Ανάγνωση αποτελεσμάτων"
-#~ msgid "discussed"
-#~ msgstr "έχουν συζητηθεί"
+#~ msgid "Vote"
+#~ msgstr "Ψηφοφορία"
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">Νέων του Debian</a>."
+#~ msgid "Please use English when sending mail."
+#~ msgstr "Παρακαλούμε χρησιμοποιήστε Αγγλικά για αποστολή μηνύματος."
-#~ msgid "network install"
-#~ msgstr "δικτυακή εγκατάσταση"
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (νεκρός σύνδεσμος)"
-#~ msgid "buy pre-made images"
-#~ msgstr "αγορά έτοιμων ειδώλων"
+#~ msgid "download with pik"
+#~ msgstr "λήψη με το pik"
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Δείτε την σελίδα <a href=\"m4_HOME/contact\"> επικοινωνίας με το Debian</"
-#~ "a> για πληροφορίες επικοινωνίας μαζί μας."
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Συμβουλή ασφάλειας"
-#~ msgid "Security database references"
-#~ msgstr "Αναφορές βάσης δεδομένων ασφαλείας"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Συμβουλές ασφάλειας"
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "Στο λεξικό Mitre's CVE:"
+#~ msgid "Vulnerable"
+#~ msgstr "τρωτά"
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "Στη βάση δεδομένων (στο SecurityFocus):"
+#~ msgid "Fixed in"
+#~ msgstr "Επιδιορθώθηκε την"
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "Σημειώσεις του CERT για περιστατικά και τρωτά σημεία:"
+#~ msgid "Source:"
+#~ msgstr "Κώδικας:"
-#~ msgid "No other external database security references currently available."
-#~ msgstr ""
-#~ "Δεν υπάρχουν διαθέσιμες άλλες εξωτερικές αναφορές στην βάση αυτή τη "
-#~ "στιγμή."
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Στοιχείο ανεξάρτητο αρχιτεκτονικής:"
#, fuzzy
#~ msgid ""
@@ -780,162 +711,243 @@ msgstr "Πίσω στην σελίδα των <a href=\"./\">ομιλητών τ
#~ "Το άθροισμα ελέγχου MD5 των εικονιζομένων αρχείων είναι διαθέσιμο στη <a "
#~ "href=\"%attributes\">αρχική συμβουλή</a>."
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Στοιχείο ανεξάρτητο αρχιτεκτονικής:"
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "Δεν υπάρχουν διαθέσιμες άλλες εξωτερικές αναφορές στην βάση αυτή τη "
+#~ "στιγμή."
-#~ msgid "Source:"
-#~ msgstr "Κώδικας:"
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "Σημειώσεις του CERT για περιστατικά και τρωτά σημεία:"
-#~ msgid "Fixed in"
-#~ msgstr "Επιδιορθώθηκε την"
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "Στη βάση δεδομένων (στο SecurityFocus):"
-#~ msgid "Vulnerable"
-#~ msgstr "τρωτά"
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "Στο λεξικό Mitre's CVE:"
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Συμβουλές ασφάλειας"
+#~ msgid "Security database references"
+#~ msgstr "Αναφορές βάσης δεδομένων ασφαλείας"
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Συμβουλή ασφάλειας"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Δείτε την σελίδα <a href=\"m4_HOME/contact\"> επικοινωνίας με το Debian</"
+#~ "a> για πληροφορίες επικοινωνίας μαζί μας."
-#~ msgid "download with pik"
-#~ msgstr "λήψη με το pik"
+#~ msgid "buy pre-made images"
+#~ msgstr "αγορά έτοιμων ειδώλων"
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (νεκρός σύνδεσμος)"
+#~ msgid "network install"
+#~ msgstr "δικτυακή εγκατάσταση"
-#~ msgid "Please use English when sending mail."
-#~ msgstr "Παρακαλούμε χρησιμοποιήστε Αγγλικά για αποστολή μηνύματος."
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">Νέων του Debian</a>."
-#~ msgid "Vote"
-#~ msgstr "Ψηφοφορία"
+#~ msgid "discussed"
+#~ msgstr "έχουν συζητηθεί"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Ανάγνωση αποτελεσμάτων"
+#~ msgid "Non-Free"
+#~ msgstr "Μη-Ελεύθερο"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Ακολουθία πρότασης"
+#~ msgid "Free"
+#~ msgstr "Ελεύθερο"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Πρόταση τροπολογίας"
+#~ msgid "non-free"
+#~ msgstr "μη-ελευθερο"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Κάντε τις προτάσεις σας"
+#~ msgid "free"
+#~ msgstr "ελευθερο"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Πώς να ψηφίσετε"
+#~ msgid "Discussion"
+#~ msgstr "Συζήτηση"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Κεντρική σελίδα ψηφοφορίας"
+#~ msgid "Summary"
+#~ msgstr "Σύνοψη"
-#~ msgid "Other"
-#~ msgstr "Άλλα"
+#~ msgid "Version"
+#~ msgstr "Εκδοση"
-#~ msgid "Withdrawn"
-#~ msgstr "αποσύρθηκε"
+#~ msgid "License"
+#~ msgstr "Αδεια Χρήσης"
-#~ msgid "Decided"
-#~ msgstr "Έχει αποφασιστεί"
+#~ msgid "Date published"
+#~ msgstr "Ημερομηνία Εκδοσης"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Έχει αρχίσει ψηφοφορία"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Version %s: %s"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Σε εξέλιξη"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Σε αναμονή χορηγών"
+#~ msgid "License Information"
+#~ msgstr "Πληροφορίες Αδειας Χρήσης"
#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Συζήτηση"
+#~ msgid "No Requested packages"
+#~ msgstr "Πακέτα που επηρεάζονται"
#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "πρόταση"
+#~ msgid "No requests for adoption"
+#~ msgstr "Περισσότερες πληροφορίες"
#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Ομάδα CD του Debian"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Δωρεές"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
+#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "d id=\"misc-bottom\" />διάφορα"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "net_install"
-#~ msgstr "δικτυακή_εγκατάσταση"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
+#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "buy"
-#~ msgstr "αγορά"
+#~ 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 ""
+#~ "Για να λαμβάνετε αυτό το φυλλάδιο καθε εβδομάδα, κάντε <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">συνδρομή</a> στον κατάλογο συνδρομητών "
+#~ "debian-news."
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">ομιλητών του Debian</a>."
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "List of Speakers"
+#~ msgstr "Κατάλογος Ομιλητών"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />συχνές ερωτήσεις"
+#, fuzzy
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr ""
+#~ "<void id=\"pluralfemale\" />Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τις "
+#~ "%s."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_σε_cd"
+#, fuzzy
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr ""
+#~ "<void id=\"singularfemale\" />Το παρόν τεύχος των ΕΝ μεταφράστηκε απο την "
+#~ "%s."
-#~ msgid "Debian CD team"
-#~ msgstr "Ομάδα CD του Debian"
+#, fuzzy
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τους %s."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Μεταφόρτωση με Torrent"
+#, fuzzy
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "Το παρόν τεύχος των ΕΝ μεταφράστηκε απο τον %s."
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Καθρεπτισμοί Rsync"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Καθρεπτισμοί"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
+#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Καλιτεχνικά"
+#, 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>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο τους "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Διάφορα"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Τα Εβδομαδιαία νέα του Debian συντάσσονται απο "
+#~ "τον <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Μεταφόρτωση"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "υπάρχουν διαθέσιμα <a href=\"../../\">Παλαιότερα τεύχη</a>."
-#~ msgid "Network Install"
-#~ msgstr "Δικτυακή Eγκατάσταση"
+#, 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>."
+#~ msgstr ""
+#~ "Για να λαμβάνετε αυτό το φυλλάδιο καθε εβδομάδα, κάντε <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">συνδρομή</a> στον κατάλογο συνδρομητών "
+#~ "debian-news."
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Αγορά CD ή DVD"
+#, fuzzy
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "Πίσω στην <a href=\"m4_HOME/\">Κεντρική σελίδα του Debian</a>."
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "λήψη μέσω HTTP/FTP"
+#~ msgid "Download calendar entry"
+#~ msgstr "Λήψη ημερολογιακής εγγραφής"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Μεταφόρτωση με Jigdo"
+#~ msgid "Latest News"
+#~ msgstr "Τελευταία Νέα"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Related Links"
+#~ msgstr "Σχετικοί σύνδεσμοι"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Πίσω στην σελίδα των <a href=\"./\">συμβούλων του Debian</a>."
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Συντονιστής της</th><th>εργασίας</th>"
-#~ msgid "List of Consultants"
-#~ msgstr "Κατάλογος συμβούλων"
+#~ msgid "Main Coordinator"
+#~ msgstr "Κύριος συντονιστής"
-#~ msgid "Rating:"
-#~ msgstr "Κατάταξη"
+#~ msgid "Debian Involvement"
+#~ msgstr "Συμμετοχή Debian"
-#~ msgid "Nobody"
-#~ msgstr "Κανένας"
+#~ msgid "More Info"
+#~ msgstr "Περισσότερες πληροφορίες"
-#~ msgid "Taken by:"
-#~ msgstr "Το ανέλαβε ο:"
+#~ msgid "Where"
+#~ msgstr "Που"
-#~ msgid "More information:"
-#~ msgstr "Περισσότερες πληροφορίες:"
+#~ msgid "When"
+#~ msgstr "Πότε"
-#~ msgid "Select a server near you"
-#~ msgstr "Επιλέξτε έναν κοντινό σας εξυπηρετητή"
+#~ msgid "link may no longer be valid"
+#~ msgstr "Ο σύνδεσμος μπορεί να μήν είναι έγκυρος"
+
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Επερχόμενα γεγονότα"
+
+#~ msgid "More information"
+#~ msgstr "Περισσότερες πληροφορίες"
diff --git a/greek/po/vendors.el.po b/greek/po/vendors.el.po
index b76387e4829..f70dfc95edf 100644
--- a/greek/po/vendors.el.po
+++ b/greek/po/vendors.el.po
@@ -9,149 +9,140 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Πωλητής:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "Ιστοσελίδα για το Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Επιτρέπει συνεισφορά στο Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Χώρα:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Διεθνείς αποστολές:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "email:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Είδος CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Είδος DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Αρχιτεκτονικές:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
#, fuzzy
#| msgid "Vendor:"
msgid "Vendor"
msgstr "Πωλητής:"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
#, fuzzy
#| msgid "Allows Contribution to Debian:"
msgid "Allows Contributions"
msgstr "Επιτρέπει συνεισφορά στο Debian:"
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
#, fuzzy
#| msgid "Architectures:"
msgid "Architectures"
msgstr "Αρχιτεκτονικές:"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
#, fuzzy
#| msgid "Ship International:"
msgid "Ship International"
msgstr "Διεθνείς αποστολές:"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr ""
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:54
+#: ../../english/CD/vendors/vendors.CD.def:44
#, fuzzy
#| msgid "Vendor:"
msgid "Vendor Home"
msgstr "Πωλητής:"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
#, fuzzy
#| msgid "email:"
msgid "email"
msgstr "email:"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "Ευρωπαΐκές αποστολές"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "Σε ορισμένες περιοχές"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "πηγαίος κώδικας"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "και"
-#~ msgid "updated monthly"
-#~ msgstr "Ανανεώνεται μηνιαία"
+#~ msgid "Official CD"
+#~ msgstr "Επίσημο CD"
-#~ msgid "updated twice weekly"
-#~ msgstr "Ανανεώνεται δυο φορές την εβδομάδα"
+#~ msgid "Official DVD"
+#~ msgstr "Επίσημο DVD"
-#~ msgid "updated weekly"
-#~ msgstr "Ανανεώνεται καθε εβδομάδα"
+#~ msgid "Development Snapshot"
+#~ msgstr "Στιγμιότυπο Ανάπτυξης"
-#~ msgid "reseller"
-#~ msgstr "μεταπωλητής"
+#~ msgid "Vendor Release"
+#~ msgstr "Έκδοση Πωλητή"
-#~ msgid "reseller of $var"
-#~ msgstr "μεταπωλητής του $var"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Πολλαπλές Διανομές"
-#~ msgid "Custom Release"
-#~ msgstr "Προσαρμοσμένη Έκδοση"
+#~ msgid "non-US included"
+#~ msgstr "Περιλαμβάνει το non-US"
-#~ msgid "vendor additions"
-#~ msgstr "Με προσθήκες απο τον πωλητή"
+#~ msgid "non-free included"
+#~ msgstr "Περιλαμβάνει το non-free"
#~ msgid "contrib included"
#~ msgstr "Περιλαμβάνει το contrib"
-#~ msgid "non-free included"
-#~ msgstr "Περιλαμβάνει το non-free"
+#~ msgid "vendor additions"
+#~ msgstr "Με προσθήκες απο τον πωλητή"
-#~ msgid "non-US included"
-#~ msgstr "Περιλαμβάνει το non-US"
+#~ msgid "Custom Release"
+#~ msgstr "Προσαρμοσμένη Έκδοση"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Πολλαπλές Διανομές"
+#~ msgid "reseller of $var"
+#~ msgstr "μεταπωλητής του $var"
-#~ msgid "Vendor Release"
-#~ msgstr "Έκδοση Πωλητή"
+#~ msgid "reseller"
+#~ msgstr "μεταπωλητής"
-#~ msgid "Development Snapshot"
-#~ msgstr "Στιγμιότυπο Ανάπτυξης"
+#~ msgid "updated weekly"
+#~ msgstr "Ανανεώνεται καθε εβδομάδα"
-#~ msgid "Official DVD"
-#~ msgstr "Επίσημο DVD"
+#~ msgid "updated twice weekly"
+#~ msgstr "Ανανεώνεται δυο φορές την εβδομάδα"
-#~ msgid "Official CD"
-#~ msgstr "Επίσημο CD"
+#~ msgid "updated monthly"
+#~ msgstr "Ανανεώνεται μηνιαία"
+
+#~ msgid "Architectures:"
+#~ msgstr "Αρχιτεκτονικές:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Είδος DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Είδος CD:"
+
+#~ msgid "email:"
+#~ msgstr "email:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Διεθνείς αποστολές:"
+
+#~ msgid "Country:"
+#~ msgstr "Χώρα:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Επιτρέπει συνεισφορά στο Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Ιστοσελίδα για το Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Πωλητής:"
diff --git a/greek/po/vote.el.po b/greek/po/vote.el.po
index b2135bf2aed..c900e489103 100644
--- a/greek/po/vote.el.po
+++ b/greek/po/vote.el.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 "Δωρεές"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
#, fuzzy
msgid "Debate"
msgstr "Ομάδα CD του Debian"
-#: ../../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 "πρόταση"
-#: ../../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 "Συζήτηση"
-#: ../../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 "Σε αναμονή χορηγών"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Σε εξέλιξη"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Έχει αρχίσει ψηφοφορία"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Έχει αποφασιστεί"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "αποσύρθηκε"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Άλλα"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Κεντρική σελίδα ψηφοφορίας"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Πώς να ψηφίσετε"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Κάντε τις προτάσεις σας"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Πρόταση τροπολογίας"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Ακολουθία πρότασης"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Ανάγνωση αποτελεσμάτων"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Ψηφοφορία"
diff --git a/hebrew/po/cdimage.he.po b/hebrew/po/cdimage.he.po
index a82c33a905a..8df7a07c191 100644
--- a/hebrew/po/cdimage.he.po
+++ b/hebrew/po/cdimage.he.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 " Key fingerprint"
-#: ../../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/hebrew/po/distrib.he.po b/hebrew/po/distrib.he.po
index d326b15d92b..23de8f91d34 100644
--- a/hebrew/po/distrib.he.po
+++ b/hebrew/po/distrib.he.po
@@ -129,61 +129,69 @@ msgid "ARM"
msgstr ""
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
-msgid "HP PA-RISC"
+msgid "Hard Float ABI ARM"
msgstr ""
#: ../../english/releases/arches.data:14
-msgid "Hurd 32-bit PC (i386)"
+msgid "HP PA-RISC"
msgstr ""
#: ../../english/releases/arches.data:15
-msgid "32-bit PC (i386)"
+msgid "Hurd 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:16
-msgid "Intel Itanium IA-64"
+msgid "32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:17
-msgid "kFreeBSD 32-bit PC (i386)"
+msgid "Intel Itanium IA-64"
msgstr ""
#: ../../english/releases/arches.data:18
-msgid "kFreeBSD 64-bit PC (amd64)"
+msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:19
-msgid "Motorola 680x0"
+msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
#: ../../english/releases/arches.data:20
-msgid "MIPS (big endian)"
+msgid "Motorola 680x0"
msgstr ""
#: ../../english/releases/arches.data:21
-msgid "MIPS (little endian)"
+msgid "MIPS (big endian)"
msgstr ""
#: ../../english/releases/arches.data:22
-msgid "PowerPC"
+msgid "MIPS (little endian)"
msgstr ""
#: ../../english/releases/arches.data:23
-msgid "IBM S/390"
+msgid "PowerPC"
msgstr ""
#: ../../english/releases/arches.data:24
-msgid "IBM System z"
+msgid "POWER Processors"
msgstr ""
#: ../../english/releases/arches.data:25
+msgid "IBM S/390"
+msgstr ""
+
+#: ../../english/releases/arches.data:26
+msgid "IBM System z"
+msgstr ""
+
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr ""
diff --git a/hebrew/po/doc.he.po b/hebrew/po/doc.he.po
index adfce9e54e1..16242a1fcd6 100644
--- a/hebrew/po/doc.he.po
+++ b/hebrew/po/doc.he.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,69 +338,95 @@ msgstr ""
msgid "Publisher:"
msgstr ""
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr ""
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr ""
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr ""
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr ""
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr ""
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr ""
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr ""
-#: ../../english/doc/manuals.defs:133 ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr ""
-#. 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 ""
+"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 ""
+
+#: ../../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 ""
-"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://packages.debian.org/git\">Git</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:158
+#: ../../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"
" and check out the <kbd>boot-floppies/documentation</kbd> module."
msgstr ""
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr ""
-#: ../../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 ""
-#: ../../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 ""
diff --git a/hebrew/po/newsevents.he.po b/hebrew/po/newsevents.he.po
index 28aa21c59cf..ce8da8eb8ae 100644
--- a/hebrew/po/newsevents.he.po
+++ b/hebrew/po/newsevents.he.po
@@ -25,27 +25,27 @@ msgstr ""
msgid "The newsletter for the Debian community"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "שיחות קודמות:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "שפות:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "מיקום"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "נושאים:"
@@ -334,8 +334,8 @@ msgstr ""
#: ../../english/template/debian/projectnews/footer.wml:6
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 ""
#: ../../english/template/debian/projectnews/footer.wml:10
diff --git a/hebrew/po/organization.he.po b/hebrew/po/organization.he.po
index c847414cb4c..54f05eed373 100644
--- a/hebrew/po/organization.he.po
+++ b/hebrew/po/organization.he.po
@@ -73,7 +73,7 @@ msgid "Officers"
msgstr "קצינים"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "הפצה"
@@ -83,11 +83,11 @@ msgid "Publicity"
msgstr "יחסי ציבור"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "תמיכה ותשתית"
-#. 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 ""
@@ -100,107 +100,107 @@ msgstr "מנהיג"
msgid "Technical Committee"
msgstr "וועדה טכנית"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "מזכיר"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "מיזמי פיתוח"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "ארכיוני FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "מנהל ה-FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "סייעי FTP"
-#: ../../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 "חבילות עצמאיות"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "הנהלת השחרור"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "צוות השחרור"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "אבטחת איכות"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "צוות התקנת המערכת"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "הודעות שחרור"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "הפקה"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "בחינה"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "תמיכה ותשתית"
-#: ../../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
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "ניהול מערכת"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "תיעוד"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "עבודה נדרשת והצעות לאריזת תוכנה"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
#, fuzzy
#| msgid "Installation System Team"
msgid "Live System Team"
msgstr "צוות התקנת המערכת"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr ""
@@ -228,177 +228,173 @@ msgstr "איש קשר לעיתונות"
msgid "Partner Program"
msgstr "שותפים לתוכנית"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "אירועים"
-#: ../../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 "תמיכת משתמשים"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "מערכת מעקב באגים"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "ניהול רשימות תפוצה וארכיון רשימות תפוצה"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "מנהלי חשבונות דביאן"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "צוות אבטחה"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "צוות אבטחה להפצת הבחינה"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr ""
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "דפי רשת"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr ""
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr ""
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "פלאנט דביאן"
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "מדיניות"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "ניהול מערכת"
-#: ../../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."
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr ""
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr ""
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr ""
-#~ msgid "Marketing Team"
-#~ msgstr "צוות שיווק"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "הפצות דביאן מותאמות אישית"
-#~ msgid "Handhelds"
-#~ msgstr "מחשבי כף יד"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "צוות השחרור להפצה ה'יציבה'"
+
+#~ msgid "Vendors"
+#~ msgstr "ספקים"
#~ msgid "APT Team"
#~ msgstr "צוות APT"
-#~ msgid "Vendors"
-#~ msgstr "ספקים"
+#~ msgid "Handhelds"
+#~ msgstr "מחשבי כף יד"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "צוות השחרור להפצה ה'יציבה'"
+#~ msgid "Marketing Team"
+#~ msgstr "צוות שיווק"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "הפצות דביאן מותאמות אישית"
+#~ msgid "Testing Security Team"
+#~ msgstr "צוות אבטחה להפצת הבחינה"
diff --git a/hebrew/po/others.he.po b/hebrew/po/others.he.po
index ad1d8a225f5..073aa6d5045 100644
--- a/hebrew/po/others.he.po
+++ b/hebrew/po/others.he.po
@@ -164,26 +164,6 @@ msgstr ""
msgid "same as the above"
msgstr "כמו למעלה"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "דרושים:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "מי:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "ארכיטקטורה:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "מפרט טכני:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "איפה:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "מוצרים"
@@ -228,24 +208,36 @@ msgstr "תגים"
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "עגילים"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "מזוודות"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
#, fuzzy
#| msgid "suitcases"
msgid "pillowcases"
msgstr "מזוודות"
+#: ../../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 ""
@@ -321,53 +313,68 @@ msgstr "גרסה"
msgid "URL"
msgstr ""
-#~ msgid "Topics:"
-#~ msgstr "נושאים:"
-
-#~ msgid "Location:"
-#~ msgstr "מיקום"
-
-#~ msgid "Languages:"
-#~ msgstr "שפות:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "הרשמה לרשימת התפוצה"
-#~ msgid "Previous Talks:"
-#~ msgstr "שיחות קודמות:"
+#~ 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. "
+#~ msgstr ""
+#~ "בקרו בעמוד <a href=\"./#subunsub\">רשימות תפוצה</a>על מנת לקבל מידע נוסף "
+#~ "כיצד יש להסיר את שמכם מרשימות התפוצה באמצעות שליחת דואר אלקטרוני. ניתן "
+#~ "לעשות זאת גם על ידי מילוי טופס בדף האינטרט <a href=\"unsubscribe\">טופס "
+#~ "הסרה מרשימות תפוצה</a>. "
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
#~ msgstr ""
-#~ "<total_consultant> יועצים לדביאן <total_country> מדינות ברחבי העולם."
+#~ "שימו לב לכך שמרבית רשימות התפוצה של דביאן הינן גלויות לציבור. כל דואר "
+#~ "שיישלח אליהן יפורסם ברבים, יאוכסן בארכיב ויימצא על ידי מנועי חיפוש. עליכם "
+#~ "להרשם לרשימות התפוצה של דביאן באמצעות כתובת דואר אלקטרוני אשר לא אכפת לכם "
+#~ "שתהיה גלויה לציבור. "
-#~ msgid "Willing to Relocate"
-#~ msgstr "מוכן לעבור מקום מגורים"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "נא בחרו לאיזו רשימת תפוצה ברצונכם להרשם:"
-#~ msgid "Rates:"
-#~ msgstr "קצבים:"
+#~ msgid "No description given"
+#~ msgstr "לא ניתן תיאור"
-#~ msgid "Email:"
-#~ msgstr "דואר אלקטרוני:"
+#~ msgid "Moderated:"
+#~ msgstr "מפוקח"
-#~ msgid "or"
-#~ msgstr "או"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "רק משתמשים רשומים יכולים להשאיר הודעות"
-#~ msgid "Company:"
-#~ msgstr "חברה:"
+#~ msgid ""
+#~ "Only messages signed by a Debian developer will be accepted by this list."
+#~ msgstr "רק הודעות חתומות על ידי מפתח דביאן יתקבלו לרשימה זו"
-#~ msgid "Name:"
-#~ msgstr "שם:"
+#~ msgid "Subscription:"
+#~ msgstr "הרשמה"
-#~ msgid "closed"
-#~ msgstr "סגור"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "רשימת תפוצה במצב קריאה בלבד"
-#~ msgid "open"
-#~ msgstr "פתוח"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "כתובת הדואר האלקטרוני שלך"
-#~ msgid "Unsubscribe"
-#~ msgstr "הסרה מרשימת תפוצה"
+#~ msgid "Subscribe"
+#~ msgstr "הרשמה"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "נא בחרו מאיזו רשימת תפוצה להסיר את שמכם:"
+#~ msgid "Clear"
+#~ msgstr "נקה"
+
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr "נא לכבד את <a href=\"./#ads\"> נהלי הפרסום ברשימות התפוצה של דביאן"
+
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "הסרה מרשימת התפוצה"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
@@ -379,65 +386,65 @@ msgstr ""
#~ "לעשות זאת גם על ידי מילוי טופס בדף האינטרט <a href=\"unsubscribe\">טופס "
#~ "הסרה מרשימות תפוצה</a>. "
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "הסרה מרשימת התפוצה"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "נא בחרו מאיזו רשימת תפוצה להסיר את שמכם:"
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr "נא לכבד את <a href=\"./#ads\"> נהלי הפרסום ברשימות התפוצה של דביאן"
+#~ msgid "Unsubscribe"
+#~ msgstr "הסרה מרשימת תפוצה"
-#~ msgid "Clear"
-#~ msgstr "נקה"
+#~ msgid "open"
+#~ msgstr "פתוח"
-#~ msgid "Subscribe"
-#~ msgstr "הרשמה"
+#~ msgid "closed"
+#~ msgstr "סגור"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "כתובת הדואר האלקטרוני שלך"
+#~ msgid "Name:"
+#~ msgstr "שם:"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "רשימת תפוצה במצב קריאה בלבד"
+#~ msgid "Company:"
+#~ msgstr "חברה:"
-#~ msgid "Subscription:"
-#~ msgstr "הרשמה"
+#~ msgid "or"
+#~ msgstr "או"
+
+#~ msgid "Email:"
+#~ msgstr "דואר אלקטרוני:"
+
+#~ msgid "Rates:"
+#~ msgstr "קצבים:"
+
+#~ msgid "Willing to Relocate"
+#~ msgstr "מוכן לעבור מקום מגורים"
#~ msgid ""
-#~ "Only messages signed by a Debian developer will be accepted by this list."
-#~ msgstr "רק הודעות חתומות על ידי מפתח דביאן יתקבלו לרשימה זו"
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> יועצים לדביאן <total_country> מדינות ברחבי העולם."
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "רק משתמשים רשומים יכולים להשאיר הודעות"
+#~ msgid "Previous Talks:"
+#~ msgstr "שיחות קודמות:"
-#~ msgid "Moderated:"
-#~ msgstr "מפוקח"
+#~ msgid "Languages:"
+#~ msgstr "שפות:"
-#~ msgid "No description given"
-#~ msgstr "לא ניתן תיאור"
+#~ msgid "Location:"
+#~ msgstr "מיקום"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "נא בחרו לאיזו רשימת תפוצה ברצונכם להרשם:"
+#~ msgid "Topics:"
+#~ msgstr "נושאים:"
-#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
-#~ msgstr ""
-#~ "שימו לב לכך שמרבית רשימות התפוצה של דביאן הינן גלויות לציבור. כל דואר "
-#~ "שיישלח אליהן יפורסם ברבים, יאוכסן בארכיב ויימצא על ידי מנועי חיפוש. עליכם "
-#~ "להרשם לרשימות התפוצה של דביאן באמצעות כתובת דואר אלקטרוני אשר לא אכפת לכם "
-#~ "שתהיה גלויה לציבור. "
+#~ msgid "Where:"
+#~ msgstr "איפה:"
-#~ 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. "
-#~ msgstr ""
-#~ "בקרו בעמוד <a href=\"./#subunsub\">רשימות תפוצה</a>על מנת לקבל מידע נוסף "
-#~ "כיצד יש להסיר את שמכם מרשימות התפוצה באמצעות שליחת דואר אלקטרוני. ניתן "
-#~ "לעשות זאת גם על ידי מילוי טופס בדף האינטרט <a href=\"unsubscribe\">טופס "
-#~ "הסרה מרשימות תפוצה</a>. "
+#~ msgid "Specifications:"
+#~ msgstr "מפרט טכני:"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "הרשמה לרשימת התפוצה"
+#~ msgid "Architecture:"
+#~ msgstr "ארכיטקטורה:"
+
+#~ msgid "Who:"
+#~ msgstr "מי:"
+
+#~ msgid "Wanted:"
+#~ msgstr "דרושים:"
diff --git a/hebrew/po/ports.he.po b/hebrew/po/ports.he.po
index 08aa2e2c046..3c76c289a5c 100644
--- a/hebrew/po/ports.he.po
+++ b/hebrew/po/ports.he.po
@@ -113,32 +113,32 @@ msgstr "דביאן עבור ארכיטקטורת PowerPC"
msgid "Debian for Sparc"
msgstr "דביאן עבור ארכיטקטורת SPARC"
-#~ msgid "Debian for Laptops"
-#~ msgstr "דביאן למחשבים ניידים"
-
-#~ msgid "Debian for Sparc64"
-#~ msgstr "דביאן עבור ארכיטקטורת SPARC64"
+#~ msgid "Debian for AMD64"
+#~ msgstr "דביאן עבור ארכיטקטורת AMD64"
-#~ msgid "Debian for S/390"
-#~ msgstr "דביאן עבור ארכיטקטורת S/390"
+#~ msgid "Debian for ARM"
+#~ msgstr "דביאן עבור ארכיטקטורת ARM"
-#~ msgid "Debian for MIPS"
-#~ msgstr "דביאן עבור ארכיטקטורת MIPS"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "דביאן עבור ארכיטקטורת Beowulf"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "דביאן עבור ארכיטקטורת Motorola 680x0"
+#~ msgid "Main"
+#~ msgstr "ראשי"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "דביאן GNU/FreeBSD"
-#~ msgid "Main"
-#~ msgstr "ראשי"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "דביאן עבור ארכיטקטורת Motorola 680x0"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "דביאן עבור ארכיטקטורת Beowulf"
+#~ msgid "Debian for MIPS"
+#~ msgstr "דביאן עבור ארכיטקטורת MIPS"
-#~ msgid "Debian for ARM"
-#~ msgstr "דביאן עבור ארכיטקטורת ARM"
+#~ msgid "Debian for S/390"
+#~ msgstr "דביאן עבור ארכיטקטורת S/390"
-#~ msgid "Debian for AMD64"
-#~ msgstr "דביאן עבור ארכיטקטורת AMD64"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "דביאן עבור ארכיטקטורת SPARC64"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "דביאן למחשבים ניידים"
diff --git a/hebrew/po/templates.he.po b/hebrew/po/templates.he.po
index 40c580b8711..a8eefc11250 100644
--- a/hebrew/po/templates.he.po
+++ b/hebrew/po/templates.he.po
@@ -68,7 +68,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "חזרה לעמוד הבית של <a href=\"m4_HOME\">פרויקט דביאן</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 "עמוד הבית"
@@ -109,7 +109,7 @@ msgid "Support"
msgstr "תמיכה"
#: ../../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 "רוצה לתרום ?"
@@ -146,7 +146,7 @@ msgid "Miscellaneous"
msgstr "שונות"
#: ../../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 "הורדה"
@@ -201,7 +201,7 @@ msgstr "בגרסה 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -219,23 +219,23 @@ msgstr ""
"www@lists.debian.org\">debian-www@lists.debian.org</a>. למידע נוסף על אפשרות "
"יצירת קשר, בקרו ב<a href=\"m4_HOME/contact\">דף הקשר</a> של דביאן."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "עודכן לאחרונה"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "כל הזכויות שמורות"
-#: ../../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 ""
-#: ../../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 "ראו <a href=\"m4_HOME/license\" rel=\"copyright\">תנאי הרשיון</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."
@@ -298,140 +298,152 @@ msgid "Debian Books"
msgstr "ספרים על דביאן"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "עזרו לדביאן"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "ארכיון רשימות תפוצה"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "רשימות תפוצה"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "חוזה חברתי"
-#: ../../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 "בקרו באתר נותן החסות"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "מפת אתר עבור דפי הרשת של דביאן"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "מאגר מידע על המפתחים"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "ספרים על דביאן"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "מדריך מדיניות דביאן"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "מידע למפתחים"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "מדריך למתחזקים חדשים"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "באגים קריטיים לשחרור"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "ארכיונים של רשימות התפוצה למשתמשים"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "ארכיונים של רשימות התפוצה למפתחים"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "ארכיונים של רשמיות התפוצה למתרגמים"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "ארכיונים של רשימות התפוצה לארכיטקטורות חומרה "
-#: ../../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 "ארכיון רשימות תפוצה של מערכת מעקב באגים"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "ארכיונים של רשימות תפוצה שונות"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "תוכנה חופשית"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "פיתוח"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "עזרו לדביאן"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "דיווח באגים"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "ארכיטקטורות חומרה"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "מדריך התקנה"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "ספקי תקליטורים"
-#: ../../english/template/debian/links.tags.wml:122
-msgid "CD ISO images"
+#: ../../english/template/debian/links.tags.wml:128
+#, fuzzy
+#| msgid "CD ISO images"
+msgid "CD/USB ISO images"
msgstr "מדיה לצריבה על תקליטורים"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "התקנת רשת"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "מותקן מראש"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "פרויקט דביאן בחינוך"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "אבטחת איכות"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "מערכת מעקב חבילות"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr ""
@@ -512,17 +524,17 @@ msgstr ""
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "חזרה אל עמוד <a href=\"../\">מי משתמש בדביאן?</a>."
-#~ msgid "Rating:"
-#~ msgstr "דירוג:"
+#~ msgid "Select a server near you"
+#~ msgstr "בחר שרת קרוב אליך"
-#~ msgid "Nobody"
-#~ msgstr "אף אחד"
+#~ msgid "More information:"
+#~ msgstr "מידע נוסף:"
#~ msgid "Taken by:"
#~ msgstr "נלקח על ידי:"
-#~ msgid "More information:"
-#~ msgstr "מידע נוסף:"
+#~ msgid "Nobody"
+#~ msgstr "אף אחד"
-#~ msgid "Select a server near you"
-#~ msgstr "בחר שרת קרוב אליך"
+#~ msgid "Rating:"
+#~ msgstr "דירוג:"
diff --git a/hebrew/po/vendors.he.po b/hebrew/po/vendors.he.po
index 88625f8d02e..afc4bc352c2 100644
--- a/hebrew/po/vendors.he.po
+++ b/hebrew/po/vendors.he.po
@@ -9,92 +9,56 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr ""
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr ""
#. ###################
#. 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 ""
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr ""
diff --git a/hebrew/po/vote.he.po b/hebrew/po/vote.he.po
index 6c6b191e56a..16c00f07e40 100644
--- a/hebrew/po/vote.he.po
+++ b/hebrew/po/vote.he.po
@@ -18,229 +18,245 @@ msgid "Time Line"
msgstr ""
#: ../../english/template/debian/votebar.wml:19
-msgid "Nominations"
+msgid "Summary"
msgstr ""
#: ../../english/template/debian/votebar.wml:22
-msgid "Debate"
+msgid "Nominations"
msgstr ""
#: ../../english/template/debian/votebar.wml:25
-msgid "Platforms"
+msgid "Debate"
msgstr ""
#: ../../english/template/debian/votebar.wml:28
-msgid "Proposer"
+msgid "Platforms"
msgstr ""
#: ../../english/template/debian/votebar.wml:31
-msgid "Proposal A Proposer"
+msgid "Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:34
-msgid "Proposal B Proposer"
+msgid "Proposal A Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:37
-msgid "Proposal C Proposer"
+msgid "Proposal B Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:40
-msgid "Proposal D Proposer"
+msgid "Proposal C Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:43
-msgid "Proposal E Proposer"
+msgid "Proposal D Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:46
-msgid "Proposal F Proposer"
+msgid "Proposal E Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:49
-msgid "Seconds"
+msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:52
-msgid "Proposal A Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Proposal B Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal C Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal D Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal E Seconds"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal F Seconds"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Opposition"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Text"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Proposal A"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Proposal B"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal C"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal D"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal E"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal F"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Choices"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Amendment Proposer"
+msgid "Choices"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Amendment Seconds"
+msgid "Amendment Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Text"
+msgid "Amendment Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Proposer A"
+msgid "Amendment Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Seconds A"
+msgid "Amendment Proposer A"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Text A"
+msgid "Amendment Seconds A"
msgstr ""
#: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Proposer B"
+msgid "Amendment Text A"
msgstr ""
#: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Seconds B"
+msgid "Amendment Proposer B"
msgstr ""
#: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Text B"
+msgid "Amendment Seconds B"
msgstr ""
#: ../../english/template/debian/votebar.wml:124
-msgid "Amendments"
+msgid "Amendment Text B"
msgstr ""
#: ../../english/template/debian/votebar.wml:127
-msgid "Proceedings"
+msgid "Amendment Proposer C"
msgstr ""
#: ../../english/template/debian/votebar.wml:130
-msgid "Majority Requirement"
+msgid "Amendment Seconds C"
msgstr ""
#: ../../english/template/debian/votebar.wml:133
-msgid "Data and Statistics"
+msgid "Amendment Text C"
msgstr ""
#: ../../english/template/debian/votebar.wml:136
-msgid "Quorum"
+msgid "Amendments"
msgstr ""
#: ../../english/template/debian/votebar.wml:139
-msgid "Minimum Discussion"
+msgid "Proceedings"
msgstr ""
#: ../../english/template/debian/votebar.wml:142
-msgid "Ballot"
+msgid "Majority Requirement"
msgstr ""
#: ../../english/template/debian/votebar.wml:145
-msgid "Forum"
+msgid "Data and Statistics"
msgstr ""
#: ../../english/template/debian/votebar.wml:148
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:151
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:154
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:157
+msgid "Forum"
+msgstr ""
+
+#: ../../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 ""
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr ""
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr ""
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr ""
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr ""
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr ""
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr ""
diff --git a/hungarian/po/cdimage.hu.po b/hungarian/po/cdimage.hu.po
index 4eaff1243d4..01fd4007324 100644
--- a/hungarian/po/cdimage.hu.po
+++ b/hungarian/po/cdimage.hu.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 " Key fingerprint"
-#: ../../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/hungarian/po/countries.hu.po b/hungarian/po/countries.hu.po
index 694a8a1e548..d94af6ac825 100644
--- a/hungarian/po/countries.hu.po
+++ b/hungarian/po/countries.hu.po
@@ -421,8 +421,8 @@ msgstr "Dél-Afrika"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#~ msgid "Great Britain"
-#~ msgstr "Nagy-Britannia"
-
#~ msgid "Yugoslavia"
#~ msgstr "Jugoszlávia"
+
+#~ msgid "Great Britain"
+#~ msgstr "Nagy-Britannia"
diff --git a/hungarian/po/distrib.hu.po b/hungarian/po/distrib.hu.po
index a334f597d29..e9eed927fff 100644
--- a/hungarian/po/distrib.hu.po
+++ b/hungarian/po/distrib.hu.po
@@ -131,113 +131,123 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
+#, fuzzy
+#| msgid "64-bit PC (amd64)"
+msgid "64-bit ARM (AArch64)"
+msgstr "64-bites 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-bites 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 "packages that contain files or directories named like this"
-#~ msgstr ""
-#~ "azokat csomagokat, amelyek ilyen nevű fájlt vagy könyvtárat tartalmaznak"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "all files in this package"
-#~ msgstr "az összes fájlt ebben a csomagban"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "Case sensitive"
-#~ msgstr "Kis- és nagybetűk különböznek"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "no"
-#~ msgstr "nem"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "yes"
-#~ msgstr "igen"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Részszavakat is keressen"
+#~ msgid "non-US"
+#~ msgstr "non-US"
#~ msgid "Search case sensitive"
#~ msgstr "Kis- és nagybetűk különböznek"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Részszavakat is keressen"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "yes"
+#~ msgstr "igen"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "no"
+#~ msgstr "nem"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "Case sensitive"
+#~ msgstr "Kis- és nagybetűk különböznek"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "all files in this package"
+#~ msgstr "az összes fájlt ebben a csomagban"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr ""
+#~ "azokat csomagokat, amelyek ilyen nevű fájlt vagy könyvtárat tartalmaznak"
diff --git a/hungarian/po/doc.hu.po b/hungarian/po/doc.hu.po
index 75c3927a005..5eb751c17ac 100644
--- a/hungarian/po/doc.hu.po
+++ b/hungarian/po/doc.hu.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 "CD-t tartalmaz:"
msgid "Publisher:"
msgstr "Kiadó:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Szerzők:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Szerkesztők:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Karbantartó:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "Státusz:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "Elérhetőség:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "Utolsó verzió:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(<get-var version />) verzió"
-#: ../../english/doc/manuals.defs:133 ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr "sima szöveg"
-#. 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 ""
-"Használd <a href=\"cvs\">az SVN-t</a>, hogy letöltsd az SGML forrás szöveget "
-"az alábbihoz: <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 ""
" <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" és check-out-old a <kbd>boot-floppies/documentation</kbd> modult."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "CVS a weben"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Debián csomag"
-#: ../../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 "Debian csomag (archivált)"
-#: ../../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 "Nyelv:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Használd <a href=\"cvs\">az SVN-t</a>, hogy letöltsd az SGML forrás "
+#~ "szöveget az alábbihoz: <get-var ddp_pkg_loc />."
diff --git a/hungarian/po/mailinglists.hu.po b/hungarian/po/mailinglists.hu.po
index 6a69d7304da..09586244816 100644
--- a/hungarian/po/mailinglists.hu.po
+++ b/hungarian/po/mailinglists.hu.po
@@ -120,8 +120,8 @@ msgstr "nyitott"
msgid "closed"
msgstr "zárt"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Váaszd ki, melyik listáról szeretnél leiratkozni:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Válaszd ki, melyik listára szeretnél feliratkozni:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Váaszd ki, melyik listáról szeretnél leiratkozni:"
diff --git a/hungarian/po/newsevents.hu.po b/hungarian/po/newsevents.hu.po
index 676bd746942..15dffe572ba 100644
--- a/hungarian/po/newsevents.hu.po
+++ b/hungarian/po/newsevents.hu.po
@@ -27,27 +27,27 @@ msgstr "p<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 "Név:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "E-mail:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Korábbi beszédek:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Nyelv:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Hely:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Támakörök:"
@@ -339,12 +339,17 @@ 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 ""
-"Ha meg akarod kapni e-mailben a kétheti hírlevelünket, <a href=\"https://"
-"lists.debian.org/debian-news/\">iratkozz fel a debian-news listára</a>."
+"Ha meg akarod kapni e-mailben a heti hírlevelünket, <a href=\"https://lists."
+"debian.org/debian-news/\">iratkozz fel a debian-news listára</a>."
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
@@ -462,3 +467,11 @@ msgid ""
"\"mailto:dwn@debian.org\">%s</a>."
msgstr ""
"A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkesztette."
+
+#~ 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 ""
+#~ "Ha meg akarod kapni e-mailben a kétheti hírlevelünket, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">iratkozz fel a debian-news listára</a>."
diff --git a/hungarian/po/organization.hu.po b/hungarian/po/organization.hu.po
index d17a5ba532b..897d9c54bc5 100644
--- a/hungarian/po/organization.hu.po
+++ b/hungarian/po/organization.hu.po
@@ -75,7 +75,7 @@ msgid "Officers"
msgstr "Tisztviselők"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Disztribúció"
@@ -85,11 +85,11 @@ msgid "Publicity"
msgstr "Sajtó és nyilvánosság"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Felhasználói támogatás és infrastruktúra"
-#. 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 ""
@@ -102,109 +102,109 @@ msgstr "Vezető"
msgid "Technical Committee"
msgstr "Szakmai bizottság"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Titkár"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Fejlesztési projektek"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP-archívumok"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "főnök"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "FTP asszisztensek"
-#: ../../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 "Egyedi csomagok"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Kiadásmenedzsment"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "Verzióinformációk"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Minőségbiztosítás"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "A telepítési rendszer karbantartói"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Verzióinformációk"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD-image-ek"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Gyártás"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Tesztelés"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Felhasználói támogatás és infrastruktúra"
-#: ../../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
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Rendszeradminisztráció"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Dokumentáció"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "További munkát igénylő és jövőbeli csomagok"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
#, fuzzy
#| msgid "Installation System Team"
msgid "Live System Team"
msgstr "A telepítési rendszer karbantartói"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Portolások"
@@ -232,87 +232,77 @@ msgstr "Sajtókapcsolatok"
msgid "Partner Program"
msgstr "Partnerségi program"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Események"
-#: ../../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 "Felhasználói támogatás"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Hibakövető rendszer"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
#, fuzzy
#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "A levelezőlisták adminisztrátorai"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Új karbantartók felvétele"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Debian accountok kezelése"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Kulcscsomó-karbantartók (PGP és GPG)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Új karbantartók felvétele"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Biztonsági csoport"
-#: ../../english/intro/organization.data:360
-#, fuzzy
-#| msgid "Security Team"
-msgid "Testing Security Team"
-msgstr "Biztonsági csoport"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Biztonsági ellenőrzési projekt"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Weboldalak"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Konzultánsok oldala"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "CD-terjesztők oldala"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Szabályzat"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Rendszeradminisztráció"
-#: ../../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."
@@ -320,7 +310,7 @@ msgstr ""
"Ezen a címen jelentheted be a Debian gépeivel kapcsolatos problémákat, "
"beleértve a jelszóproblémákat, vagy ha egy csomagot szeretnél telepíttetni."
-#: ../../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 "
@@ -330,144 +320,153 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">Debian-gépek</a> oldalt, ahol "
"megtalálod az egyes gépek adminisztrátorát."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP fejlesztői adatbázis adminisztrátora"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Tükrözések"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "DNS-karbantartó"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Csomagkövető rendszer"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Hardveradomány-koordinátorok"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Alioth-felügyelet"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
#, fuzzy
#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Fejlesztési projektek"
-#: ../../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 gyerekeknek 1-től 99 éves korig"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian az orvosi gyakorlatban és kutatásban"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian az oktatásban"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian az ügyvédi irodákban"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian a fogyatékkal élők számára"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian az orvosi gyakorlatban és kutatásban"
-#, fuzzy
-#~| msgid "Security Testing Team"
-#~ msgid "Marketing Team"
-#~ msgstr "Biztonsági tesztelő csoport"
+#~ msgid "Vendors"
+#~ msgstr "Terjesztők"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Testre szabott Debian disztribúciók"
+#~ msgid "Internal Projects"
+#~ msgstr "Belső projektek"
-#~ msgid "Release Assistants"
-#~ msgstr "Kiadás asszisztensek"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "A \"stable\" telepítőrendszere"
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "A ''stable'' kiadásmenedzsere"
+#~ msgid "Mailing list"
+#~ msgstr "Levelezőlista"
-#~ msgid "APT Team"
-#~ msgstr "APT-team"
+#~ msgid "Installation"
+#~ msgstr "Telepítés"
-#~ msgid "Handhelds"
-#~ msgstr "Tenyérgépek"
+#~ msgid "Delegates"
+#~ msgstr "Képviselők"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Levelezőlista-archívumok"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Ez még nem hivatalos belő Debian projekt, de bejelentette az igényét az "
+#~ "integrációra."
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Kulcsaláírás-koordinátorok"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debian multimédia"
-#~ msgid "Accountant"
-#~ msgstr "Könyvelő"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux a vállalkozási informatikában"
+
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian a nonprofit cégek számára"
#~ msgid "The Universal Operating System as your Desktop"
#~ msgstr "Az univerzális asztali operációs rendszer"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian a nonprofit cégek számára"
+#~ msgid "Accountant"
+#~ msgstr "Könyvelő"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux a vállalkozási informatikában"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Kulcsaláírás-koordinátorok"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debian multimédia"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Levelezőlista-archívumok"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Ez még nem hivatalos belő Debian projekt, de bejelentette az igényét az "
-#~ "integrációra."
+#~ msgid "Handhelds"
+#~ msgstr "Tenyérgépek"
-#~ msgid "Delegates"
-#~ msgstr "Képviselők"
+#~ msgid "APT Team"
+#~ msgstr "APT-team"
-#~ msgid "Installation"
-#~ msgstr "Telepítés"
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "A ''stable'' kiadásmenedzsere"
-#~ msgid "Mailing list"
-#~ msgstr "Levelezőlista"
+#~ msgid "Release Assistants"
+#~ msgstr "Kiadás asszisztensek"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "A \"stable\" telepítőrendszere"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Testre szabott Debian disztribúciók"
-#~ msgid "Internal Projects"
-#~ msgstr "Belső projektek"
+#, fuzzy
+#~| msgid "Security Testing Team"
+#~ msgid "Marketing Team"
+#~ msgstr "Biztonsági tesztelő csoport"
-#~ msgid "Vendors"
-#~ msgstr "Terjesztők"
+#~ msgid "Security Audit Project"
+#~ msgstr "Biztonsági ellenőrzési projekt"
+
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Biztonsági csoport"
diff --git a/hungarian/po/others.hu.po b/hungarian/po/others.hu.po
index 3c122104d46..47b6c79d2e7 100644
--- a/hungarian/po/others.hu.po
+++ b/hungarian/po/others.hu.po
@@ -170,26 +170,6 @@ msgstr "[Debian] (mini gomb)"
msgid "same as the above"
msgstr "mint fent"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Keressük"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Ki:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Architektúra:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Specifikációk:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Hol:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Termékek"
@@ -238,24 +218,36 @@ msgstr "jelvények"
msgid "basketball goals"
msgstr "kosárlabda gólok"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "fülbevalók"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "utitáskák"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
#, fuzzy
#| msgid "suitcases"
msgid "pillowcases"
msgstr "utitáskák"
+#: ../../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 ""
@@ -331,20 +323,26 @@ msgstr "Verzió"
msgid "URL"
msgstr "URL"
-#~ msgid "Older Debian banners"
-#~ msgstr "Régebbi Debian-bannerek"
+#~ msgid "Name:"
+#~ msgstr "Név:"
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "mozgó GIF-banner"
+#~ msgid "Company:"
+#~ msgstr "Cég:"
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "vízszintes banner"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "függőleges banner"
+#~ msgid "or"
+#~ msgstr "vagy"
-#~ msgid "Q"
-#~ msgstr "K"
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Rates:"
+#~ msgstr "Árak:"
+
+#~ msgid "Willing to Relocate"
+#~ msgstr "Bárhol hajlandó"
#~ msgid ""
#~ "<total_consultant> Debian consultants listed in <total_country> countries "
@@ -352,23 +350,32 @@ msgstr "URL"
#~ msgstr ""
#~ "A világ <total_country> országának <total_consultant> Debian-tanácsadója"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Bárhol hajlandó"
+#~ msgid "Q"
+#~ msgstr "K"
-#~ msgid "Rates:"
-#~ msgstr "Árak:"
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "függőleges banner"
-#~ msgid "Email:"
-#~ msgstr "E-mail:"
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "vízszintes banner"
-#~ msgid "or"
-#~ msgstr "vagy"
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "mozgó GIF-banner"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Older Debian banners"
+#~ msgstr "Régebbi Debian-bannerek"
-#~ msgid "Company:"
-#~ msgstr "Cég:"
+#~ msgid "Where:"
+#~ msgstr "Hol:"
-#~ msgid "Name:"
-#~ msgstr "Név:"
+#~ msgid "Specifications:"
+#~ msgstr "Specifikációk:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Architektúra:"
+
+#~ msgid "Who:"
+#~ msgstr "Ki:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Keressük"
diff --git a/hungarian/po/ports.hu.po b/hungarian/po/ports.hu.po
index 77b5bfcc58f..7341155efd0 100644
--- a/hungarian/po/ports.hu.po
+++ b/hungarian/po/ports.hu.po
@@ -113,32 +113,32 @@ msgstr "Debian PowerPC-re"
msgid "Debian for Sparc"
msgstr "Debian Sparc-ra"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian Sparc64-re"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian S/390-re"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian laptopokra"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian MIPS-re"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian AMD64-re"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian Motorola 680x0-ra"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian ARM-ra"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debain GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Bebian Beowolf-ra"
#~ msgid "Main"
#~ msgstr "Fő"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Bebian Beowolf-ra"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debain GNU/FreeBSD"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian ARM-ra"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian Motorola 680x0-ra"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian AMD64-re"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian MIPS-re"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian laptopokra"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian S/390-re"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian Sparc64-re"
diff --git a/hungarian/po/templates.hu.po b/hungarian/po/templates.hu.po
index 304848597a0..df69c8ee9d2 100644
--- a/hungarian/po/templates.hu.po
+++ b/hungarian/po/templates.hu.po
@@ -67,7 +67,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Vissza a <a href=\"m4_HOME/\">Debian-projekt kezdőoldalára</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 "Kezdőoldal"
@@ -108,7 +108,7 @@ msgid "Support"
msgstr "Terméktámogatás"
#: ../../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 "Fejlesztők oldala"
@@ -145,7 +145,7 @@ msgid "Miscellaneous"
msgstr "Egyebek"
#: ../../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 "A Debian beszerzése"
@@ -198,7 +198,7 @@ msgstr ""
#. 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -216,24 +216,24 @@ msgstr ""
"www@lists.debian.org\">debian-www@lists.debian.org</a> címen jelentheted. "
"Egyéb ügyben lásd a <a href=\"m4_HOME/contact\">Kapcsolatfelvétel oldalt</a>."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Legutóbbi módosítás"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr ""
-#: ../../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 ""
-#: ../../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 ""
"Lásd a <a href=\"m4_HOME/license\" rel=\"copyright\">licencfeltételeket</a>"
-#: ../../english/template/debian/footer.wml:111
+#: ../../english/template/debian/footer.wml:112
#, fuzzy
#| msgid ""
#| "Debian is a registered trademark of Software in the Public Interest, Inc."
@@ -301,140 +301,150 @@ msgid "Debian Books"
msgstr "Könyvek a Debianról"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "Segíts a Debiannak"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Levelezőlista-archívumok"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Levelezőlisták"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Társadalmi szerződés"
-#: ../../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 "Látogasd meg szponzorainkat!"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "A Debian-oldalak térképe"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Fejlesztők adatbázisa"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Könyvek a Debianról"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "A Debian policy leírása"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Fejlesztők kézikönyve"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Új karbantartók kézikönyve"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Kritikus hibák"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Lintian-jelentések"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Felhasználói listák archívumai"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Fejlesztői listák archívumai"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Honosítási levelezőlisták archívumai"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Portolási listák archívumai"
-#: ../../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 "A hibakövető rendszer levelezőlistáinak archívumai"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Egyéb levelezőlisták archívumai"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Szabad szoftver"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Fejlesztés"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Segíts a Debiannak"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Hibabejelentések"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Portolás/Architektúrák"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Telepítési útmutató"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "CD-terjesztők"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "ISO CD/USB-fájlok"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Hálózati telepítés"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Előre telepítve"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Debian-Edu projekt"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr ""
@@ -518,129 +528,98 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Vissza a <a href=\"./\">ki használja a Debiant oldalra</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "Konzultánsok névsora"
-
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Vissza a <a href=\"./\">Debian-konzultánsok oldalára</a>."
-
-#~ msgid "Network Install"
-#~ msgstr "Hálózati telepítés"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Szponzorokat keresünk"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Vita tárgya"
-
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Szavazás alatt"
-
-#~ msgid "Decided"
-#~ msgstr "Eldőlt"
-
-#~ msgid "Other"
-#~ msgstr "Egyéb"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Kezdőoldal - Szavazás"
-
-#~ msgid "How&nbsp;To"
-#~ msgstr "Hogyan"
-
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Adj be indítványt"
-
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Módosíts indítványt"
+#~ msgid "Select a server near you"
+#~ msgstr "Válassz hozzád közeli szervert"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Kövess indítványt"
+#~ msgid "More information"
+#~ msgstr "Bővebb információ"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Olvasd el a végeredményt"
+#~ msgid "More Info"
+#~ msgstr "Bővebb információ"
-#~ msgid "Vote"
-#~ msgstr "Szavazz"
+#~ msgid "Related Links"
+#~ msgstr "Kapcsolódó linkek"
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Vissza a többi <a href=\"./\">Debian-hírre</a>."
+#~ msgid "Latest News"
+#~ msgstr "Legfrissebb hírek"
#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
#~ msgstr ""
-#~ "Ha fel akarod venni velünk a kapcsolatot, látogass el <a href=\"m4_HOME/"
-#~ "contact\">ide</a>!"
-
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Architektúrafüggetlen komponens:"
-
-#~ msgid "Source:"
-#~ msgstr "Forrás:"
-
-#~ msgid "Fixed in"
-#~ msgstr "Kijavítása"
-
-#~ msgid "Vulnerable"
-#~ msgstr "Sebezhető"
+#~ "Vissza a többi <a href=\"./\">Debian-hírhez</a> || a <a href=\"m4_HOME/"
+#~ "\">Debian projekt kezdőoldalára</a>."
-#~ msgid "Date Reported"
-#~ msgstr "Bejelentés dátuma"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (nem működő hivatkozás)"
+#, 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 ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "A heti Debian-híreket <a href=\"mailto:dwn@debian.org\">Martin 'Joey' "
-#~ "Schulze</a> szerkeszti."
+#~ "Ha meg akarod kapni e-mailben a heti hírlevelünket, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">iratkozz fel a debian-news listára</a>."
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "A heti Debian-híreket <a href=\"mailto:dwn@debian.org\">Yooseong Yang és "
-#~ "Martin 'Joey' Schulze</a> szerkeszti."
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "<a href=\"../..\">Korábbi híreink</a>"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">Joe 'Zonker' "
-#~ "Brockmeier és Martin 'Joey' Schulze</a> szerkeszti."
+#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">Joe 'Zonker' "
-#~ "Brockmeier, Jean-Christophe Helary és Tollef Fog Heen</a> szerkeszti."
-
-#~ msgid "Discussion"
-#~ msgstr "Vita"
-
-#~ msgid "License Information"
-#~ msgstr "Licencinformáció"
+#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
+#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"plural\" />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 ""
#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> "
#~ "szerkesztette."
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~| "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was 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 ""
#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> "
#~ "szerkesztette."
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Vissza a <a href=\"./\">Debian-előadók oldalára</a>."
+
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
#~ msgstr ""
-#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#~ "Ha meg akarod kapni e-mailben a heti hírlevelünket, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">iratkozz fel a debian-news listára</a>."
#~ msgid ""
#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
@@ -649,94 +628,125 @@ msgstr "Vissza a <a href=\"./\">ki használja a Debiant oldalra</a>."
#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
#~ 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>."
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "Ha meg akarod kapni e-mailben a heti hírlevelünket, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">iratkozz fel a debian-news listára</a>."
-
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Vissza a <a href=\"./\">Debian-előadók oldalára</a>."
+#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~| "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"plural\" />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 ""
#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> "
#~ "szerkesztette."
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
-#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was 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 ""
#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> "
#~ "szerkesztette."
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
+#~ msgid "License Information"
+#~ msgstr "Licencinformáció"
+
+#~ msgid "Discussion"
+#~ msgstr "Vita"
+
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
#~ msgstr ""
-#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">Joe 'Zonker' "
+#~ "Brockmeier, Jean-Christophe Helary és Tollef Fog Heen</a> szerkeszti."
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
#~ msgstr ""
-#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#~ "A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">Joe 'Zonker' "
+#~ "Brockmeier és Martin 'Joey' Schulze</a> szerkeszti."
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "<a href=\"../..\">Korábbi híreink</a>"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "A heti Debian-híreket <a href=\"mailto:dwn@debian.org\">Yooseong Yang és "
+#~ "Martin 'Joey' Schulze</a> szerkeszti."
-#, 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\">Martin "
+#~ "'Joey' Schulze</a>."
#~ msgstr ""
-#~ "Ha meg akarod kapni e-mailben a heti hírlevelünket, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">iratkozz fel a debian-news listára</a>."
+#~ "A heti Debian-híreket <a href=\"mailto:dwn@debian.org\">Martin 'Joey' "
+#~ "Schulze</a> szerkeszti."
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (nem működő hivatkozás)"
+#~ msgid "Date Reported"
+#~ msgstr "Bejelentés dátuma"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Sebezhető"
+
+#~ msgid "Fixed in"
+#~ msgstr "Kijavítása"
+
+#~ msgid "Source:"
+#~ msgstr "Forrás:"
+
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Architektúrafüggetlen komponens:"
#~ 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 ""
-#~ "Vissza a többi <a href=\"./\">Debian-hírhez</a> || a <a href=\"m4_HOME/"
-#~ "\">Debian projekt kezdőoldalára</a>."
+#~ "Ha fel akarod venni velünk a kapcsolatot, látogass el <a href=\"m4_HOME/"
+#~ "contact\">ide</a>!"
-#~ msgid "Latest News"
-#~ msgstr "Legfrissebb hírek"
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Vissza a többi <a href=\"./\">Debian-hírre</a>."
-#~ msgid "Related Links"
-#~ msgstr "Kapcsolódó linkek"
+#~ msgid "Vote"
+#~ msgstr "Szavazz"
-#~ msgid "More Info"
-#~ msgstr "Bővebb információ"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Olvasd el a végeredményt"
-#~ msgid "More information"
-#~ msgstr "Bővebb információ"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Kövess indítványt"
-#~ msgid "Select a server near you"
-#~ msgstr "Válassz hozzád közeli szervert"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Módosíts indítványt"
+
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Adj be indítványt"
+
+#~ msgid "How&nbsp;To"
+#~ msgstr "Hogyan"
+
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Kezdőoldal - Szavazás"
+
+#~ msgid "Other"
+#~ msgstr "Egyéb"
+
+#~ msgid "Decided"
+#~ msgstr "Eldőlt"
+
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Szavazás alatt"
+
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Vita tárgya"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Szponzorokat keresünk"
+
+#~ msgid "Network Install"
+#~ msgstr "Hálózati telepítés"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Vissza a <a href=\"./\">Debian-konzultánsok oldalára</a>."
+
+#~ msgid "List of Consultants"
+#~ msgstr "Konzultánsok névsora"
diff --git a/hungarian/po/vendors.hu.po b/hungarian/po/vendors.hu.po
index fea266d9df3..52cbe7dc5d1 100644
--- a/hungarian/po/vendors.hu.po
+++ b/hungarian/po/vendors.hu.po
@@ -9,141 +9,132 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Eladó:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "Debian oldal címe:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Lehetővé teszi a Debian támogatását:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Ország:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Nemzetközi szállítás:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "e-mail:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "CD típusa:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "DVD Típusa:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Architektúrák:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Eladó"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Támogatás lehetséges"
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
#, fuzzy
#| msgid "Architectures:"
msgid "Architectures"
msgstr "Architektúrák:"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
#, fuzzy
#| msgid "Ship International:"
msgid "Ship International"
msgstr "Nemzetközi szállítás:"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Kapcsolat"
#. ###################
#. 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 "Eladó otthona"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "oldal"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "e-mail"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "Európán belül"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "Néhány helyre"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "forrás"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "és"
-#~ msgid "Official CD"
-#~ msgstr "Hivatalos CD"
+#~ msgid "updated monthly"
+#~ msgstr "havonta frissítve"
-#~ msgid "Official DVD"
-#~ msgstr "Hivatalos DVD"
+#~ msgid "updated twice weekly"
+#~ msgstr "kéthetente frissítve"
-#~ msgid "Development Snapshot"
-#~ msgstr "Fejlesztési pillanatkép"
+#~ msgid "updated weekly"
+#~ msgstr "hetente frissítve"
-#~ msgid "Vendor Release"
-#~ msgstr "Eladói változat"
+#~ msgid "reseller"
+#~ msgstr "viszonteladó"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Többsuörös disztribúció"
+#~ msgid "reseller of $var"
+#~ msgstr "$var viszonteladója"
-#~ msgid "non-US included"
-#~ msgstr "tartalmazza a non-US-t"
+#~ msgid "Custom Release"
+#~ msgstr "Egyéni változat"
-#~ msgid "non-free included"
-#~ msgstr "tartalmazza a non-free-t"
+#~ msgid "vendor additions"
+#~ msgstr "eladói bővítmények"
#~ msgid "contrib included"
#~ msgstr "tartalmazza a contrib-ot"
-#~ msgid "vendor additions"
-#~ msgstr "eladói bővítmények"
+#~ msgid "non-free included"
+#~ msgstr "tartalmazza a non-free-t"
-#~ msgid "Custom Release"
-#~ msgstr "Egyéni változat"
+#~ msgid "non-US included"
+#~ msgstr "tartalmazza a non-US-t"
-#~ msgid "reseller of $var"
-#~ msgstr "$var viszonteladója"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Többsuörös disztribúció"
-#~ msgid "reseller"
-#~ msgstr "viszonteladó"
+#~ msgid "Vendor Release"
+#~ msgstr "Eladói változat"
-#~ msgid "updated weekly"
-#~ msgstr "hetente frissítve"
+#~ msgid "Development Snapshot"
+#~ msgstr "Fejlesztési pillanatkép"
-#~ msgid "updated twice weekly"
-#~ msgstr "kéthetente frissítve"
+#~ msgid "Official DVD"
+#~ msgstr "Hivatalos DVD"
-#~ msgid "updated monthly"
-#~ msgstr "havonta frissítve"
+#~ msgid "Official CD"
+#~ msgstr "Hivatalos CD"
+
+#~ msgid "Architectures:"
+#~ msgstr "Architektúrák:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD Típusa:"
+
+#~ msgid "CD Type:"
+#~ msgstr "CD típusa:"
+
+#~ msgid "email:"
+#~ msgstr "e-mail:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Nemzetközi szállítás:"
+
+#~ msgid "Country:"
+#~ msgstr "Ország:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Lehetővé teszi a Debian támogatását:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian oldal címe:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Eladó:"
diff --git a/hungarian/po/vote.hu.po b/hungarian/po/vote.hu.po
index 3486ef47af5..6124778e881 100644
--- a/hungarian/po/vote.hu.po
+++ b/hungarian/po/vote.hu.po
@@ -18,229 +18,245 @@ msgid "Time Line"
msgstr ""
#: ../../english/template/debian/votebar.wml:19
-msgid "Nominations"
+msgid "Summary"
msgstr ""
#: ../../english/template/debian/votebar.wml:22
-msgid "Debate"
+msgid "Nominations"
msgstr ""
#: ../../english/template/debian/votebar.wml:25
-msgid "Platforms"
+msgid "Debate"
msgstr ""
#: ../../english/template/debian/votebar.wml:28
-msgid "Proposer"
+msgid "Platforms"
msgstr ""
#: ../../english/template/debian/votebar.wml:31
-msgid "Proposal A Proposer"
+msgid "Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:34
-msgid "Proposal B Proposer"
+msgid "Proposal A Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:37
-msgid "Proposal C Proposer"
+msgid "Proposal B Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:40
-msgid "Proposal D Proposer"
+msgid "Proposal C Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:43
-msgid "Proposal E Proposer"
+msgid "Proposal D Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:46
-msgid "Proposal F Proposer"
+msgid "Proposal E Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:49
-msgid "Seconds"
+msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:52
-msgid "Proposal A Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Proposal B Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal C Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal D Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal E Seconds"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal F Seconds"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Opposition"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Text"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Proposal A"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Proposal B"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal C"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal D"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal E"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal F"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Choices"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Amendment Proposer"
+msgid "Choices"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Amendment Seconds"
+msgid "Amendment Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Text"
+msgid "Amendment Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Proposer A"
+msgid "Amendment Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Seconds A"
+msgid "Amendment Proposer A"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Text A"
+msgid "Amendment Seconds A"
msgstr ""
#: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Proposer B"
+msgid "Amendment Text A"
msgstr ""
#: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Seconds B"
+msgid "Amendment Proposer B"
msgstr ""
#: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Text B"
+msgid "Amendment Seconds B"
msgstr ""
#: ../../english/template/debian/votebar.wml:124
-msgid "Amendments"
+msgid "Amendment Text B"
msgstr ""
#: ../../english/template/debian/votebar.wml:127
-msgid "Proceedings"
+msgid "Amendment Proposer C"
msgstr ""
#: ../../english/template/debian/votebar.wml:130
-msgid "Majority Requirement"
+msgid "Amendment Seconds C"
msgstr ""
#: ../../english/template/debian/votebar.wml:133
-msgid "Data and Statistics"
+msgid "Amendment Text C"
msgstr ""
#: ../../english/template/debian/votebar.wml:136
-msgid "Quorum"
+msgid "Amendments"
msgstr ""
#: ../../english/template/debian/votebar.wml:139
-msgid "Minimum Discussion"
+msgid "Proceedings"
msgstr ""
#: ../../english/template/debian/votebar.wml:142
-msgid "Ballot"
+msgid "Majority Requirement"
msgstr ""
#: ../../english/template/debian/votebar.wml:145
-msgid "Forum"
+msgid "Data and Statistics"
msgstr ""
#: ../../english/template/debian/votebar.wml:148
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:151
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:154
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:157
+msgid "Forum"
+msgstr ""
+
+#: ../../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 "Szponzorokat keresünk"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Vita tárgya"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Szavazás alatt"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Eldőlt"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Egyéb"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Kezdőoldal - Szavazás"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Hogyan"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Adj be indítványt"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Módosíts indítványt"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Kövess indítványt"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Olvasd el a végeredményt"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Szavazz"
diff --git a/indonesian/po/cdimage.id.po b/indonesian/po/cdimage.id.po
index 7204a417931..c6297b055b0 100644
--- a/indonesian/po/cdimage.id.po
+++ b/indonesian/po/cdimage.id.po
@@ -13,18 +13,16 @@ msgstr ""
"X-Poedit-Country: INDONESIA\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 " Key fingerprint"
-#: ../../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/indonesian/po/distrib.id.po b/indonesian/po/distrib.id.po
index 1e9471bba5d..27d6f07ee7c 100644
--- a/indonesian/po/distrib.id.po
+++ b/indonesian/po/distrib.id.po
@@ -137,117 +137,125 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
+msgid "Hard Float ABI ARM"
+msgstr ""
+
+#: ../../english/releases/arches.data:14
#, fuzzy
#| msgid "HP PA/RISC"
msgid "HP PA-RISC"
msgstr "HP PA/RISC"
-#: ../../english/releases/arches.data:14
+#: ../../english/releases/arches.data:15
#, fuzzy
#| msgid "Hurd (i386)"
msgid "Hurd 32-bit PC (i386)"
msgstr "Hurd (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:16
+#: ../../english/releases/arches.data:17
#, fuzzy
#| msgid "Intel IA-64"
msgid "Intel Itanium IA-64"
msgstr "Intel IA-64"
-#: ../../english/releases/arches.data:17
+#: ../../english/releases/arches.data:18
msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
-#: ../../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 ""
-#: ../../english/releases/arches.data:21
+#: ../../english/releases/arches.data:22
msgid "MIPS (little endian)"
msgstr ""
-#: ../../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 "packages that contain files or directories named like this"
-#~ msgstr "paket yang mengandung berkas atau direktory seperti ini"
-
-#~ msgid "all files in this package"
-#~ msgstr "semua berkas di paket ini"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "Case sensitive"
-#~ msgstr "Perhatikan jenis huruf"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "no"
-#~ msgstr "tidak"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "yes"
-#~ msgstr "ya"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#, fuzzy
+#~| msgid "Intel x86"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "Intel x86"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Perbolehkan pencarian dengan sub kata kunci"
+#~ msgid "non-US"
+#~ msgstr "non-US"
#~ msgid "Search case sensitive"
#~ msgstr "Search case sensitive"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Perbolehkan pencarian dengan sub kata kunci"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#, fuzzy
-#~| msgid "Intel x86"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "Intel x86"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "yes"
+#~ msgstr "ya"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "no"
+#~ msgstr "tidak"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "Case sensitive"
+#~ msgstr "Perhatikan jenis huruf"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "all files in this package"
+#~ msgstr "semua berkas di paket ini"
+
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "paket yang mengandung berkas atau direktory seperti ini"
diff --git a/indonesian/po/doc.id.po b/indonesian/po/doc.id.po
index 517ad59c2fe..3eb7e332a04 100644
--- a/indonesian/po/doc.id.po
+++ b/indonesian/po/doc.id.po
@@ -12,7 +12,24 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Virtaal 0.6.1\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"
@@ -27,7 +44,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"
@@ -42,15 +59,15 @@ msgstr ""
" dasar untuk pengguna yang menginstall dan memelihara sistemnya sendiri\n"
" (baik itu di rumah, kantor, klub, atau sekolah)."
-#: ../../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"
@@ -64,13 +81,13 @@ msgstr ""
" informasi tentang proyek dan cakupan luas sistem manajemen paket unik "
"Debian."
-#: ../../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"
@@ -100,7 +117,7 @@ msgstr ""
" standar untuk orang yang berpengalaman dalam bootstrap dalam filsafat "
"Debian."
-#: ../../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 -- "
@@ -118,11 +135,11 @@ msgstr ""
"copyleft\n"
" dan data sumbernya tersedia."
-#: ../../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, "
@@ -157,7 +174,7 @@ msgstr ""
" mirip/dekat berbasis Debian-ARM dan mengasumsikan Anda akan bekerja dari\n"
" distribusi ini dan sebaiknya memiliki mesin host berbasis Debian juga."
-#: ../../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"
@@ -170,11 +187,11 @@ msgstr ""
" tentang menariknya dunia komputasi yang dipandu oleh Bill McCarty pada\n"
" <q>Learning Debian GNU/Linux</q>."
-#: ../../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"
@@ -188,11 +205,11 @@ msgstr ""
"dukungan\n"
" 30 hari e-mail gratis."
-#: ../../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"
@@ -214,28 +231,27 @@ msgstr ""
"dengan\n"
" Debian."
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "2 edisi: satu tanpa DVD, yang lainnya dengan 2 DVD (i386)"
-#: ../../english/doc/books.data:208
-msgid ""
-"An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-"mode=viewone&amp;titnr=254925022\">\n"
-" publication</a> is available from Lehmanns Fachbuchhandlung and costs "
-"29.95\n"
-" euro (as of 2008)."
-msgstr ""
-"Sebuah alternatif <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-"mode=viewone&amp;titnr=254925022\">\n"
-" publikasi</a> tersedia dari Lehmanns Fachbuchhandlung dan harganya 29.95\n"
-" &euro; (pada tahun 2008)."
-
-#: ../../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 "
@@ -244,13 +260,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"
@@ -281,11 +297,11 @@ msgstr ""
" pembangunan dial-in router atau server untuk klien berbasis windows "
"(samba)."
-#: ../../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"
@@ -296,13 +312,13 @@ msgstr ""
" desktop, troubleshooting, 'Tahukan Anda' yang bermanfaat dan lain "
"sebagainya."
-#: ../../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"
@@ -321,11 +337,11 @@ msgstr ""
" berguna untuk semua pengguna Debian dari pemula sampai pengguna tingkat\n"
" lanjut."
-#: ../../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"
@@ -341,11 +357,11 @@ msgstr ""
" Anda akan dapat menginstall dan memulai menggunakan Debian GNU/Linux\n"
" lingkungan (berbahasa) Jepang sangat mudah dengan CD yang dikostumisasi."
-#: ../../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 "
@@ -363,11 +379,11 @@ msgstr ""
" Buku ini juga menyertakan panduan untuk maintainer, yang mensimulasi\n"
" orang di Korea untuk menjadi maintainer resmi Debian."
-#: ../../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"
@@ -383,11 +399,11 @@ msgstr ""
" banyak lagi. Buku ini memberikan beberapa tips tentang pengaturan Debian\n"
" untuk lingkungan bahasa Korea, dan juga bagus untuk pendatang baru."
-#: ../../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"
@@ -400,7 +416,7 @@ msgstr ""
" Anda untuk memulai menggunakan GNU/Linux dan sistem manajer paket Debian\n"
" yang powerfull."
-#: ../../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 "
@@ -427,7 +443,7 @@ msgstr ""
" dan siapa saja yang ingin belajar GNU/Linux secara mendalam. Buku ini\n"
" Mencakup Debian Sarge."
-#: ../../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 "
@@ -457,49 +473,73 @@ msgstr "Termasuk CD:"
msgid "Publisher:"
msgstr "Penernit:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Penulis:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Penyunting:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Pemelihara:"
-#: ../../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 "Ketersediaan:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "Versi terbaru:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(versi <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 "plain text"
-#. 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 ""
-"Gunakan <a href=\"cvs\">SVN</a> untuk mengunduh sumber text SGML untuk <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"
@@ -509,25 +549,45 @@ msgstr ""
" ke <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" dan memeriksa modul <kbd>boot-floppies/documentation</kbd>."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "CVS melalui web"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Paket Debian"
-#: ../../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 "Paket Debian (arsip)"
-#: ../../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 "Bahasa:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Gunakan <a href=\"cvs\">SVN</a> untuk mengunduh sumber text SGML untuk "
+#~ "<get-var ddp_pkg_loc />."
+
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "Sebuah alternatif <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publikasi</a> tersedia dari Lehmanns Fachbuchhandlung dan harganya "
+#~ "29.95\n"
+#~ " &euro; (pada tahun 2008)."
diff --git a/indonesian/po/mailinglists.id.po b/indonesian/po/mailinglists.id.po
index 33d4d845627..00453e19d5e 100644
--- a/indonesian/po/mailinglists.id.po
+++ b/indonesian/po/mailinglists.id.po
@@ -124,8 +124,8 @@ msgstr "buka"
msgid "closed"
msgstr "tertutup"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Silakan pilih milis mana yang akan anda batalkan langganannya:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Silakan pilih milis mana yang anda ingin mendaftar:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Silakan pilih milis mana yang akan anda batalkan langganannya:"
diff --git a/indonesian/po/newsevents.id.po b/indonesian/po/newsevents.id.po
index b26f2e6b3b4..2196ff6ce4d 100644
--- a/indonesian/po/newsevents.id.po
+++ b/indonesian/po/newsevents.id.po
@@ -27,27 +27,27 @@ msgstr ""
msgid "The newsletter for the Debian community"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr ""
@@ -336,8 +336,8 @@ msgstr ""
#: ../../english/template/debian/projectnews/footer.wml:6
#, fuzzy
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 ""
"Untuk menerima newsletter mingguan ini di email anda, silahkan <a href="
"\"m4_HOME/MailingLists/subscribe#debian-news\">subscribe</a> ke milis debian-"
@@ -474,3 +474,13 @@ msgid ""
msgstr ""
"Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey Hess</"
"a>."
+
+#, fuzzy
+#~ 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 ""
+#~ "Untuk menerima newsletter mingguan ini di email anda, silahkan <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscribe</a> ke milis "
+#~ "debian-news."
diff --git a/indonesian/po/organization.id.po b/indonesian/po/organization.id.po
index 1632f09f8af..a620e095389 100644
--- a/indonesian/po/organization.id.po
+++ b/indonesian/po/organization.id.po
@@ -78,7 +78,7 @@ msgid "Officers"
msgstr "Petugas"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribusi"
@@ -88,11 +88,11 @@ msgid "Publicity"
msgstr "Publikasi"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Dukungan dan 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 ""
@@ -105,109 +105,109 @@ msgstr "Ketua"
msgid "Technical Committee"
msgstr "Komisi Teknis"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Sekretaris"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Proyek Pengembangan"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Arsip FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP Master"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Asisten FTP"
-#: ../../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 "Paket individu"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Menagement rilis"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "Catatan Rilis"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Jaminan Kualitas"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Tim Instalasi Sistem"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Catatan Rilis"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD Image"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Produksi"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Pengujian"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Dukungan dan infrastruktur"
-#: ../../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
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Administrasi sistem"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Dokumentasi"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Daftar paket yang butuh dikerjakan dan paket yang diharapkan"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
#, fuzzy
#| msgid "Installation System Team"
msgid "Live System Team"
msgstr "Tim Instalasi Sistem"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Ports"
@@ -235,85 +235,75 @@ msgstr "Kontak press"
msgid "Partner Program"
msgstr "Program Partner"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Acara"
-#: ../../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 "Dukungan pengguna"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Sistem Bug Tracking"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
#, fuzzy
#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Asministrasi Milis"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "New Maintainers Front Desk"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Pengelola akun Debian"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Pengelola Keyring (PGP dan GPG)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Tim keamanan"
-#: ../../english/intro/organization.data:360
-#, fuzzy
-#| msgid "Security Team"
-msgid "Testing Security Team"
-msgstr "Tim keamanan"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Proyek audit keamanan"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Halaman web"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Halaman konsultan"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Halaman penyedia CD"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Peraturan"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Administrasi sistem"
-#: ../../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."
@@ -321,7 +311,7 @@ msgstr ""
"Ini adalah alamat yang digunakan ketika menemui satu masalah dalam mesin "
"Debian, termasuk masalah kata sandi atau anda membutuhkan instalasi paket"
-#: ../../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 "
@@ -331,127 +321,136 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">mesin Debian</a>, yang mengandung "
"informasi administrasi per mesin"
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Administrator Direktori LDAP pengembang"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Cermin"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Pengelola DNS"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Sistem tracking paket"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Koordiasi donasi perangkat keras"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Administrator Alioth"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
#, fuzzy
#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Proyek Pengembangan"
-#: ../../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 untuk anak kecil dari 1 sampai 99"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian untuk medis dan penelitian"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian untuk edukasi"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian di kantor hukum"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian untuk penyandang cacat"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian untuk medis dan penelitian"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Distribusi Debian Racikan"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Ini belum menjadi Proyek internal Debian tapi sudah diumumkan akan "
+#~ "disertakan "
-#~ msgid "Release Assistants"
-#~ msgstr "Asisten Rilis"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Distribusi Debian Multimedia"
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "Manager rilis untuk ``stable''"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux untuk Komputasi Enterprise"
-#~ msgid "Vendors"
-#~ msgstr "Penyedia"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian untuk organisasi nirlaba"
-#~ msgid "APT Team"
-#~ msgstr "Tim APT"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Sistem operasi universal sebagai desktop anda"
-#~ msgid "Handhelds"
-#~ msgstr "Handhelds"
+#~ msgid "Accountant"
+#~ msgstr "Akuntan"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Arsip Milis"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinasi penandatanganan kunci"
#~ msgid "Security Testing Team"
#~ msgstr "Tim penguji keamanan"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinasi penandatanganan kunci"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Arsip Milis"
-#~ msgid "Accountant"
-#~ msgstr "Akuntan"
+#~ msgid "Handhelds"
+#~ msgstr "Handhelds"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Sistem operasi universal sebagai desktop anda"
+#~ msgid "APT Team"
+#~ msgstr "Tim APT"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian untuk organisasi nirlaba"
+#~ msgid "Vendors"
+#~ msgstr "Penyedia"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux untuk Komputasi Enterprise"
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "Manager rilis untuk ``stable''"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Distribusi Debian Multimedia"
+#~ msgid "Release Assistants"
+#~ msgstr "Asisten Rilis"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Ini belum menjadi Proyek internal Debian tapi sudah diumumkan akan "
-#~ "disertakan "
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Distribusi Debian Racikan"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "Proyek audit keamanan"
+
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Tim keamanan"
diff --git a/indonesian/po/others.id.po b/indonesian/po/others.id.po
index 79bcf56ce5a..e5bc4165963 100644
--- a/indonesian/po/others.id.po
+++ b/indonesian/po/others.id.po
@@ -123,8 +123,8 @@ msgid ""
"See <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</"
"a> (only available in Spanish) for more information."
msgstr ""
-"Lihat <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</"
-"a> (hanya tersedia dalam bahasa spanyol) untuk informasi lebih lanjut."
+"Lihat <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/"
+"</a> (hanya tersedia dalam bahasa spanyol) untuk informasi lebih lanjut."
#: ../../english/distrib/pre-installed.defs:18
#, fuzzy
@@ -176,26 +176,6 @@ msgstr "[Debian] (tombol mini)"
msgid "same as the above"
msgstr "sama dengan atas"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Dicari:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Siapa?"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Arsitektur:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Spesifikasi"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Dimana:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Produk"
@@ -240,24 +220,36 @@ msgstr "badge"
msgid "basketball goals"
msgstr "basketball goals"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "earrings"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "suitcases"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
#, fuzzy
#| msgid "suitcases"
msgid "pillowcases"
msgstr "suitcases"
+#: ../../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 ""
@@ -332,3 +324,18 @@ msgstr "Versi"
#: ../../english/y2k/l10n.data:36
msgid "URL"
msgstr "URL"
+
+#~ msgid "Where:"
+#~ msgstr "Dimana:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Spesifikasi"
+
+#~ msgid "Architecture:"
+#~ msgstr "Arsitektur:"
+
+#~ msgid "Who:"
+#~ msgstr "Siapa?"
+
+#~ msgid "Wanted:"
+#~ msgstr "Dicari:"
diff --git a/indonesian/po/templates.id.po b/indonesian/po/templates.id.po
index 5118cf3a098..9fe2fb82d63 100644
--- a/indonesian/po/templates.id.po
+++ b/indonesian/po/templates.id.po
@@ -67,7 +67,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Kembali ke <a href=\"m4_HOME/\">Halaman Utama Proyek Debian</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 "Halaman Utama"
@@ -108,7 +108,7 @@ msgid "Support"
msgstr ""
#: ../../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 "Pojok Developer"
@@ -145,7 +145,7 @@ msgid "Miscellaneous"
msgstr "Lain-lain"
#: ../../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 "Memperoleh Debian"
@@ -201,7 +201,7 @@ msgstr "di Debian 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 "
@@ -210,23 +210,23 @@ msgid ""
"\">available</a>."
msgstr ""
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Modifikasi terakhir"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Hak Cipta"
-#: ../../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 ""
-#: ../../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 "Lihat <a href=\"m4_HOME/license\" rel=\"copyright\">Lisensi</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."
@@ -293,142 +293,152 @@ msgid "Debian Books"
msgstr "Buku-buku Tentang Debian"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "Sokong Debian"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Arsip Milis"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Daftar Milis"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Kontrak Sosial"
-#: ../../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 "Sponsor situs web"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Peta situs web Debian"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Basis Data Developer"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Buku-buku Tentang Debian"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Referensi Untuk Developer"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Panduan Bagi Pengelola Baru"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Bug Kritikal"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Laporan Lintian"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Arsip milis debian-user"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Arsip milis debian-devel"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Arsip milis debian-i18n"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Arsip milis debian-ports"
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:98
#, fuzzy
msgid "Archives for mailing lists of the Bug tracking system"
msgstr "Arsip milis debian-ports"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Arsip milis debian-misc"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Perangkat Lunak Free"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Pengembangan"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Sokong Debian"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Petunjuk Instalasi"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
#, fuzzy
msgid "Debian-Edu project"
msgstr "Proyek Debian"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr ""
@@ -518,158 +528,110 @@ msgstr ""
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
-#~ msgid "Select a server near you"
-#~ msgstr "Pilih server terdekat"
-
-#~ msgid "List of Consultants"
-#~ msgstr "Daftar Penasehat"
-
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
-
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Donasi"
-
-#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "telah diajukan"
-
-#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Sedang&nbsp;Didiskusikan"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Menunggu&nbsp;Sponsor"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Sedang&nbsp;Didiskusikan"
+#~ msgid "More information:"
+#~ msgstr "Informasi lainnya:"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Pemungutan&nbsp;Suara&nbsp;Berjalan"
+#~ msgid "More information"
+#~ msgstr "Informasi lebih lanjut"
-#~ msgid "Decided"
-#~ msgstr "Telah&nbsp;Diputuskan"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Acara mendatang"
-#~ msgid "Other"
-#~ msgstr "Lain-lain"
+#~ msgid "link may no longer be valid"
+#~ msgstr "link ini mungkin sudah kadaluwarsa"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Halaman&nbsp;Utama&nbsp;Pemungutan&nbsp;Suara"
+#~ msgid "When"
+#~ msgstr "Waktu"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Bagaimana"
+#~ msgid "Where"
+#~ msgstr "Tempat"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Mengajukan&nbsp;Proposal"
+#~ msgid "More Info"
+#~ msgstr "Informasi lebih lanjut"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Mengubah&nbsp;Proposal"
+#~ msgid "Debian Involvement"
+#~ msgstr "Partisipasi Debian"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Menindaklanjuti&nbsp;Proposal"
+#~ msgid "Main Coordinator"
+#~ msgstr "Koordinator Utama"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Lihat&nbsp;Hasil"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Koordinator</th><th>Proyek</th>"
-#~ msgid "Vote"
-#~ msgstr "Pilih"
+#~ msgid "Related Links"
+#~ msgstr "Info Lainnya"
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (link buntu)"
+#~ msgid "Latest News"
+#~ msgstr "Berita Terbaru"
+#, fuzzy
#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Untuk menghubungi kami, silahkan lihat <a href=\"m4_HOME/contact"
-#~ "\">Halaman kontak</a> Debian."
-
-#~ msgid "discussed"
-#~ msgstr "telah didiskusikan"
-
-#~ msgid "Vulnerable"
-#~ msgstr "Rawan"
-
-#~ msgid "Fixed in"
-#~ msgstr "Telah diperbaiki di"
-
-#~ msgid "Source:"
-#~ msgstr "Sumber"
-
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Komponen yang Arsitektur-independen:"
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "Kembali ke <a href=\"m4_HOME/\">Halaman Utama Proyek Debian</a>."
#, fuzzy
#~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "Checksum MD5 untuk file-file terdaftar tersedia di <a href=\"%attributes"
-#~ "\">original advisory</a>."
+#~ "Untuk menerima newsletter mingguan ini di email anda, silahkan <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscribe</a> ke milis "
+#~ "debian-news."
-#~ 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 ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "Edisi lama newsletter ini tersedia di <a href=\"../../\">sini</a>."
+#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
+#~ "Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
+#~ "Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
#~ "Hess</a>."
#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "tidak&nbsp;ada"
-
-#, fuzzy
-#~ msgid "Discussion"
-#~ msgstr "Sedang&nbsp;Didiskusikan"
-
-#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Informasi lebih lanjut"
-
-#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Paket-paket Terkena Efek"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
+#~ "Hess</a>."
#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "Informasi lebih lanjut"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
-#~ "Hess</a>."
+#~ "Untuk menerima newsletter mingguan ini di email anda, silahkan <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscribe</a> ke milis "
+#~ "debian-news."
#, 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\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
#~ "Hess</a>."
@@ -684,108 +646,156 @@ msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@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 ""
#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
#~ "Hess</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>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "Untuk menerima newsletter mingguan ini di email anda, silahkan <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscribe</a> ke milis "
-#~ "debian-news."
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
+#~ "Hess</a>."
#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
+#~ msgid "No requests for adoption"
+#~ msgstr "Informasi lebih lanjut"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
-#~ "Hess</a>."
+#~ msgid "No Requested packages"
+#~ msgstr "Paket-paket Terkena Efek"
+
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "Informasi lebih lanjut"
+
+#, fuzzy
+#~ msgid "Discussion"
+#~ msgstr "Sedang&nbsp;Didiskusikan"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "tidak&nbsp;ada"
#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
#~ msgstr ""
#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
#~ "Hess</a>."
#, fuzzy
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
-#~ "Hess</a>."
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
-#, fuzzy
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
#~ msgstr ""
-#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joey "
-#~ "Hess</a>."
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "Edisi lama newsletter ini tersedia di <a href=\"../../\">sini</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 ""
+#~ "Debian Weekly News diedit oleh <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
#, fuzzy
#~ 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>."
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
#~ msgstr ""
-#~ "Untuk menerima newsletter mingguan ini di email anda, silahkan <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">subscribe</a> ke milis "
-#~ "debian-news."
+#~ "Checksum MD5 untuk file-file terdaftar tersedia di <a href=\"%attributes"
+#~ "\">original advisory</a>."
+
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Komponen yang Arsitektur-independen:"
+
+#~ msgid "Source:"
+#~ msgstr "Sumber"
+
+#~ msgid "Fixed in"
+#~ msgstr "Telah diperbaiki di"
+
+#~ msgid "Vulnerable"
+#~ msgstr "Rawan"
+
+#~ msgid "discussed"
+#~ msgstr "telah didiskusikan"
-#, fuzzy
#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "Kembali ke <a href=\"m4_HOME/\">Halaman Utama Proyek Debian</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Untuk menghubungi kami, silahkan lihat <a href=\"m4_HOME/contact"
+#~ "\">Halaman kontak</a> Debian."
-#~ msgid "Latest News"
-#~ msgstr "Berita Terbaru"
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (link buntu)"
-#~ msgid "Related Links"
-#~ msgstr "Info Lainnya"
+#~ msgid "Vote"
+#~ msgstr "Pilih"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Koordinator</th><th>Proyek</th>"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Lihat&nbsp;Hasil"
-#~ msgid "Main Coordinator"
-#~ msgstr "Koordinator Utama"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Menindaklanjuti&nbsp;Proposal"
-#~ msgid "Debian Involvement"
-#~ msgstr "Partisipasi Debian"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Mengubah&nbsp;Proposal"
-#~ msgid "More Info"
-#~ msgstr "Informasi lebih lanjut"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Mengajukan&nbsp;Proposal"
-#~ msgid "Where"
-#~ msgstr "Tempat"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Bagaimana"
-#~ msgid "When"
-#~ msgstr "Waktu"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Halaman&nbsp;Utama&nbsp;Pemungutan&nbsp;Suara"
-#~ msgid "link may no longer be valid"
-#~ msgstr "link ini mungkin sudah kadaluwarsa"
+#~ msgid "Other"
+#~ msgstr "Lain-lain"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Acara mendatang"
+#~ msgid "Decided"
+#~ msgstr "Telah&nbsp;Diputuskan"
-#~ msgid "More information"
-#~ msgstr "Informasi lebih lanjut"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Pemungutan&nbsp;Suara&nbsp;Berjalan"
-#~ msgid "More information:"
-#~ msgstr "Informasi lainnya:"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Sedang&nbsp;Didiskusikan"
+
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Menunggu&nbsp;Sponsor"
+
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "Sedang&nbsp;Didiskusikan"
+
+#, fuzzy
+#~ msgid "Proposer"
+#~ msgstr "telah diajukan"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Donasi"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
+
+#~ msgid "List of Consultants"
+#~ msgstr "Daftar Penasehat"
+
+#~ msgid "Select a server near you"
+#~ msgstr "Pilih server terdekat"
diff --git a/indonesian/po/vendors.id.po b/indonesian/po/vendors.id.po
index 6b15ae56352..1ad147befa5 100644
--- a/indonesian/po/vendors.id.po
+++ b/indonesian/po/vendors.id.po
@@ -9,92 +9,56 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr ""
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr ""
#. ###################
#. 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 ""
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr ""
diff --git a/indonesian/po/vote.id.po b/indonesian/po/vote.id.po
index 64e48b7aed5..2ed22516c53 100644
--- a/indonesian/po/vote.id.po
+++ b/indonesian/po/vote.id.po
@@ -18,232 +18,248 @@ msgid "Time Line"
msgstr ""
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
#, fuzzy
msgid "Nominations"
msgstr "Donasi"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr ""
-#: ../../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 "telah diajukan"
-#: ../../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 "Sedang&nbsp;Didiskusikan"
-#: ../../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 "Menunggu&nbsp;Sponsor"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Sedang&nbsp;Didiskusikan"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Pemungutan&nbsp;Suara&nbsp;Berjalan"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Telah&nbsp;Diputuskan"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Lain-lain"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Halaman&nbsp;Utama&nbsp;Pemungutan&nbsp;Suara"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Bagaimana"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Mengajukan&nbsp;Proposal"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Mengubah&nbsp;Proposal"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Menindaklanjuti&nbsp;Proposal"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Lihat&nbsp;Hasil"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Pilih"
diff --git a/italian/po/bugs.it.po b/italian/po/bugs.it.po
index c10735c1165..d2fae48c8a6 100644
--- a/italian/po/bugs.it.po
+++ b/italian/po/bugs.it.po
@@ -160,152 +160,152 @@ msgstr "Archiviati"
msgid "Archived and Unarchived"
msgstr "Archiviati o meno"
-#~ msgid "Flags:"
-#~ msgstr "Opzioni:"
-
-#~ msgid "active bugs"
-#~ msgstr "bug non risolti"
+#~ msgid "Exclude tag:"
+#~ msgstr "Tag escluso:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "mostra i bug unificati solo una volta"
+#~ msgid "Include tag:"
+#~ msgstr "Tag incluso:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "senza ordine per stato o gravità"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "non mostrare l'indice dei contenuti nell'intestazione"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "non mostrare le statistiche nel pié di pagina"
+#~ msgid "wontfix"
+#~ msgstr "wontfix"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "unreproducible"
-#~ msgid "Package version:"
-#~ msgstr "Versione del pacchetto:"
+#~ msgid "security"
+#~ msgstr "security"
-#~ msgid "Distribution:"
-#~ msgstr "Distribuzione:"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "bugs"
-#~ msgstr "bug"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo"
-#~ msgid "open"
-#~ msgstr "open"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "forwarded"
-#~ msgstr "forwarded"
+#~ msgid "help"
+#~ msgstr "help"
-#~ msgid "pending"
-#~ msgstr "pending"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream"
-#~ msgid "fixed"
-#~ msgstr "fixed"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixed-in-experimental"
-#~ msgid "done"
-#~ msgstr "done"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "Include status:"
-#~ msgstr "Stato incluso:"
+#~ msgid "confirmed"
+#~ msgstr "confirmed"
-#~ msgid "Exclude status:"
-#~ msgstr "Stato escluso:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "critical"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore"
-#~ msgid "grave"
-#~ msgstr "grave"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "serious"
-#~ msgstr "serious"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "important"
-#~ msgstr "important"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "minor"
-#~ msgstr "minor"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "wishlist"
-#~ msgstr "wishlist"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "Include severity:"
-#~ msgstr "Includi gravità:"
+#~ msgid "potato"
+#~ msgstr "potato"
#~ msgid "Exclude severity:"
#~ msgstr "Escludi gravità:"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Includi gravità:"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "wishlist"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "minor"
+#~ msgstr "minor"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "important"
+#~ msgstr "important"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "serious"
+#~ msgstr "serious"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "grave"
+#~ msgstr "grave"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore"
+#~ msgid "critical"
+#~ msgstr "critical"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Stato escluso:"
-#~ msgid "confirmed"
-#~ msgstr "confirmed"
+#~ msgid "Include status:"
+#~ msgstr "Stato incluso:"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "done"
+#~ msgstr "done"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixed-in-experimental"
+#~ msgid "fixed"
+#~ msgstr "fixed"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream"
+#~ msgid "pending"
+#~ msgstr "pending"
-#~ msgid "help"
-#~ msgstr "help"
+#~ msgid "forwarded"
+#~ msgstr "forwarded"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "open"
+#~ msgstr "open"
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo"
+#~ msgid "bugs"
+#~ msgstr "bug"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "Distribution:"
+#~ msgstr "Distribuzione:"
-#~ msgid "security"
-#~ msgstr "security"
+#~ msgid "Package version:"
+#~ msgstr "Versione del pacchetto:"
-#~ msgid "unreproducible"
-#~ msgstr "unreproducible"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "wontfix"
-#~ msgstr "wontfix"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "non mostrare le statistiche nel pié di pagina"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "non mostrare l'indice dei contenuti nell'intestazione"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "senza ordine per stato o gravità"
-#~ msgid "Include tag:"
-#~ msgstr "Tag incluso:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "mostra i bug unificati solo una volta"
-#~ msgid "Exclude tag:"
-#~ msgstr "Tag escluso:"
+#~ msgid "active bugs"
+#~ msgstr "bug non risolti"
+
+#~ msgid "Flags:"
+#~ msgstr "Opzioni:"
diff --git a/italian/po/cdimage.it.po b/italian/po/cdimage.it.po
index 4aafdea463c..f2404f93322 100644
--- a/italian/po/cdimage.it.po
+++ b/italian/po/cdimage.it.po
@@ -16,18 +16,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 " Impronta digitale"
-#: ../../english/devel/debian-installer/images.data:90
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "Immagini ISO"
-#: ../../english/devel/debian-installer/images.data:91
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "File jigdo"
diff --git a/italian/po/distrib.it.po b/italian/po/distrib.it.po
index 6a17a4422a3..56361b8c435 100644
--- a/italian/po/distrib.it.po
+++ b/italian/po/distrib.it.po
@@ -2,7 +2,7 @@
# Copyright (C) 2004 Giuseppe Sacco.
# Giuseppe Sacco <eppesuig@debian.org>, 2004, 2007.
# Luca Monducci <luca.mo@tiscali.it>, 2007-2015.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: distrib.it\n"
@@ -14,77 +14,97 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_packages-form.inc:8
#: ../../english/distrib/search_contents-form.inc:9
+#: ../../english/distrib/search_packages-form.inc:8
msgid "Keyword"
msgstr "Parola chiave"
-#: ../../english/distrib/search_packages-form.inc:10
#: ../../english/distrib/search_contents-form.inc:11
+#: ../../english/distrib/search_packages-form.inc:10
msgid "Search"
msgstr "Cerca"
-#: ../../english/distrib/search_packages-form.inc:10
#: ../../english/distrib/search_contents-form.inc:12
+#: ../../english/distrib/search_packages-form.inc:10
msgid "Reset"
msgstr "Reimposta"
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Cerca tra"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Nomi dei pacchetti"
+#: ../../english/distrib/search_contents-form.inc:14
+msgid "Display"
+msgstr "Mostra"
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Descrizioni"
+#: ../../english/distrib/search_contents-form.inc:17
+msgid "paths ending with the keyword"
+msgstr "percorsi che finiscono con la parola chiave"
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Nomi dei pacchetti sorgente"
+#: ../../english/distrib/search_contents-form.inc:20
+msgid "packages that contain files named like this"
+msgstr "pacchetti che contengono file con nomi simili"
-#: ../../english/distrib/search_packages-form.inc:20
-msgid "Only show exact matches"
-msgstr "Mostra solo risultati esatti"
+#: ../../english/distrib/search_contents-form.inc:23
+msgid "packages that contain files whose names contain the keyword"
+msgstr "pacchetti composti da file che contengono la parola chiave nel nome"
-#: ../../english/distrib/search_packages-form.inc:23
#: ../../english/distrib/search_contents-form.inc:25
+#: ../../english/distrib/search_packages-form.inc:23
msgid "Distribution"
msgstr "Distribuzione"
-#: ../../english/distrib/search_packages-form.inc:25
#: ../../english/distrib/search_contents-form.inc:27
+#: ../../english/distrib/search_packages-form.inc:25
msgid "experimental"
msgstr "sperimentale (experimental)"
-#: ../../english/distrib/search_packages-form.inc:26
#: ../../english/distrib/search_contents-form.inc:28
+#: ../../english/distrib/search_packages-form.inc:26
msgid "unstable"
msgstr "instabile (unstable)"
-#: ../../english/distrib/search_packages-form.inc:27
#: ../../english/distrib/search_contents-form.inc:29
+#: ../../english/distrib/search_packages-form.inc:27
msgid "testing"
msgstr "di test (testing)"
-#: ../../english/distrib/search_packages-form.inc:28
#: ../../english/distrib/search_contents-form.inc:30
+#: ../../english/distrib/search_packages-form.inc:28
msgid "stable"
msgstr "stabile (stable)"
-#: ../../english/distrib/search_packages-form.inc:29
#: ../../english/distrib/search_contents-form.inc:31
+#: ../../english/distrib/search_packages-form.inc:29
msgid "oldstable"
msgstr "stabile precedente (oldstable)"
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Architettura"
+
+#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:30
#: ../../english/distrib/search_packages-form.inc:37
-#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "tutte"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Cerca tra"
+
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Nomi dei pacchetti"
+
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Descrizioni"
+
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Nomi dei pacchetti sorgente"
+
+#: ../../english/distrib/search_packages-form.inc:20
+msgid "Only show exact matches"
+msgstr "Mostra solo risultati esatti"
+
#: ../../english/distrib/search_packages-form.inc:32
msgid "Section"
msgstr "Sezione"
@@ -101,26 +121,6 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
-#: ../../english/distrib/search_contents-form.inc:14
-msgid "Display"
-msgstr "Mostra"
-
-#: ../../english/distrib/search_contents-form.inc:17
-msgid "paths ending with the keyword"
-msgstr "percorsi che finiscono con la parola chiave"
-
-#: ../../english/distrib/search_contents-form.inc:20
-msgid "packages that contain files named like this"
-msgstr "pacchetti che contengono file con nomi simili"
-
-#: ../../english/distrib/search_contents-form.inc:23
-msgid "packages that contain files whose names contain the keyword"
-msgstr "pacchetti composti da file che contengono la parola chiave nel nome"
-
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Architettura"
-
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -201,23 +201,23 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "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 "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
diff --git a/italian/po/doc.it.po b/italian/po/doc.it.po
index 1a25c1b81af..3018990e810 100644
--- a/italian/po/doc.it.po
+++ b/italian/po/doc.it.po
@@ -2,7 +2,7 @@
# Copyright (C) 2002 Giuseppe Sacco.
# Giuseppe Sacco <eppesuigoccas@libero.it>, 2002.
# Luca Monducci <luca.mo@tiscali.it>, 2008 - 2014.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: doc.it\n"
@@ -14,123 +14,24 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Autore:"
-
-#: ../../english/doc/books.def:41
-msgid "email:"
-msgstr "email:"
-
-#: ../../english/doc/books.def:45
-msgid "Available at:"
-msgstr "Disponibile presso:"
-
-#: ../../english/doc/books.def:48
-msgid "CD Included:"
-msgstr "CD incluso/i:"
-
-#: ../../english/doc/books.def:51
-msgid "Publisher:"
-msgstr "Editore:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Autori:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Editori:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Manutentore:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Stato:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Disponibilità:"
-
-#: ../../english/doc/manuals.defs:92
-msgid "Latest version:"
-msgstr "Ultima versione:"
-
-#: ../../english/doc/manuals.defs:108
-msgid "(version <get-var version />)"
-msgstr "(versione <get-var version />)"
-
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:34
-msgid "plain text"
-msgstr "solo testo"
-
-#: ../../english/doc/manuals.defs:154
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
-msgstr ""
-"L'ultima <get-var srctype /> è disponibile tramite il repository "
-"<a href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
-
-#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
-msgid "Web interface: "
-msgstr "Interfaccia web:"
-
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
-msgid "VCS interface: "
-msgstr "Interfaccia VCS:"
-
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/books.data:32
msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/cvs\">Cvs</a> repository."
-msgstr ""
-"L'ultima <get-var srctype /> è disponibile tramite il repository "
-"<a href=\"https://packages.debian.org/cvs\">Cvs</a>."
-
-#: ../../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 ""
-"L'ultima <get-var srctype /> è disponibile tramite il repository "
-"<a href=\"https://packages.debian.org/subversion\">Subversion</a>."
-
-#: ../../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 ""
-"L'ultima <get-var srctype /> è disponibile tramite il repository "
-"<a href=\"https://packages.debian.org/git\">Git</a>."
-
-#: ../../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"
-" and check out the <kbd>boot-floppies/documentation</kbd> module."
+"\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 ""
-"Copia dei sorgenti CVS: impostare <code>CVSROOT</code> come <kbd>:ext:"
-"<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd> ed eseguire il check "
-"out del modulo <kbd>boot-floppies/documentation</kbd>."
-#: ../../english/doc/manuals.defs:193
-msgid "CVS via web"
-msgstr "CVS via web"
-
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
-msgid "Debian package"
-msgstr "Pacchetto Debian"
-
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
-msgid "Debian package (archived)"
-msgstr "Pacchetto Debian (archiviato)"
-
-#: ../../english/doc/books.data:30
+#: ../../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"
@@ -156,7 +57,7 @@ msgstr ""
"più avanzati come la configurazione di servizi sicuri con SELinux,\n"
"installazioni automatiche o la virtualizzazione con Xen, KVM o LXC."
-#: ../../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"
@@ -170,15 +71,15 @@ msgstr ""
" l'installazione e l'amministrazione del sistema da soli (a casa propria,\n"
" in ufficio o in una scuola)."
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "CD di sarge, con installatore e una selezione di pacchetti"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "CD live, con Knoppix"
-#: ../../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"
@@ -192,13 +93,13 @@ msgstr ""
" Contiene anche informazioni di base sul progetto e una spiegazione\n"
" dettagliata del sistema di gestione dei pacchetti Debian."
-#: ../../english/doc/books.data:77 ../../english/doc/books.data:180
-#: ../../english/doc/books.data:224 ../../english/doc/books.data:269
+#: ../../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 "DVD ufficiale di Debian GNU/Linux 3.1r0a sarge (i386)"
-#: ../../english/doc/books.data:80 ../../english/doc/books.data:183
-#: ../../english/doc/books.data:227 ../../english/doc/books.data:272
+#: ../../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"
@@ -228,7 +129,7 @@ msgstr ""
" manuale di riferimento per Linux per prendere confidenza con la filosofia\n"
" Debian."
-#: ../../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 -- "
@@ -243,11 +144,11 @@ msgstr ""
" produttività agli aspetti legati alla rete. Come il software che\n"
" descrive, il libro è copyleft e il suo sorgente è disponibile."
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
msgid "Debian 2.2 ARM architecture"
msgstr "Debian 2.2 per architettura ARM"
-#: ../../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, "
@@ -281,7 +182,7 @@ msgstr ""
"questa\n"
" distribuzione e abbia anche un'altra macchina Debian."
-#: ../../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"
@@ -295,11 +196,11 @@ msgstr ""
"informatico\n"
" scritta da Bill McCarty in <q>Learning Debian GNU/Linux</q>."
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
msgid "Debian 2.1"
msgstr "Debian 2.1"
-#: ../../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"
@@ -311,11 +212,11 @@ msgstr ""
" publishing, affari, cose buffe e multimedia.\n"
" Sono compresi 30 giorni di supporto via email."
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "DVD Debian Squeeze i386/amd64"
-#: ../../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"
@@ -339,15 +240,27 @@ msgstr ""
" Debian e gli amministratori che vogliono creare una rete sicura usando\n"
" Debian."
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "2 edizioni: una senza DVD, l'altra con due DVD (i386)"
-#: ../../english/doc/books.data:213
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 e amd64) su DVD"
-#: ../../english/doc/books.data:216
+#: ../../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 "
@@ -361,7 +274,7 @@ msgstr ""
"pratico per tutti gli utenti che vogliono imparare di più su Debian e sui "
"servizi offerti."
-#: ../../english/doc/books.data:244
+#: ../../english/doc/books.data:287
msgid ""
"2 editions: One with no CD, the other with Official CD (i386, contrib and "
"sources)"
@@ -369,7 +282,7 @@ msgstr ""
"2 edizioni: Una senza CD, l'altra con i CD ufficiali (i386, contrib e "
"sorgenti)"
-#: ../../english/doc/books.data:247
+#: ../../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"
@@ -399,11 +312,11 @@ msgstr ""
" è data all gestione della rete e del sistema: pianificare e costruire un\n"
" router di ingresso o un server per stazioni Windows (Samba)."
-#: ../../english/doc/books.data:290
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "Debian GNU/Linux 3.1 Sarge (su CD)"
-#: ../../english/doc/books.data:293
+#: ../../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"
@@ -414,7 +327,7 @@ msgstr ""
" usando vari metodi, la personalizzazione del desktop, la risoluzione dei\n"
" problemi, parecchie nozioni utili e così via."
-#: ../../english/doc/books.data:306
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
@@ -422,7 +335,7 @@ msgstr ""
"Debian GNU/Linux 3.1r0 i386, con personalizzazione da parte dell'autore (DVD "
"+ CD)"
-#: ../../english/doc/books.data:310
+#: ../../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"
@@ -444,11 +357,11 @@ msgstr ""
"agli\n"
" esperti."
-#: ../../english/doc/books.data:325
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr "Debian 2.2r0 i386 edizione dell'autore (3 CD)"
-#: ../../english/doc/books.data:328
+#: ../../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"
@@ -464,11 +377,11 @@ msgstr ""
" Grazie ai CD personalizzati si sarà in grado di installare e inziare ad\n"
" usare Debian GNU/Linux con localizzazione giapponese."
-#: ../../english/doc/books.data:344
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "1 Woody non ufficiale, 3 Potato rev0"
-#: ../../english/doc/books.data:347
+#: ../../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 "
@@ -485,11 +398,11 @@ msgstr ""
" Il libro contiene anche una guida per manutentori, che dovrebbe\n"
" stimolare coreani a diventare manutentori Debian ufficiali."
-#: ../../english/doc/books.data:361
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr "I tre CD ufficiali di potato r3 e un CD non ufficiale di woody"
-#: ../../english/doc/books.data:364
+#: ../../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"
@@ -508,11 +421,11 @@ msgstr ""
" Questo libro fornisce una serie di suggerimenti su come configurare un\n"
" ambiente in lingua coreana ed è molto buono anche per neofiti."
-#: ../../english/doc/books.data:386
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "Debian GNU/Linux 3.1r0 CD1"
-#: ../../english/doc/books.data:389
+#: ../../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"
@@ -524,7 +437,7 @@ msgstr ""
" di rete come web, database, firewall, posta, ftp, ecc. Copre anche l'uso\n"
" del sistema di gestione dei pacchetti di Debian."
-#: ../../english/doc/books.data:405
+#: ../../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 "
@@ -551,7 +464,7 @@ msgstr ""
" per studenti di college e per chiunque voglia conoscere GNU/Linux in\n"
" profondità. Questo libro discute di Debian Sarge."
-#: ../../english/doc/books.data:428
+#: ../../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 "
@@ -567,15 +480,138 @@ msgstr ""
"completa che accompagna il lettore fino a ottenere specifici obiettivi con "
"il sistema operativo Debian GNU/Linux."
-#: ../../english/releases/arches.data:32
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Autore:"
+
+#: ../../english/doc/books.def:41
+msgid "email:"
+msgstr "email:"
+
+#: ../../english/doc/books.def:45
+msgid "Available at:"
+msgstr "Disponibile presso:"
+
+#: ../../english/doc/books.def:48
+msgid "CD Included:"
+msgstr "CD incluso/i:"
+
+#: ../../english/doc/books.def:51
+msgid "Publisher:"
+msgstr "Editore:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Autori:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Editori:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Manutentore:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Stato:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Disponibilità:"
+
+#: ../../english/doc/manuals.defs:92
+msgid "Latest version:"
+msgstr "Ultima versione:"
+
+#: ../../english/doc/manuals.defs:108
+msgid "(version <get-var version />)"
+msgstr "(versione <get-var version />)"
+
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
+msgid "plain text"
+msgstr "solo testo"
+
+#: ../../english/doc/manuals.defs:154
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+msgstr ""
+"L'ultima <get-var srctype /> è disponibile tramite il repository <a href="
+"\"https://www.debian.org/doc/cvs\">Subversion</a>."
+
+#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
+#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+msgid "Web interface: "
+msgstr "Interfaccia web:"
+
+#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+msgid "VCS interface: "
+msgstr "Interfaccia VCS:"
+
+#: ../../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 ""
+"L'ultima <get-var srctype /> è disponibile tramite il repository <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a>."
+
+#: ../../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 ""
+"L'ultima <get-var srctype /> è disponibile tramite il repository <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a>."
+
+#: ../../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 ""
+"L'ultima <get-var srctype /> è disponibile tramite il repository <a href="
+"\"https://packages.debian.org/git\">Git</a>."
+
+#: ../../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"
+" and check out the <kbd>boot-floppies/documentation</kbd> module."
+msgstr ""
+"Copia dei sorgenti CVS: impostare <code>CVSROOT</code> come <kbd>:ext:"
+"<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd> ed eseguire il check "
+"out del modulo <kbd>boot-floppies/documentation</kbd>."
+
+#: ../../english/doc/manuals.defs:193
+msgid "CVS via web"
+msgstr "CVS via web"
+
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+msgid "Debian package"
+msgstr "Pacchetto Debian"
+
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+msgid "Debian package (archived)"
+msgstr "Pacchetto Debian (archiviato)"
+
+#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
msgid "PDF"
msgstr "PDF"
#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Usare <a href=\"cvs\">SVN</a> per scaricare il testo sorgente SGML di "
+#~ "<get-var ddp_pkg_loc />."
+
+#~ 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 "
@@ -586,10 +622,3 @@ msgstr "PDF"
#~ "mode=viewone&amp;titnr=242485044\">\n"
#~ " pubblicazione alternativa</a> è disponibile da Lehmanns\n"
#~ " Fachbuchhandlung a 29,95€ (prezzo di settembre 2008)."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Usare <a href=\"cvs\">SVN</a> per scaricare il testo sorgente SGML di "
-#~ "<get-var ddp_pkg_loc />."
diff --git a/italian/po/l10n.it.po b/italian/po/l10n.it.po
index f9ecffadbc0..33a61794ac8 100644
--- a/italian/po/l10n.it.po
+++ b/italian/po/l10n.it.po
@@ -98,8 +98,8 @@ msgstr "File POT"
msgid "Hints for translators"
msgstr "Suggerimenti per i traduttori"
-#~ msgid "Original templates"
-#~ msgstr "Modelli originali"
-
#~ msgid "Translated templates"
#~ msgstr "Modelli tradotti"
+
+#~ msgid "Original templates"
+#~ msgstr "Modelli originali"
diff --git a/italian/po/newsevents.it.po b/italian/po/newsevents.it.po
index 155467ff6fd..7fe72955600 100644
--- a/italian/po/newsevents.it.po
+++ b/italian/po/newsevents.it.po
@@ -3,7 +3,7 @@
# Giuseppe Sacco <eppesuigoccas@libero.it>, 2002.
# Giuseppe Sacco <eppesuig@debian.org>, 2004-2007.
# Luca Monducci <luca.mo@tiscali.it>, 2008-2015.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: newsevents.it\n"
@@ -15,6 +15,90 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Notizie Debian"
+
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Ultime notizie Debian"
+
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
+
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "La newsletter della comunità Debian"
+
+#: ../../english/events/speakers/speakers.defs:12
+msgid "Name:"
+msgstr "Nome:"
+
+#: ../../english/events/speakers/speakers.defs:15
+msgid "Email:"
+msgstr "E-mail:"
+
+#: ../../english/events/speakers/speakers.defs:20
+msgid "Previous Talks:"
+msgstr "Interventi precedenti:"
+
+#: ../../english/events/speakers/speakers.defs:24
+msgid "Languages:"
+msgstr "Lingue:"
+
+#: ../../english/events/speakers/speakers.defs:28
+msgid "Location:"
+msgstr "Luogo:"
+
+#: ../../english/events/speakers/speakers.defs:31
+msgid "Topics:"
+msgstr "Argomenti:"
+
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Titolo:"
+
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Autore:"
+
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Lingua:"
+
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Data:"
+
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Evento:"
+
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Slide:"
+
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "sorgente"
+
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
+
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
+
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
+
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Abstract"
+
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Prossime attrazioni"
@@ -73,139 +157,6 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (link inesistente)"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Elenco dei relatori"
-
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Ritorna alla <a href=\"./\">pagina dei relatori Debian</a>."
-
-#: ../../english/template/debian/projectnews/footer.wml:6
-msgid ""
-"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
-msgstr ""
-"Per ricevere nella propria casella di posta elettronica questa newsletter, "
-"<a href=\"https://lists.debian.org/debian-news/\">iscriversi alla lista di "
-"messaggi debian-news</a>."
-
-#: ../../english/template/debian/projectnews/footer.wml:10
-#: ../../english/template/debian/weeklynews/footer.wml:10
-msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-msgstr ""
-"Sono disponibili <a href=\"../../\">edizioni precedenti</a> di queste "
-"raccolte settimanali."
-
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
-msgid ""
-"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />Redattore di Debian Project News è <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-msgid ""
-"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />Redattori di Debian Project News sono <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:25
-msgid ""
-"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />Redattore di questo numero di Debian Project News è "
-"<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:30
-msgid ""
-"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />Redattori di questo numero di Debian Project News sono "
-"<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-
-#. One translator only
-#. One translator only
-#: ../../english/template/debian/projectnews/footer.wml:35
-#: ../../english/template/debian/weeklynews/footer.wml:35
-msgid "<void id=\"singular\" />It was translated by %s."
-msgstr "<void id=\"singular\" />Traduzione di %s."
-
-#. Two ore more translators
-#. Two ore more translators
-#: ../../english/template/debian/projectnews/footer.wml:40
-#: ../../english/template/debian/weeklynews/footer.wml:40
-msgid "<void id=\"plural\" />It was translated by %s."
-msgstr "<void id=\"plural\" />Traduzione di %s."
-
-#. One female translator only
-#. One female translator only
-#: ../../english/template/debian/projectnews/footer.wml:45
-#: ../../english/template/debian/weeklynews/footer.wml:45
-msgid "<void id=\"singularfemale\" />It was translated by %s."
-msgstr "<void id=\"singularfemale\" />Traduzione di %s."
-
-#. Two ore more female translators
-#. Two ore more female translators
-#: ../../english/template/debian/projectnews/footer.wml:50
-#: ../../english/template/debian/weeklynews/footer.wml:50
-msgid "<void id=\"pluralfemale\" />It was translated by %s."
-msgstr "<void id=\"pluralfemale\" />Traduzione di %s."
-
-#: ../../english/template/debian/weeklynews/footer.wml:6
-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>."
-msgstr ""
-"Per ricevere le notizie settimanali al tuo indirizzo di posta elettronica, "
-"<a href=\"https://lists.debian.org/debian-news/\">iscriversi alla lista di "
-"messaggi debian-news</a>."
-
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:15
-msgid ""
-"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />Redattore di Debian Weekly News è <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
-
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:20
-msgid ""
-"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />Redattori di Debian Weekly News sono <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
-
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:25
-msgid ""
-"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"singular\" />Redattore di questo numero di Debian Weekly News è "
-"<a href=\"mailto:dwn@debian.org\">%s</a>."
-
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:30
-msgid ""
-"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
-msgstr ""
-"<void id=\"plural\" />Redattori di questo numero di Debian Weekly News sono "
-"<a href=\"mailto:dwn@debian.org\">%s</a>."
-
# Provide also the preposition (vowel issue)
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
@@ -461,89 +412,138 @@ msgstr ""
"news />\">notizie assortite per sviluppatori</a> è stato rilasciato, e copre "
"i seguenti argomenti:"
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "p<get-var page />"
-
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "Nome:"
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "E-mail:"
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "Interventi precedenti:"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Lingue:"
+#: ../../english/template/debian/projectnews/footer.wml:6
+msgid ""
+"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
+"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+"Per ricevere nella propria casella di posta elettronica questa newsletter, "
+"<a href=\"https://lists.debian.org/debian-news/\">iscriversi alla lista di "
+"messaggi debian-news</a>."
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Luogo:"
+#: ../../english/template/debian/projectnews/footer.wml:10
+#: ../../english/template/debian/weeklynews/footer.wml:10
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr ""
+"Sono disponibili <a href=\"../../\">edizioni precedenti</a> di queste "
+"raccolte settimanali."
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Argomenti:"
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+msgid ""
+"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Redattore di Debian Project News è <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Titolo:"
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+msgid ""
+"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Redattori di Debian Project News sono <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Autore:"
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:25
+msgid ""
+"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Redattore di questo numero di Debian Project News è "
+"<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Lingua:"
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:30
+msgid ""
+"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Redattori di questo numero di Debian Project News sono "
+"<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Data:"
+#. One translator only
+#. One translator only
+#: ../../english/template/debian/projectnews/footer.wml:35
+#: ../../english/template/debian/weeklynews/footer.wml:35
+msgid "<void id=\"singular\" />It was translated by %s."
+msgstr "<void id=\"singular\" />Traduzione di %s."
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Evento:"
+#. Two ore more translators
+#. Two ore more translators
+#: ../../english/template/debian/projectnews/footer.wml:40
+#: ../../english/template/debian/weeklynews/footer.wml:40
+msgid "<void id=\"plural\" />It was translated by %s."
+msgstr "<void id=\"plural\" />Traduzione di %s."
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Slide:"
+#. One female translator only
+#. One female translator only
+#: ../../english/template/debian/projectnews/footer.wml:45
+#: ../../english/template/debian/weeklynews/footer.wml:45
+msgid "<void id=\"singularfemale\" />It was translated by %s."
+msgstr "<void id=\"singularfemale\" />Traduzione di %s."
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "sorgente"
+#. Two ore more female translators
+#. Two ore more female translators
+#: ../../english/template/debian/projectnews/footer.wml:50
+#: ../../english/template/debian/weeklynews/footer.wml:50
+msgid "<void id=\"pluralfemale\" />It was translated by %s."
+msgstr "<void id=\"pluralfemale\" />Traduzione di %s."
-#: ../../english/events/talks.defs:32
-msgid "PDF"
-msgstr "PDF"
+#: ../../english/template/debian/speakers.wml:6
+msgid "List of Speakers"
+msgstr "Elenco dei relatori"
-#: ../../english/events/talks.defs:35
-msgid "HTML"
-msgstr "HTML"
+#: ../../english/template/debian/speakers.wml:9
+msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+msgstr "Ritorna alla <a href=\"./\">pagina dei relatori Debian</a>."
-#: ../../english/events/talks.defs:38
-msgid "MagicPoint"
-msgstr "MagicPoint"
+#: ../../english/template/debian/weeklynews/footer.wml:6
+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>."
+msgstr ""
+"Per ricevere le notizie settimanali al tuo indirizzo di posta elettronica, "
+"<a href=\"https://lists.debian.org/debian-news/\">iscriversi alla lista di "
+"messaggi debian-news</a>."
-#: ../../english/events/talks.defs:41
-msgid "Abstract"
-msgstr "Abstract"
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:15
+msgid ""
+"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Redattore di Debian Weekly News è <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Notizie Debian"
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:20
+msgid ""
+"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Redattori di Debian Weekly News sono <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Ultime notizie Debian"
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:25
+msgid ""
+"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />Redattore di questo numero di Debian Weekly News è "
+"<a href=\"mailto:dwn@debian.org\">%s</a>."
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr "La newsletter della comunità Debian"
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:30
+msgid ""
+"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"plural\" />Redattori di questo numero di Debian Weekly News sono "
+"<a href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/italian/po/organization.it.po b/italian/po/organization.it.po
index e06bac7cc8d..cb585817703 100644
--- a/italian/po/organization.it.po
+++ b/italian/po/organization.it.po
@@ -3,7 +3,7 @@
# Giuseppe Sacco <eppesuigoccas@libero.it>, 2003.
# Giuseppe Sacco <eppesuig@debian.org>, 2004, 2005.
# Luca Monducci <luca.mo@tiscali.it>, 2006 - 2015.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: organization.it\n"
@@ -48,13 +48,13 @@ msgid "manager"
msgstr "manager"
#: ../../english/intro/organization.data:32
-msgid "Stable Release Manager"
-msgstr "Gestore del rilascio stabile"
-
-#: ../../english/intro/organization.data:32
msgid "SRM"
msgstr "SRM"
+#: ../../english/intro/organization.data:32
+msgid "Stable Release Manager"
+msgstr "Gestore del rilascio stabile"
+
#: ../../english/intro/organization.data:34
msgid "wizard"
msgstr "mago"
@@ -77,17 +77,17 @@ msgid "Officers"
msgstr "Direttori"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:79
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribuzione"
#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:221
+#: ../../english/intro/organization.data:220
msgid "Publicity"
msgstr "Pubblicità"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Supporto e infrastruttura"
@@ -104,193 +104,193 @@ msgstr "Leader"
msgid "Technical Committee"
msgstr "Commissione tecnica"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Segretario"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Progetti di sviluppo"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Archivi FTP"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "FTP Master"
-#: ../../english/intro/organization.data:89
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Assistenti FTP"
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "Maghi FTP"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Backport"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Team Backport"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Pacchetti individuali"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Gestione del rilascio"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Team di rilascio"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Controllo qualità"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Team per il sistema d'installazione"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Note di rilascio"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Immagini dei CD"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Produzione"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Test"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Infrastruttura di compilazione automatica"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Team wanna-build"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Amministrazione di buildd"
-#: ../../english/intro/organization.data:167
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Documentazione"
-#: ../../english/intro/organization.data:172
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr ""
"Elenco dei pacchetti richiesti e di quelli che necessitano di manodopera "
"(WNPP)"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Team per il sistema live"
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Port"
-#: ../../english/intro/organization.data:211
+#: ../../english/intro/organization.data:210
msgid "Special Configurations"
msgstr "Configurazioni speciali"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:213
msgid "Laptops"
msgstr "Portatili"
-#: ../../english/intro/organization.data:215
+#: ../../english/intro/organization.data:214
msgid "Firewalls"
msgstr "Firewall"
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:215
msgid "Embedded systems"
msgstr "Sistemi embedded"
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:223
msgid "Press Contact"
msgstr "Contatto per la stampa"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:229
msgid "Partner Program"
msgstr "Programma per i partner"
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Eventi"
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Notizie in pillole da Debian"
-#: ../../english/intro/organization.data:248
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Supporto agli utenti"
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Sistema di tracciamento dei bug (BTS)"
-#: ../../english/intro/organization.data:320
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Amministrazione e archivi delle liste di messaggi"
-#: ../../english/intro/organization.data:328
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Accoglienza dei nuovi membri"
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Gestori degli account Debian"
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Gestori del Keyring (PGP e GPG)"
-#: ../../english/intro/organization.data:343
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Manutentore del portachiavi Debian"
-#: ../../english/intro/organization.data:347
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Team della sicurezza"
-#: ../../english/intro/organization.data:362
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Pagine web"
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Pagina dei consulenti"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Pagina dei rivenditori di CD"
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Regolamento"
-#: ../../english/intro/organization.data:386
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Amministrazione del sistema"
-#: ../../english/intro/organization.data:387
+#: ../../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."
@@ -299,7 +299,7 @@ msgstr ""
"delle macchine Debian, ivi inclusi i problemi relativi a password o a "
"pacchetti non installati."
-#: ../../english/intro/organization.data:397
+#: ../../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 "
@@ -309,106 +309,113 @@ msgstr ""
"<a href=\"https://db.debian.org/machines.cgi\">macchine Debian</a>, dovrebbe "
"contenere informazioni sugli amministratori divisi per macchine."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Amministratore dell'elenco LDAP degli sviluppatori"
-#: ../../english/intro/organization.data:399
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Mirror"
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Gestori del DNS"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Sistema di tracciamento dei pacchetti"
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Coordinazione delle donazioni hardware"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Auditor"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:413
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Richieste d'uso del <a name=\"trademark\" href=\"m4_HOME/trademark\">marchio "
"registrato</a>"
-#: ../../english/intro/organization.data:417
-msgid "current Debian Project Leader"
-msgstr "l'attuale Leader del Progetto Debian"
-
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Amministratori di Alioth"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Progetto Debian Women"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "Consiglio d'amministrazione della DebConf"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Anti-molestie"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:436
msgid "Outreach"
msgstr "Coninvolgimento in progetti esterni"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:446
msgid "Debian for children from 1 to 99"
msgstr "Debian per bambini da 1 a 99 anni"
-#: ../../english/intro/organization.data:452
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian per la pratica e la ricerca medica"
-#: ../../english/intro/organization.data:455
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian nell'educazione"
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian negli uffici legali"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian per disabili"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian per la scienza e la ricerca scientifica"
-#~ msgid "Testing Security Team"
-#~ msgstr "Team della sicurezza per testing"
+#~ msgid "Summer of Code 2013 Administrators"
+#~ msgstr "Amministratori Summer of Code 2013"
-#~ msgid "Security Audit Project"
-#~ msgstr "Progetto di verifica della sicurezza"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (Non attivo: non rilasciato con squeeze)"
-#~ msgid "Marketing Team"
-#~ msgstr "Team Marketing"
+#~ msgid "Volatile Team"
+#~ msgstr "Team Volatile"
-#~ msgid "APT Team"
-#~ msgstr "Team APT"
+#~ msgid "Vendors"
+#~ msgstr "Rivenditori"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Il nome di ogni amministratore responsabile dei buildd può essere "
-#~ "trovato su <a href=\"http://www.buildd.net\">http://www.buildd.net</a>. "
-#~ "Scegliere una architetura e una distribuzione per conoscere i buildd "
-#~ "disponibili e i relativi amministratori."
+#~ msgid "Handhelds"
+#~ msgstr "Palmari"
+
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Coordinazione della firma delle chiavi"
+
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Custom Debian Distribution"
+
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Team di rilascio per &ldquo;stable&rdquo;"
+
+#~ msgid "Accountant"
+#~ msgstr "Ragioniere"
+
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Il sistema operativo universale come Desktop"
+
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian per le organizzazioni non-profit"
#~ msgid ""
#~ "The admins responsible for buildd's for a particular arch can be reached "
@@ -419,35 +426,27 @@ msgstr "Debian per la scienza e la ricerca scientifica"
#~ "possono essere contattati all'indirizzo <genericemail arch@buildd.debian."
#~ "org>, per esempio <genericemail i386@buildd.debian.org>."
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian per le organizzazioni non-profit"
-
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Il sistema operativo universale come Desktop"
-
-#~ msgid "Accountant"
-#~ msgstr "Ragioniere"
-
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Team di rilascio per &ldquo;stable&rdquo;"
-
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Custom Debian Distribution"
-
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Coordinazione della firma delle chiavi"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Il nome di ogni amministratore responsabile dei buildd può essere "
+#~ "trovato su <a href=\"http://www.buildd.net\">http://www.buildd.net</a>. "
+#~ "Scegliere una architetura e una distribuzione per conoscere i buildd "
+#~ "disponibili e i relativi amministratori."
-#~ msgid "Handhelds"
-#~ msgstr "Palmari"
+#~ msgid "APT Team"
+#~ msgstr "Team APT"
-#~ msgid "Vendors"
-#~ msgstr "Rivenditori"
+#~ msgid "Marketing Team"
+#~ msgstr "Team Marketing"
-#~ msgid "Volatile Team"
-#~ msgstr "Team Volatile"
+#~ msgid "Security Audit Project"
+#~ msgstr "Progetto di verifica della sicurezza"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (Non attivo: non rilasciato con squeeze)"
+#~ msgid "Testing Security Team"
+#~ msgstr "Team della sicurezza per testing"
-#~ msgid "Summer of Code 2013 Administrators"
-#~ msgstr "Amministratori Summer of Code 2013"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "l'attuale Leader del Progetto Debian"
diff --git a/italian/po/others.it.po b/italian/po/others.it.po
index 5d72f53b884..0f96ea3eb24 100644
--- a/italian/po/others.it.po
+++ b/italian/po/others.it.po
@@ -3,7 +3,7 @@
# Giuseppe Sacco <eppesuigoccas@libero.it>, 2002.
# Giuseppe Sacco <eppesuig@debian.org>, 2004, 2005.
# Luca Monducci <luca.mo@tiscali.it>, 2007-2014.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: others.it\n"
@@ -63,6 +63,42 @@ msgstr "<void id=\"d-i\" />Sconosciuto"
msgid "Unavailable"
msgstr "Non disponibile"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Angolo dei Nuovi Membri"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Passo 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Passo 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Passo 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Passo 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Passo 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Passo 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Passo 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Checklist dei candidati"
+
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -126,6 +162,10 @@ msgstr "[Potenziato da Debian]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (pulsante piccolo)"
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "come in precedenza"
+
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Prodotti"
@@ -198,6 +238,37 @@ msgstr "Coltellini svizzeri"
msgid "USB-Sticks"
msgstr "Chiavette USB"
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Da quanto tempo usi Debian?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Sei una Sviluppatrice Debian?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "In quali aree di Debian sei convolta?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Cosa ti ha spinto a collaborare con Debian?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr "Hai suggerimenti per le donne interessate a collaborare con Debian?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr "Fai parte di altri gruppi di donne legati alle tecnologie? Quali?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Qualche informazione in più su di te..."
+
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -242,93 +313,17 @@ msgstr "Versione"
msgid "URL"
msgstr "URL"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Angolo dei Nuovi Membri"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Passo 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Passo 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Passo 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Passo 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Passo 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Passo 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Passo 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Checklist dei candidati"
-
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Richiesto:"
+#~ msgid "Where:"
+#~ msgstr "Dove:"
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Chi:"
+#~ msgid "Specifications:"
+#~ msgstr "Specifiche:"
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Architettura:"
+#~ msgid "Architecture:"
+#~ msgstr "Architettura:"
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Specifiche:"
+#~ msgid "Who:"
+#~ msgstr "Chi:"
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Dove:"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "come in precedenza"
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Da quanto tempo usi Debian?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Sei una Sviluppatrice Debian?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "In quali aree di Debian sei convolta?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Cosa ti ha spinto a collaborare con Debian?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr "Hai suggerimenti per le donne interessate a collaborare con Debian?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr "Fai parte di altri gruppi di donne legati alle tecnologie? Quali?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Qualche informazione in più su di te..."
+#~ msgid "Wanted:"
+#~ msgstr "Richiesto:"
diff --git a/italian/po/stats.it.po b/italian/po/stats.it.po
index 0ce6e1ff63b..8e4f6ed3500 100644
--- a/italian/po/stats.it.po
+++ b/italian/po/stats.it.po
@@ -1,7 +1,7 @@
# Debian Web Site. stats.it.po
# Francesca Ciceri <madamezou@yahoo.it>
# Luca Monducci <luca.mo@tiscali.it>
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: stats.it.po\n"
@@ -16,75 +16,91 @@ msgstr ""
"X-Poedit-Language: Italian\n"
"X-Poedit-Country: ITALY\n"
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Statistiche di traduzione per il sito web Debian"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Ci sono %d pagine da tradurre."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Ci sono %d byte da tradurre."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Ci sono %d stringhe da tradurre."
+
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Questa traduzione è troppo datata"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Versione della traduzione errata"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "L'originale è più recente di questa traduzione"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "L'originale non esiste più"
-#: ../../stattrans.pl:437
-msgid "hits"
-msgstr "visite"
-
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "numero di visite non disponibile"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:403
+msgid "hits"
+msgstr "visite"
+
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Fare clic per recuperare i dati diffstat"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "Diff unificato"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "Diff colorato"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Riepilogo delle traduzioni per"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544 ../../stattrans.pl:700 ../../stattrans.pl:746
+#: ../../stattrans.pl:789
+msgid "Not translated"
+msgstr "Non tradotte"
+
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
+msgid "Outdated"
+msgstr "Datate"
+
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Tradotte"
-#: ../../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 "Aggiornate"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
-msgid "Outdated"
-msgstr "Datate"
-
-#: ../../stattrans.pl:578 ../../stattrans.pl:737 ../../stattrans.pl:783
-#: ../../stattrans.pl:826
-msgid "Not translated"
-msgstr "Non tradotte"
-
-#: ../../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 "file"
-#: ../../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."
@@ -92,158 +108,140 @@ msgstr ""
"Nota: le pagine sono elencate in base alla popolarità. Passare il puntatore "
"del mouse sul nome della pagina per visualizzare il numero di visite."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Traduzioni datate"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "File"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Commento"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Log"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Traduzione"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Manutentore"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Stato"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Traduttore"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Data"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Pagine generiche non tradotte"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Pagine generiche non tradotte"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Notizie non tradotte"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Notizie non tradotte"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Pagine dei consulenti e degli utenti non tradotte"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Pagine dei consulenti e degli utenti non tradotte"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Pagine internazionali non tradotte"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Pagine internazionali non tradotte"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Pagine tradotte (aggiornate)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Modelli tradotti (file PO)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Statistiche di traduzione dei file PO"
-#: ../../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 "Non tradotti"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Totale"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Totale:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Creato con"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Pagine web tradotte"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Statistiche di traduzione in base al numero delle pagine"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Lingua"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Traduzioni"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Pagine web tradotte (per dimensione)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Statistiche di traduzione in base alla dimensione della pagina"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Statistiche di traduzione per il sito web Debian"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Ci sono %d pagine da tradurre."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Ci sono %d byte da tradurre."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Ci sono %d stringhe da tradurre."
-
-#. TRANSLATORS: The first string is hostname of the debian website mirror, second string is date and time.
-#: ../../english/template/debian/stats_tags.wml:23
-msgid "Hit data from %s, gathered %s."
-msgstr "Numero di visite recuperato da %s il %s."
-
#~ msgid "Origin"
#~ msgstr "Originale"
+
+#~ msgid "Hit data from %s, gathered %s."
+#~ msgstr "Numero di visite recuperato da %s il %s."
diff --git a/italian/po/templates.it.po b/italian/po/templates.it.po
index 23bdf7fda72..c2bee569dcd 100644
--- a/italian/po/templates.it.po
+++ b/italian/po/templates.it.po
@@ -3,7 +3,7 @@
# Giuseppe Sacco <eppesuigoccas@libero.it>, 2002.
# Giuseppe Sacco <eppesuig@debian.org>, 2004-2007.
# Luca Monducci <luca.mo@tiscali.it>, 2008-2015.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: templates.it\n"
@@ -15,6 +15,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Sito web Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Cerca nel sito web Debian."
+
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -511,11 +519,3 @@ msgstr "URL"
#: ../../english/template/debian/users.wml:7
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Ritorna alla <a href=\"../\">pagina Chi usa Debian?</a>."
-
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Sito web Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Cerca nel sito web Debian."
diff --git a/italian/po/vendors.it.po b/italian/po/vendors.it.po
index a11a6cb50f4..c7e6f4db1cc 100644
--- a/italian/po/vendors.it.po
+++ b/italian/po/vendors.it.po
@@ -2,7 +2,7 @@
# Copyright (C) 2002 Giuseppe Sacco.
# Giuseppe Sacco <eppesuigoccas@libero.it>, 2002.
# Luca Monducci <luca.mo@tiscali.it>, 2007-2015.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: vendors.it\n"
@@ -14,100 +14,89 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Venditore:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL della pagina Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Permette i contributi a Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Paese:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Consegne internazionali:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "e-mail:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Tipo di CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Tipo di DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "BD Type:"
-msgstr "Tipo di BD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:15
-msgid "USB Type:"
-msgstr "Tipo di USB:"
-
-#: ../../english/CD/vendors/vendors.CD.def:16
-msgid "Architectures:"
-msgstr "Architetture:"
-
-#: ../../english/CD/vendors/vendors.CD.def:28
msgid "Vendor"
msgstr "Venditore"
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Permette donazioni a Debian"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:16
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD/BD/USB"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr "Architetture"
-#: ../../english/CD/vendors/vendors.CD.def:32
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Consegne internazionali"
-#: ../../english/CD/vendors/vendors.CD.def:33
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Contatto"
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:58
+#: ../../english/CD/vendors/vendors.CD.def:44
msgid "Vendor Home"
msgstr "Sito web"
-#: ../../english/CD/vendors/vendors.CD.def:84
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "pagina"
-#: ../../english/CD/vendors/vendors.CD.def:85
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "e-mail"
-#: ../../english/CD/vendors/vendors.CD.def:128
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "in Europa"
-#: ../../english/CD/vendors/vendors.CD.def:132
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "in alcune regioni"
-#: ../../english/CD/vendors/vendors.CD.def:136
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "sorgente"
-#: ../../english/CD/vendors/vendors.CD.def:140
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "e"
+
+#~ msgid "Architectures:"
+#~ msgstr "Architetture:"
+
+#~ msgid "USB Type:"
+#~ msgstr "Tipo di USB:"
+
+#~ msgid "BD Type:"
+#~ msgstr "Tipo di BD:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Tipo di DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Tipo di CD:"
+
+#~ msgid "email:"
+#~ msgstr "e-mail:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Consegne internazionali:"
+
+#~ msgid "Country:"
+#~ msgstr "Paese:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Permette i contributi a Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL della pagina Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Venditore:"
diff --git a/italian/po/vote.it.po b/italian/po/vote.it.po
index 3410b200317..610f189a975 100644
--- a/italian/po/vote.it.po
+++ b/italian/po/vote.it.po
@@ -3,7 +3,7 @@
# Giuseppe Sacco <eppesuigoccas@libero.it>, 2002.
# Giuseppe Sacco <eppesuig@debian.org>, 2004-2007.
# Luca Monducci <luca.mo@tiscali.it>, 2008-2015.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: templates.it\n"
diff --git a/japanese/po/bugs.ja.po b/japanese/po/bugs.ja.po
index 441b26539b4..419a9495fa2 100644
--- a/japanese/po/bugs.ja.po
+++ b/japanese/po/bugs.ja.po
@@ -156,149 +156,149 @@ msgstr "アーカイブされているもの"
msgid "Archived and Unarchived"
msgstr "アーカイブされているものとされていないものの両方"
-#~ msgid "security"
-#~ msgstr "セキュリティ (security)"
+#~ msgid "Flags:"
+#~ msgstr "設定:"
-#~ msgid "Exclude tag:"
-#~ msgstr "含めないタグ:"
+#~ msgid "active bugs"
+#~ msgstr "未解決"
-#~ msgid "Include tag:"
-#~ msgstr "含めるタグ:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "マージしたバグを1度しか表示しない"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "状態や重要度の順に並べない"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "ヘッダ部分に目次を示さない"
-#~ msgid "wontfix"
-#~ msgstr "修正予定無 (wontfix)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "フッタ部分に統計を示さない"
-#~ msgid "upstream"
-#~ msgstr "上流 (upstream)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "unreproducible"
-#~ msgstr "再現不可能 (unreproducible)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "patch"
-#~ msgstr "パッチ (patch)"
+#~ msgid "Package version:"
+#~ msgstr "パッケージバージョン:"
-#~ msgid "moreinfo"
-#~ msgstr "追加情報 (moreinfo)"
+#~ msgid "Distribution:"
+#~ msgstr "ディストリビューション:"
-#~ msgid "l10n"
-#~ msgstr "地域化 (l10n)"
+#~ msgid "bugs"
+#~ msgstr "バグ"
-#~ msgid "help"
-#~ msgstr "助けを求む (help)"
+#~ msgid "open"
+#~ msgstr "オープン"
-#~ msgid "fixed-upstream"
-#~ msgstr "上流で修正済 (fixed-upstream)"
+#~ msgid "forwarded"
+#~ msgstr "上流に転送済"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "experimental で修正済 (fixed-in-experimental)"
+#~ msgid "pending"
+#~ msgstr "留保"
-#~ msgid "d-i"
-#~ msgstr "インストーラ (d-i)"
+#~ msgid "fixed"
+#~ msgstr "修正済"
-#~ msgid "confirmed"
-#~ msgstr "確認済 (confirmed)"
+#~ msgid "Include status:"
+#~ msgstr "含める状態:"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "含めない状態:"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny では無視 (lenny-ignore)"
+#~ msgid "critical"
+#~ msgstr "致命的 (critical)"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "grave"
+#~ msgstr "重大 (grave)"
-#~ msgid "etch-ignore"
-#~ msgstr "etch では無視 (etch-ignore)"
+#~ msgid "serious"
+#~ msgstr "深刻 (serious)"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "important"
+#~ msgstr "重要 (important)"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge では無視 (sarge-ignore)"
+#~ msgid "minor"
+#~ msgstr "軽度 (minor)"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "要望 (wishlist)"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "含める重要度:"
#~ msgid "Exclude severity:"
#~ msgstr "含めない重要度:"
-#~ msgid "Include severity:"
-#~ msgstr "含める重要度:"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "wishlist"
-#~ msgstr "要望 (wishlist)"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "minor"
-#~ msgstr "軽度 (minor)"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge では無視 (sarge-ignore)"
-#~ msgid "important"
-#~ msgstr "重要 (important)"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "serious"
-#~ msgstr "深刻 (serious)"
+#~ msgid "etch-ignore"
+#~ msgstr "etch では無視 (etch-ignore)"
-#~ msgid "grave"
-#~ msgstr "重大 (grave)"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "critical"
-#~ msgstr "致命的 (critical)"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny では無視 (lenny-ignore)"
-#~ msgid "Exclude status:"
-#~ msgstr "含めない状態:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "Include status:"
-#~ msgstr "含める状態:"
+#~ msgid "confirmed"
+#~ msgstr "確認済 (confirmed)"
-#~ msgid "fixed"
-#~ msgstr "修正済"
+#~ msgid "d-i"
+#~ msgstr "インストーラ (d-i)"
-#~ msgid "pending"
-#~ msgstr "留保"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "experimental で修正済 (fixed-in-experimental)"
-#~ msgid "forwarded"
-#~ msgstr "上流に転送済"
+#~ msgid "fixed-upstream"
+#~ msgstr "上流で修正済 (fixed-upstream)"
-#~ msgid "open"
-#~ msgstr "オープン"
+#~ msgid "help"
+#~ msgstr "助けを求む (help)"
-#~ msgid "bugs"
-#~ msgstr "バグ"
+#~ msgid "l10n"
+#~ msgstr "地域化 (l10n)"
-#~ msgid "Distribution:"
-#~ msgstr "ディストリビューション:"
+#~ msgid "moreinfo"
+#~ msgstr "追加情報 (moreinfo)"
-#~ msgid "Package version:"
-#~ msgstr "パッケージバージョン:"
+#~ msgid "patch"
+#~ msgstr "パッチ (patch)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "再現不可能 (unreproducible)"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "上流 (upstream)"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "フッタ部分に統計を示さない"
+#~ msgid "wontfix"
+#~ msgstr "修正予定無 (wontfix)"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "ヘッダ部分に目次を示さない"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "状態や重要度の順に並べない"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "display merged bugs only once"
-#~ msgstr "マージしたバグを1度しか表示しない"
+#~ msgid "Include tag:"
+#~ msgstr "含めるタグ:"
-#~ msgid "active bugs"
-#~ msgstr "未解決"
+#~ msgid "Exclude tag:"
+#~ msgstr "含めないタグ:"
-#~ msgid "Flags:"
-#~ msgstr "設定:"
+#~ msgid "security"
+#~ msgstr "セキュリティ (security)"
diff --git a/japanese/po/cdimage.ja.po b/japanese/po/cdimage.ja.po
index 86269235276..b0db8acf611 100644
--- a/japanese/po/cdimage.ja.po
+++ b/japanese/po/cdimage.ja.po
@@ -10,19 +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:43 ../../english/CD/CD-keys.data:48
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
msgid " Key fingerprint"
msgstr " 指紋"
-#: ../../english/devel/debian-installer/images.data:92
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "ISO イメージ"
-#: ../../english/devel/debian-installer/images.data:93
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "Jigdo ファイル"
diff --git a/japanese/po/distrib.ja.po b/japanese/po/distrib.ja.po
index ed6e4b0c219..e35437291b3 100644
--- a/japanese/po/distrib.ja.po
+++ b/japanese/po/distrib.ja.po
@@ -130,112 +130,122 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
+#, fuzzy
+#| msgid "64-bit PC (amd64)"
+msgid "64-bit ARM (AArch64)"
+msgstr "64 ビット 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 "Hard Float ABI ARM"
-#: ../../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 ビット PC (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr "32 ビット 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 ビット PC (i386)"
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr "kFreeBSD 64 ビット 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 (ビッグエンディアン)"
-#: ../../english/releases/arches.data:21
+#: ../../english/releases/arches.data:22
msgid "MIPS (little endian)"
msgstr "MIPS (リトルエンディアン)"
-#: ../../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 "IBM System z"
-#: ../../english/releases/arches.data:25
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "no"
-#~ msgstr "しない"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "Search case sensitive"
-#~ msgstr "大文字小文字の区別"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "単語の部分検索"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "yes"
-#~ msgstr "する"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "Case sensitive"
-#~ msgstr "大文字小文字の区別"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "キーワードに似た名前のファイルやディレクトリを含むパッケージ"
#~ msgid "all files in this package"
#~ msgstr "キーワードで示されるパッケージに含まれるファイルの一覧"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "キーワードに似た名前のファイルやディレクトリを含むパッケージ"
+#~ msgid "Case sensitive"
+#~ msgstr "大文字小文字の区別"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "yes"
+#~ msgstr "する"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "単語の部分検索"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "Search case sensitive"
+#~ msgstr "大文字小文字の区別"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "no"
+#~ msgstr "しない"
diff --git a/japanese/po/doc.ja.po b/japanese/po/doc.ja.po
index 2c5cff1888d..d9b27b93c53 100644
--- a/japanese/po/doc.ja.po
+++ b/japanese/po/doc.ja.po
@@ -10,124 +10,24 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "著者名:"
-
-#: ../../english/doc/books.def:41
-msgid "email:"
-msgstr "電子メール:"
-
-#: ../../english/doc/books.def:45
-msgid "Available at:"
-msgstr "入手先:"
-
-#: ../../english/doc/books.def:48
-msgid "CD Included:"
-msgstr "収録される CD:"
-
-#: ../../english/doc/books.def:51
-msgid "Publisher:"
-msgstr "出版社:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "著者名:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "編集者名:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "メンテナ:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "状態:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "入手:"
-
-#: ../../english/doc/manuals.defs:92
-msgid "Latest version:"
-msgstr "最新バージョン:"
-
-#: ../../english/doc/manuals.defs:108
-msgid "(version <get-var version />)"
-msgstr "(バージョン <get-var version />)"
-
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:34
-msgid "plain text"
-msgstr "プレーンテキスト"
-
-#: ../../english/doc/manuals.defs:154
+#: ../../english/doc/books.data:32
msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+"\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 ""
-"最新の <get-var srctype /> ソースは <a href=\"https://www.debian.org/doc/"
-"cvs\">Subversion</a> リポジトリ経由で利用できるようになっています。"
-#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
-msgid "Web interface: "
-msgstr "ウェブインターフェイス: "
-
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
-msgid "VCS interface: "
-msgstr "VCS インターフェイス: "
-
-#: ../../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 ""
-"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/"
-"cvs\">Cvs</a> リポジトリ経由で利用できるようになっています。"
-
-#: ../../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 ""
-"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/"
-"subversion\">Subversion</a> リポジトリ経由で利用できるようになっています。"
-
-#: ../../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 ""
-"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/"
-"git\">Git</a> リポジトリ経由で利用できるようになっています。"
-
-#: ../../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"
-" and check out the <kbd>boot-floppies/documentation</kbd> module."
-msgstr ""
-"作業中の CVS ソースを得るには: <code>CVSROOT</code> 変数を\n"
-"<kbd>:ext:<var>ユーザID</var>@cvs.debian.org:/cvs/debian-boot</kbd>\n"
-"に設定し、<kbd>boot-floppies/documentation</kbd> モジュールを checkout してく"
-"ださい。"
-
-#: ../../english/doc/manuals.defs:193
-msgid "CVS via web"
-msgstr "ウェブ経由で CVS を見る"
-
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
-msgid "Debian package"
-msgstr "Debian パッケージ"
-
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
-msgid "Debian package (archived)"
-msgstr "Debian パッケージ (アーカイブ)"
-
-#: ../../english/doc/books.data:30
+#: ../../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"
@@ -153,7 +53,7 @@ msgstr ""
"た\n"
" 新しい事項についても見落とすことなく触れています。"
-#: ../../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"
@@ -168,15 +68,15 @@ msgstr ""
" 自らシステムをインストールしてメンテナンスするユーザのための、\n"
" 基本的なサポートを網羅しています。"
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "インストーラと選り抜きのパッケージを収録した Sarge CD"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "Knoppix 収録のライブ CD"
-#: ../../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"
@@ -190,13 +90,13 @@ msgstr ""
" Debian プロジェクトの背景に関する情報や、広範囲に及ぶ Debian\n"
" 独自のパッケージ管理システムにも触れています。"
-#: ../../english/doc/books.data:77 ../../english/doc/books.data:180
-#: ../../english/doc/books.data:224 ../../english/doc/books.data:269
+#: ../../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 "公式 Debian GNU/Linux 3.1r0a \"sarge\" DVD (i386) 版"
-#: ../../english/doc/books.data:80 ../../english/doc/books.data:183
-#: ../../english/doc/books.data:227 ../../english/doc/books.data:272
+#: ../../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"
@@ -223,7 +123,7 @@ msgstr ""
" のリファレンスとしても優れた情報源として Debian\n"
" のボトムアップな考え方を通じて、自力で Linux を経験するために役立ちます。"
-#: ../../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 -- "
@@ -241,11 +141,11 @@ msgstr ""
" この本もコピーレフトになっていて、\n"
" データソースが入手できます。"
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
msgid "Debian 2.2 ARM architecture"
msgstr "Debian 2.2 ARM アーキテクチャ版"
-#: ../../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, "
@@ -278,7 +178,7 @@ msgstr ""
" また読者はこのディストリビューションから初めて、\n"
" Debian ベースのホストマシンを構築できるようになっています。"
-#: ../../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"
@@ -293,11 +193,11 @@ msgstr ""
" エキサイティングなコンピューティングワールドへの\n"
" 親切な手引きを得ることができるでしょう。"
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
msgid "Debian 2.1"
msgstr "Debian 2.1"
-#: ../../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"
@@ -309,11 +209,11 @@ msgstr ""
" デスクトップパブリシング、ビジネス、おもしろい物、マルチメディア\n"
" などを扱っています。30 日間のフリーな電子メールサポートが含まれています。"
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "Debian Squeeze i386/amd64 DVD 版"
-#: ../../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"
@@ -333,15 +233,27 @@ msgstr ""
" Debian を使って信頼性のあるネットワークを構築したい管理者など、\n"
" 多くの人々にとって興味深いものとなっています。"
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "2 種類あります: DVD 付属無しと DVD 2 枚 (i386 収録) 付き"
-#: ../../english/doc/books.data:213
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr "Debian Squeeze 6.0.1a, Multi-Arch (i386 および amd64) DVD"
-#: ../../english/doc/books.data:216
+#: ../../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 "
@@ -354,14 +266,14 @@ msgstr ""
"ン 6.0) のあらゆる潜在能力を示し、Debian およびその対応業務の範囲について理解"
"しようとする全ユーザに実用的なマニュアルを提供します。"
-#: ../../english/doc/books.data:244
+#: ../../english/doc/books.data:287
msgid ""
"2 editions: One with no CD, the other with Official CD (i386, contrib and "
"sources)"
msgstr ""
"2 種類あります: CD 付属無しと公式 CD (i386, contrib およびソース収録) 付き"
-#: ../../english/doc/books.data:247
+#: ../../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"
@@ -393,11 +305,11 @@ msgstr ""
" Windows ベースのクライアント用サーバ (SAMBA)\n"
" の設計・構築のような、ネットワーク構築とシステム管理の話題です。"
-#: ../../english/doc/books.data:290
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "Debian GNU/Linux 3.1 Sarge インストーラ (シングルサイズ CD)"
-#: ../../english/doc/books.data:293
+#: ../../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"
@@ -408,13 +320,13 @@ msgstr ""
" トラブルシューティング、ためになるノウハウ等の、さまざまな Tips を紹介して"
"います。"
-#: ../../english/doc/books.data:306
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
msgstr "Debian GNU/Linux 3.1r0 i386, 著者エディション (DVD + CD)"
-#: ../../english/doc/books.data:310
+#: ../../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"
@@ -431,11 +343,11 @@ msgstr ""
" 本書はデスクトップを飾る商用フォントパッケージも収録しています。\n"
" 初心者から熟練ユーザまですべての Debian ユーザにとって便利な本でしょう。"
-#: ../../english/doc/books.data:325
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr "Debian GNU/Linux 2.2r0 i386, 著者エディション (CD 3 枚組)"
-#: ../../english/doc/books.data:328
+#: ../../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"
@@ -450,11 +362,11 @@ msgstr ""
" カスタム CD を用いることで、Debian GNU/Linux の日本語環境を非常に\n"
" 簡単にインストール・使用することができます。"
-#: ../../english/doc/books.data:344
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "非公式な Woody 1 枚と Potato rev0 が 3 枚"
-#: ../../english/doc/books.data:347
+#: ../../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 "
@@ -472,11 +384,11 @@ msgstr ""
" また、メンテナのためのガイドも扱い、\n"
" 韓国にいる人々に公式な Debian メンテナになるように刺激を与えています。"
-#: ../../english/doc/books.data:361
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr "公式 potato r3 CD と非公式 woody CD"
-#: ../../english/doc/books.data:364
+#: ../../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"
@@ -495,11 +407,11 @@ msgstr ""
" 韓国語環境を Debian にセットアップするためのヒントも少々提供しています。\n"
" 初心者にも適しています。"
-#: ../../english/doc/books.data:386
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "Debian GNU/Linux 3.1r0 CD1"
-#: ../../english/doc/books.data:389
+#: ../../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"
@@ -511,7 +423,7 @@ msgstr ""
" などのネットワークサービスの設定を手助けします。また、GNU/Linux\n"
" や Debian の強力なパッケージ管理システムを使い始めるのを支援します。"
-#: ../../english/doc/books.data:405
+#: ../../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 "
@@ -540,7 +452,7 @@ msgstr ""
" GNU/Linux を詳細に学習する学生その他の人を対象としています。\n"
" この本は Debian Sarge を対象としています。"
-#: ../../english/doc/books.data:428
+#: ../../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 "
@@ -555,10 +467,127 @@ msgstr ""
"Debian GNU/Linux オペレーティングシステムを使って特定の目的を実現するための手"
"ほどきとなるでしょう。"
-#: ../../english/releases/arches.data:32
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "著者名:"
+
+#: ../../english/doc/books.def:41
+msgid "email:"
+msgstr "電子メール:"
+
+#: ../../english/doc/books.def:45
+msgid "Available at:"
+msgstr "入手先:"
+
+#: ../../english/doc/books.def:48
+msgid "CD Included:"
+msgstr "収録される CD:"
+
+#: ../../english/doc/books.def:51
+msgid "Publisher:"
+msgstr "出版社:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "著者名:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "編集者名:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "メンテナ:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "状態:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "入手:"
+
+#: ../../english/doc/manuals.defs:92
+msgid "Latest version:"
+msgstr "最新バージョン:"
+
+#: ../../english/doc/manuals.defs:108
+msgid "(version <get-var version />)"
+msgstr "(バージョン <get-var version />)"
+
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
+msgid "plain text"
+msgstr "プレーンテキスト"
+
+#: ../../english/doc/manuals.defs:154
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+msgstr ""
+"最新の <get-var srctype /> ソースは <a href=\"https://www.debian.org/doc/cvs"
+"\">Subversion</a> リポジトリ経由で利用できるようになっています。"
+
+#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
+#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+msgid "Web interface: "
+msgstr "ウェブインターフェイス: "
+
+#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+msgid "VCS interface: "
+msgstr "VCS インターフェイス: "
+
+#: ../../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 ""
+"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/cvs"
+"\">Cvs</a> リポジトリ経由で利用できるようになっています。"
+
+#: ../../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 ""
+"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/"
+"subversion\">Subversion</a> リポジトリ経由で利用できるようになっています。"
+
+#: ../../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 ""
+"最新の <get-var srctype /> ソースは <a href=\"https://packages.debian.org/git"
+"\">Git</a> リポジトリ経由で利用できるようになっています。"
+
+#: ../../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"
+" and check out the <kbd>boot-floppies/documentation</kbd> module."
+msgstr ""
+"作業中の CVS ソースを得るには: <code>CVSROOT</code> 変数を\n"
+"<kbd>:ext:<var>ユーザID</var>@cvs.debian.org:/cvs/debian-boot</kbd>\n"
+"に設定し、<kbd>boot-floppies/documentation</kbd> モジュールを checkout してく"
+"ださい。"
+
+#: ../../english/doc/manuals.defs:193
+msgid "CVS via web"
+msgstr "ウェブ経由で CVS を見る"
+
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+msgid "Debian package"
+msgstr "Debian パッケージ"
+
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+msgid "Debian package (archived)"
+msgstr "Debian パッケージ (アーカイブ)"
+
+#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
msgid "PDF"
msgstr "PDF"
diff --git a/japanese/po/mailinglists.ja.po b/japanese/po/mailinglists.ja.po
index cbba9dad9e1..26e04f7923d 100644
--- a/japanese/po/mailinglists.ja.po
+++ b/japanese/po/mailinglists.ja.po
@@ -126,8 +126,8 @@ msgstr "誰でも可能"
msgid "closed"
msgstr "クローズド"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "購読したいメーリングリストを選んでください:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "脱退したいメーリングリストを選んでください:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "購読したいメーリングリストを選んでください:"
diff --git a/japanese/po/newsevents.ja.po b/japanese/po/newsevents.ja.po
index 1fadbb80ecc..5b029ccaf6e 100644
--- a/japanese/po/newsevents.ja.po
+++ b/japanese/po/newsevents.ja.po
@@ -26,27 +26,27 @@ msgstr "<get-var page /> ページ"
msgid "The newsletter for the Debian community"
msgstr "Debian コミュニティのニューズレター"
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr "氏名"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "電子メール"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "以前の講演:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "言語:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "場所:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "話題:"
@@ -190,9 +190,9 @@ msgid ""
"well as some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints "
"on how to interpret</a> these numbers."
msgstr ""
-"<a href=\"<get-var url />\">統計の詳細</a>と、これらの数値を<a href=\"https://"
-"wiki.debian.org/ProjectNews/RC-Stats\">解釈する方法のヒント</a>を参照できま"
-"す。"
+"<a href=\"<get-var url />\">統計の詳細</a>と、これらの数値を<a href="
+"\"https://wiki.debian.org/ProjectNews/RC-Stats\">解釈する方法のヒント</a>を参"
+"照できます。"
#: ../../english/template/debian/projectnews/boilerplates.wml:102
msgid ""
@@ -401,13 +401,18 @@ msgstr ""
"issue-devel-news /> 号が発行され、以下の話題が取り上げられました。"
#: ../../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 ""
-"このニューズレターを 2 週に一度電子メールで受け取りたい方は、debian-newsメー"
-"リングリストを<a href=\"https://lists.debian.org/debian-news/\">購読</a>してく"
-"ださい。"
+"このニューズレターを毎週電子メールで受け取りたい方は、debian-newsメーリングリ"
+"ストを<a href=\"https://lists.debian.org/debian-news/\">購読</a>してくださ"
+"い。"
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
@@ -492,7 +497,8 @@ msgid ""
"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
msgstr ""
"このニューズレターを毎週電子メールで受け取りたい方は、debian-newsメーリングリ"
-"ストを<a href=\"https://lists.debian.org/debian-news/\">購読</a>してください。"
+"ストを<a href=\"https://lists.debian.org/debian-news/\">購読</a>してくださ"
+"い。"
#. One editor name only
#: ../../english/template/debian/weeklynews/footer.wml:15
@@ -529,3 +535,12 @@ msgid ""
msgstr ""
"<void id=\"singular\" />今週号の Debian ウィークリーニュースは <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 ""
+#~ "このニューズレターを 2 週に一度電子メールで受け取りたい方は、debian-news"
+#~ "メーリングリストを<a href=\"https://lists.debian.org/debian-news/\">購読</"
+#~ "a>してください。"
diff --git a/japanese/po/organization.ja.po b/japanese/po/organization.ja.po
index 70d9b5377dd..c0703c9f677 100644
--- a/japanese/po/organization.ja.po
+++ b/japanese/po/organization.ja.po
@@ -72,7 +72,7 @@ msgid "Officers"
msgstr "執行部"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "ディストリビューション"
@@ -82,11 +82,11 @@ msgid "Publicity"
msgstr "広報"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "サポートと設備"
-#. 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 "Debian Pure Blends"
@@ -99,79 +99,79 @@ msgstr "リーダー"
msgid "Technical Committee"
msgstr "技術委員会"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "書記"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "開発プロジェクト"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP アーカイブ"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "FTP マスター"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "FTP アシスタント"
-#: ../../english/intro/organization.data:98
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "FTP ウィザード"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Backports チーム"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "個々のパッケージ"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "リリース管理"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "リリースチーム"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "品質保証"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "インストールシステムチーム"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "リリースノート"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD イメージ"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "製品"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "テスト"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "オートビルドインフラ"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "ビルド要求チーム"
@@ -219,71 +219,71 @@ msgstr "広報課"
msgid "Partner Program"
msgstr "パートナープログラム"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "イベント"
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Debian からの一言"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "ユーザサポート"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "バグ追跡システム (BTS)"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "メーリングリスト管理とメーリングリストアーカイブ"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "新規メンバー受付"
-#: ../../english/intro/organization.data:336
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Debian アカウント管理者"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "公開鍵管理者 (PGP および GPG)"
-#: ../../english/intro/organization.data:344
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Debian メンテナ (DM) 公開鍵管理者"
-#: ../../english/intro/organization.data:348
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "セキュリティチーム"
-#: ../../english/intro/organization.data:363
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "ウェブページ"
-#: ../../english/intro/organization.data:371
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "コンサルタントページ"
-#: ../../english/intro/organization.data:376
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "CD ベンダページ"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:383
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "ポリシー"
-#: ../../english/intro/organization.data:388
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "システム管理"
-#: ../../english/intro/organization.data:389
+#: ../../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."
@@ -292,7 +292,7 @@ msgstr ""
"ストールの依頼など、Debianマシンのいずれかに何か問題のある際に用いる連絡先で"
"す。"
-#: ../../english/intro/organization.data:397
+#: ../../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 "
@@ -302,74 +302,80 @@ msgstr ""
"\">Debian マシン</a>のページを参照してください。そこにはマシンごとの管理情報"
"があります。"
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP 開発者ディレクトリ管理者"
-#: ../../english/intro/organization.data:399
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "ミラー"
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "DNS 管理"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "パッケージ追跡システム"
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "ハードウェア寄付コーディネーション"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "監事"
-#: ../../english/intro/organization.data:416
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+#: ../../english/intro/organization.data:413
+#, fuzzy
+#| msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr "<a href=\"m4_HOME/trademark\">商標</a>利用申請"
-#: ../../english/intro/organization.data:417
-msgid "current Debian Project Leader"
-msgstr "現在の Debian プロジェクトリーダ"
-
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Alioth 管理者"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Debian Women プロジェクト"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "DebConf 役員"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "嫌がらせ反対"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:436
+msgid "Outreach"
+msgstr ""
+
+#: ../../english/intro/organization.data:446
msgid "Debian for children from 1 to 99"
msgstr "1歳から99歳までのこどものための Debian"
-#: ../../english/intro/organization.data:450
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "臨床医学と医学研究のための Debian"
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "教育のための Debian"
-#: ../../english/intro/organization.data:458
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "法律事務所のための Debian"
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "障害者のための Debian"
-#: ../../english/intro/organization.data:466
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "科学研究のための Debian"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "現在の Debian プロジェクトリーダ"
diff --git a/japanese/po/others.ja.po b/japanese/po/others.ja.po
index 2b470b033d1..04aba9c30c8 100644
--- a/japanese/po/others.ja.po
+++ b/japanese/po/others.ja.po
@@ -160,26 +160,6 @@ msgstr "[Debian] (小さなボタン)"
msgid "same as the above"
msgstr "同上"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "必要なハードウェア:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "必要としている人/グループ:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "アーキテクチャ:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "スペック:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "場所:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "製品"
@@ -326,3 +306,18 @@ msgstr "バージョン"
#: ../../english/y2k/l10n.data:36
msgid "URL"
msgstr "URL"
+
+#~ msgid "Where:"
+#~ msgstr "場所:"
+
+#~ msgid "Specifications:"
+#~ msgstr "スペック:"
+
+#~ msgid "Architecture:"
+#~ msgstr "アーキテクチャ:"
+
+#~ msgid "Who:"
+#~ msgstr "必要としている人/グループ:"
+
+#~ msgid "Wanted:"
+#~ msgstr "必要なハードウェア:"
diff --git a/japanese/po/ports.ja.po b/japanese/po/ports.ja.po
index c065eafbc7b..67f2fc68ea0 100644
--- a/japanese/po/ports.ja.po
+++ b/japanese/po/ports.ja.po
@@ -113,135 +113,135 @@ msgstr "PowerPC 用 Debian"
msgid "Debian for Sparc"
msgstr "Sparc 用 Debian"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Motorola 680x0 用 Debian"
+#~ msgid "Debian for Laptops"
+#~ msgstr "ラップトップ用 Debian"
-#~ msgid "Debian for AMD64"
-#~ msgstr "AMD64 用 Debian"
+#~ msgid "Vendor/Name"
+#~ msgstr "ベンダ/名称"
-#~ msgid "Debian for ARM"
-#~ msgstr "ARM 用 Debian"
+#~ msgid "Date announced"
+#~ msgstr "アナウンス日"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Beowulf 用 Debian"
+#~ msgid "Clock"
+#~ msgstr "クロック"
-#~ msgid "Main"
-#~ msgstr "メイン"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "Debian for MIPS"
-#~ msgstr "MIPS 用 Debian"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "Debian for S/390"
-#~ msgstr "S/390 用 Debian"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Sparc64 用 Debian"
+#~ msgid "Specials"
+#~ msgstr "特記事項"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16、LCD コントローラ、コンパクトフラッシュ、UART、パラレル、RTC、キー"
-#~ "ボード、USB、タッチパッド、オーディオ"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "FPU なし (R2010)、外部キャッシュ"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr ""
-#~ "Mips 16、コンパクトフラッシュ、UART、パラレル、RTC、オーディオ、PCIC"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "FPU なし (R3010)"
+
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "仮想インデックス L1 キャッシュ、L2 キャッシュコントローラ"
+
+#~ msgid "External L1 cache"
+#~ msgstr "外部 L1 キャッシュ"
+
+#~ msgid "Multiple chip CPU"
+#~ msgstr "複数チップ CPU"
#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
+#~ "I2C, Watchdog"
#~ msgstr ""
-#~ "Mips 16、RTC、キーボード、タッチパッド、オーディオ、コンパクトフラッシュ、"
-#~ "UART、パラレル"
+#~ "Mips16 isa 拡張、FPU なし、512k フラッシュ、16k ram、DMAC、UART、タイ"
+#~ "マー、I2C、ウォッチドッグ"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー、I2C、LCD コントローラ"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 L2 キャッシュオンダイ"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU、64 ビット外部バス、外部 L2 キャッシュ"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、PCIC、UART、タイマー"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU、64 ビット外部バス"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "FPU なし、SDRAMC、ROMC、タイマー、PCMCIA、LCD コントローラ、IrDA"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU、32 ビット外部バス"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr ""
+#~ "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、LCD コントローラ、IrDA"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "10/100 イーサネット x2、UART x4、IrDA、AC'97、I2C、デジタル I/O x38"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、IrDA"
#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
#~ msgstr "FPU なし、SDRAMC、ROMC、DMAC、PCIC、UART、タイマー"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、IrDA"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "10/100 イーサネット x2、UART x4、IrDA、AC'97、I2C、デジタル I/O x38"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr ""
-#~ "FPU なし、SDRAMC、ROMC、UART、タイマー、PCMCIA、LCD コントローラ、IrDA"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU、32 ビット外部バス"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "FPU なし、SDRAMC、ROMC、タイマー、PCMCIA、LCD コントローラ、IrDA"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU、64 ビット外部バス"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、PCIC、UART、タイマー"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU、64 ビット外部バス、外部 L2 キャッシュ"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 L2 キャッシュオンダイ"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "FPU なし、DRAMC、ROMC、DMAC、UART、タイマー、I2C、LCD コントローラ"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
#~ msgid ""
-#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
-#~ "I2C, Watchdog"
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
#~ msgstr ""
-#~ "Mips16 isa 拡張、FPU なし、512k フラッシュ、16k ram、DMAC、UART、タイ"
-#~ "マー、I2C、ウォッチドッグ"
-
-#~ msgid "Multiple chip CPU"
-#~ msgstr "複数チップ CPU"
-
-#~ msgid "External L1 cache"
-#~ msgstr "外部 L1 キャッシュ"
-
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "仮想インデックス L1 キャッシュ、L2 キャッシュコントローラ"
+#~ "Mips 16、RTC、キーボード、タッチパッド、オーディオ、コンパクトフラッシュ、"
+#~ "UART、パラレル"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "FPU なし (R3010)"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr ""
+#~ "Mips 16、コンパクトフラッシュ、UART、パラレル、RTC、オーディオ、PCIC"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "FPU なし (R2010)、外部キャッシュ"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16、LCD コントローラ、コンパクトフラッシュ、UART、パラレル、RTC、キー"
+#~ "ボード、USB、タッチパッド、オーディオ"
-#~ msgid "Specials"
-#~ msgstr "特記事項"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Sparc64 用 Debian"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "Debian for S/390"
+#~ msgstr "S/390 用 Debian"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "Debian for MIPS"
+#~ msgstr "MIPS 用 Debian"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "Main"
+#~ msgstr "メイン"
-#~ msgid "Clock"
-#~ msgstr "クロック"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Beowulf 用 Debian"
-#~ msgid "Date announced"
-#~ msgstr "アナウンス日"
+#~ msgid "Debian for ARM"
+#~ msgstr "ARM 用 Debian"
-#~ msgid "Vendor/Name"
-#~ msgstr "ベンダ/名称"
+#~ msgid "Debian for AMD64"
+#~ msgstr "AMD64 用 Debian"
-#~ msgid "Debian for Laptops"
-#~ msgstr "ラップトップ用 Debian"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Motorola 680x0 用 Debian"
diff --git a/japanese/po/stats.ja.po b/japanese/po/stats.ja.po
index 6088fb51ed4..2d94de958d0 100644
--- a/japanese/po/stats.ja.po
+++ b/japanese/po/stats.ja.po
@@ -25,75 +25,75 @@ msgstr "翻訳するバイト数 %d"
msgid "There are %d strings to translate."
msgstr "翻訳する文の数 %d"
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "翻訳が古すぎです"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "翻訳のバージョン番号が変です"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "原版がこの翻訳より新しくなっています"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "原版がなくなっています"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "ヒットカウント無し"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "ヒット"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "クリックすると diffstat データを取得します"
-#: ../../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 "翻訳状況:"
-#: ../../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 "未翻訳"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "未更新"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "翻訳済"
-#: ../../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 "最新"
-#: ../../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 "ファイル"
-#: ../../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 "バイト"
-#: ../../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 ""
"注: このページのリストは人気順に並んでいます。ページ名にマウスカーソルを持っ"
"て行くとヒット数を確認できます。"
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "古くなっている翻訳"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "ファイル"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "差分"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "状態"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "ログ"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "翻訳版"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "担当者"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "状態"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "翻訳者"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "日時"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "未翻訳の一般ページ"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "未翻訳の一般ページ"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "未翻訳のニュース項目"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "未翻訳のニュース項目"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "未翻訳のコンサルタント/ユーザページ"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "未翻訳のコンサルタント/ユーザページ"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "未翻訳の国際化ページ"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "未翻訳の国際化ページ"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "翻訳済ページ (最新)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "翻訳済テンプレート (PO ファイル)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "PO 翻訳状況"
-#: ../../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 "未翻訳"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "合計"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "合計:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Created with"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "翻訳済ページ"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "ページ単位で集計した翻訳状況"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "言語"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "翻訳版"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "翻訳済ページ (サイズ)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "ページサイズから見た翻訳状況"
diff --git a/japanese/po/templates.ja.po b/japanese/po/templates.ja.po
index 0ddcd85b344..264ddd06a3c 100644
--- a/japanese/po/templates.ja.po
+++ b/japanese/po/templates.ja.po
@@ -57,7 +57,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "<a href=\"m4_HOME/\">Debian プロジェクトホームページ</a>に戻る。"
#: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:149
+#: ../../english/template/debian/links.tags.wml:152
msgid "Home"
msgstr "ホーム"
@@ -98,7 +98,7 @@ msgid "Support"
msgstr "サポート"
#: ../../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 "開発者のコーナー"
@@ -135,7 +135,7 @@ msgid "Miscellaneous"
msgstr "その他"
#: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:107
msgid "Getting Debian"
msgstr "Debian を入手する"
@@ -282,142 +282,148 @@ msgid "Debian Books"
msgstr "Debian に関する書籍"
#: ../../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 "»リストアーカイブ"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "メーリングリスト"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "私たちの社会契約"
-#: ../../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:52
+#: ../../english/template/debian/links.tags.wml:55
msgid "Visit the site sponsor"
msgstr "このサイトのスポンサー"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr "Debian 5.0 - ユニバーサルオペレーティングシステム"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Debian ウェブページのサイトマップ"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "開発者データベース"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr "Debian FAQ"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Debian ポリシーマニュアル"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "デベロッパーズリファレンス"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Debian メンテナ入門"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "リリース上の致命的バグ"
-#: ../../english/template/debian/links.tags.wml:79
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Lintian によるポリシー準拠チェック"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "ユーザ用メーリングリストのアーカイブ"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "開発者用メーリングリストのアーカイブ"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "国際化/地域化メーリングリストのアーカイブ"
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "移植用メーリングリストのアーカイブ"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:98
msgid "Archives for mailing lists of the Bug tracking system"
msgstr "バグ追跡システム用メーリングリストのアーカイブ"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "その他のメーリングリスト群のアーカイブ"
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "フリーソフトウェア"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "開発"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Debian を支援する"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "バグ報告"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "移植/アーキテクチャ"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "インストール手順"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "CD ベンダ"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "CD/USB ISO イメージ"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "ネットワークインストール"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "プリインストール"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Debian-Edu プロジェクト"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr "Alioth &ndash; Debian の GForge"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "品質保証"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "パッケージ追跡システム"
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Debian 開発者のパッケージ一覧"
diff --git a/japanese/po/vendors.ja.po b/japanese/po/vendors.ja.po
index 1b896697d32..1875b884ddd 100644
--- a/japanese/po/vendors.ja.po
+++ b/japanese/po/vendors.ja.po
@@ -9,137 +9,130 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "ベンダ名:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "Debian に関するページの URL:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Debian への寄付が可能か:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "国:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "海外発送:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "電子メール:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "CD の収録内容:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "DVD の収録内容:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "アーキテクチャ:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "ベンダ名"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "寄付が可能か"
-#: ../../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 "アーキテクチャ"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "海外発送"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "連絡先"
#. ###################
#. 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 "ベンダのホームページ"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "ページ"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "電子メール"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "ヨーロッパ限定"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "地域限定"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "ソース"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "および"
-#~ msgid "updated monthly"
-#~ msgstr "毎月更新"
+#~ msgid "Official CD"
+#~ msgstr "公式 CD"
-#~ msgid "updated twice weekly"
-#~ msgstr "隔週更新"
+#~ msgid "Official DVD"
+#~ msgstr "公式 DVD"
-#~ msgid "updated weekly"
-#~ msgstr "毎週更新"
+#~ msgid "Development Snapshot"
+#~ msgstr "開発版のスナップショット"
-#~ msgid "reseller"
-#~ msgstr "転売"
+#~ msgid "Vendor Release"
+#~ msgstr "ベンダリリース"
-#~ msgid "reseller of $var"
-#~ msgstr "$var からの転売"
+#~ msgid "Multiple Distribution"
+#~ msgstr "マルチディストリビューション"
-#~ msgid "Custom Release"
-#~ msgstr "カスタムリリース"
+#~ msgid "non-US included"
+#~ msgstr "non-US 収録"
-#~ msgid "vendor additions"
-#~ msgstr "ベンダ独自の追加集"
+#~ msgid "non-free included"
+#~ msgstr "non-free 収録"
#~ msgid "contrib included"
#~ msgstr "contrib 収録"
-#~ msgid "non-free included"
-#~ msgstr "non-free 収録"
+#~ msgid "vendor additions"
+#~ msgstr "ベンダ独自の追加集"
-#~ msgid "non-US included"
-#~ msgstr "non-US 収録"
+#~ msgid "Custom Release"
+#~ msgstr "カスタムリリース"
-#~ msgid "Multiple Distribution"
-#~ msgstr "マルチディストリビューション"
+#~ msgid "reseller of $var"
+#~ msgstr "$var からの転売"
-#~ msgid "Vendor Release"
-#~ msgstr "ベンダリリース"
+#~ msgid "reseller"
+#~ msgstr "転売"
-#~ msgid "Development Snapshot"
-#~ msgstr "開発版のスナップショット"
+#~ msgid "updated weekly"
+#~ msgstr "毎週更新"
-#~ msgid "Official DVD"
-#~ msgstr "公式 DVD"
+#~ msgid "updated twice weekly"
+#~ msgstr "隔週更新"
-#~ msgid "Official CD"
-#~ msgstr "公式 CD"
+#~ msgid "updated monthly"
+#~ msgstr "毎月更新"
+
+#~ msgid "Architectures:"
+#~ msgstr "アーキテクチャ:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD の収録内容:"
+
+#~ msgid "CD Type:"
+#~ msgstr "CD の収録内容:"
+
+#~ msgid "email:"
+#~ msgstr "電子メール:"
+
+#~ msgid "Ship International:"
+#~ msgstr "海外発送:"
+
+#~ msgid "Country:"
+#~ msgstr "国:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Debian への寄付が可能か:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian に関するページの URL:"
+
+#~ msgid "Vendor:"
+#~ msgstr "ベンダ名:"
diff --git a/japanese/po/vote.ja.po b/japanese/po/vote.ja.po
index c7f1fdf5f0b..caae6e28453 100644
--- a/japanese/po/vote.ja.po
+++ b/japanese/po/vote.ja.po
@@ -18,229 +18,251 @@ msgid "Time Line"
msgstr "スケジュール"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "候補者"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "討論会"
-#: ../../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
msgid "Proposer"
msgstr "提案者"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "提案 A の提案者"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "提案 B の提案者"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "提案 C の提案者"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "提案 D の提案者"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "提案 E の提案者"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "提案 F の提案者"
-#: ../../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 "提案 A の支持者"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "提案 B の支持者"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "提案 C の支持者"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "提案 D の支持者"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "提案 E の支持者"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "提案 F の支持者"
-#: ../../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 "提案 A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "提案 B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "提案 C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "提案 D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "提案 E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "提案 F"
-#: ../../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 "修正提案者 A"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "修正支持者 A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "修正文 A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "修正提案者 B"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "修正支持者 B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "修正文 B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "修正提案者 A"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "修正支持者 A"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "修正文 A"
+
+#: ../../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
msgid "Minimum Discussion"
msgstr "最短の討論"
-#: ../../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 "スポンサー募集中"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "議論中"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "投票受付中"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "決定事項"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "撤回された案件"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "その他"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "投票情報ホームページ"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "利用方法"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "提案の提出"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "提案の修正"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "提案への意見"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "結果の閲覧"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "投票"
diff --git a/korean/po/bugs.ko.po b/korean/po/bugs.ko.po
index d21415f3943..b38719ce768 100644
--- a/korean/po/bugs.ko.po
+++ b/korean/po/bugs.ko.po
@@ -161,17 +161,17 @@ msgstr ""
msgid "Archived and Unarchived"
msgstr ""
-#~ msgid "security"
-#~ msgstr "보안"
+#~ msgid "bugs"
+#~ msgstr "버그"
-#~ msgid "patch"
-#~ msgstr "패치"
+#~ msgid "l10n"
+#~ msgstr "지역화"
#~ msgid "moreinfo"
#~ msgstr "추가 정보"
-#~ msgid "l10n"
-#~ msgstr "지역화"
+#~ msgid "patch"
+#~ msgstr "패치"
-#~ msgid "bugs"
-#~ msgstr "버그"
+#~ msgid "security"
+#~ msgstr "보안"
diff --git a/korean/po/cdimage.ko.po b/korean/po/cdimage.ko.po
index d7b175b69d1..3c8f62cd039 100644
--- a/korean/po/cdimage.ko.po
+++ b/korean/po/cdimage.ko.po
@@ -14,18 +14,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 " Key fingerprint"
-#: ../../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/korean/po/countries.ko.po b/korean/po/countries.ko.po
index f5a3a739a66..569880e5d7e 100644
--- a/korean/po/countries.ko.po
+++ b/korean/po/countries.ko.po
@@ -431,8 +431,8 @@ msgstr "남아프리카 공화국"
msgid "Zimbabwe"
msgstr "짐바브웨"
-#~ msgid "Great Britain"
-#~ msgstr "영국"
-
#~ msgid "Yugoslavia"
#~ msgstr "Jugoslavia"
+
+#~ msgid "Great Britain"
+#~ msgstr "영국"
diff --git a/korean/po/distrib.ko.po b/korean/po/distrib.ko.po
index eb251d2edfc..43cdfa26f72 100644
--- a/korean/po/distrib.ko.po
+++ b/korean/po/distrib.ko.po
@@ -133,80 +133,88 @@ msgid "ARM"
msgstr ""
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
-msgid "HP PA-RISC"
+msgid "Hard Float ABI ARM"
msgstr ""
#: ../../english/releases/arches.data:14
+msgid "HP PA-RISC"
+msgstr ""
+
+#: ../../english/releases/arches.data:15
#, fuzzy
#| msgid "Hurd (i386)"
msgid "Hurd 32-bit PC (i386)"
msgstr "허드(i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:16
+#: ../../english/releases/arches.data:17
#, fuzzy
#| msgid "Intel IA-64"
msgid "Intel Itanium IA-64"
msgstr "인텔 IA-64"
-#: ../../english/releases/arches.data:17
+#: ../../english/releases/arches.data:18
msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
-#: ../../english/releases/arches.data:19
+#: ../../english/releases/arches.data:20
msgid "Motorola 680x0"
msgstr "모토로라 680x0"
-#: ../../english/releases/arches.data:20
+#: ../../english/releases/arches.data:21
msgid "MIPS (big endian)"
msgstr ""
-#: ../../english/releases/arches.data:21
+#: ../../english/releases/arches.data:22
msgid "MIPS (little endian)"
msgstr ""
-#: ../../english/releases/arches.data:22
+#: ../../english/releases/arches.data:23
msgid "PowerPC"
msgstr ""
-#: ../../english/releases/arches.data:23
+#: ../../english/releases/arches.data:24
+msgid "POWER Processors"
+msgstr ""
+
+#: ../../english/releases/arches.data:25
msgid "IBM S/390"
msgstr ""
-#: ../../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 ""
-#~ msgid "Search case sensitive"
-#~ msgstr "대소문자 구분 검색"
+#~ msgid "Case sensitive"
+#~ msgstr "대소문자 구분"
-#~ msgid "Intel x86"
-#~ msgstr "인텔 x86"
+#~ msgid "no"
+#~ msgstr "아니오"
#~ msgid "yes"
#~ msgstr "예"
-#~ msgid "no"
-#~ msgstr "아니오"
+#~ msgid "Intel x86"
+#~ msgstr "인텔 x86"
-#~ msgid "Case sensitive"
-#~ msgstr "대소문자 구분"
+#~ msgid "Search case sensitive"
+#~ msgstr "대소문자 구분 검색"
diff --git a/korean/po/doc.ko.po b/korean/po/doc.ko.po
index cc2b6a009b0..314099821d1 100644
--- a/korean/po/doc.ko.po
+++ b/korean/po/doc.ko.po
@@ -13,7 +13,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"
@@ -28,7 +45,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"
@@ -37,15 +54,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"
@@ -54,13 +71,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"
@@ -75,7 +92,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 -- "
@@ -85,11 +102,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, "
@@ -109,7 +126,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"
@@ -117,11 +134,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"
@@ -129,11 +146,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"
@@ -145,24 +162,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 "
@@ -171,13 +191,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"
@@ -193,24 +213,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"
@@ -221,11 +241,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"
@@ -235,11 +255,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 "
@@ -250,11 +270,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"
@@ -264,11 +284,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"
@@ -276,7 +296,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 "
@@ -292,7 +312,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 "
@@ -322,72 +342,98 @@ msgstr "CD 포함"
msgid "Publisher:"
msgstr "출판사"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr ""
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr ""
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr ""
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "상태"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr ""
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr ""
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr ""
-#: ../../english/doc/manuals.defs:133 ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr ""
-#. 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 ""
+"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 ""
+
+#: ../../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 ""
-"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://packages.debian.org/git\">Git</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:158
+#: ../../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"
" and check out the <kbd>boot-floppies/documentation</kbd> module."
msgstr ""
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "데비안 패키지"
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
#, fuzzy
#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "데비안 패키지"
-#: ../../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 ""
diff --git a/korean/po/l10n.ko.po b/korean/po/l10n.ko.po
index 3895e32a853..c8aacbf1367 100644
--- a/korean/po/l10n.ko.po
+++ b/korean/po/l10n.ko.po
@@ -97,8 +97,8 @@ msgstr "POT 파일"
msgid "Hints for translators"
msgstr "번역자를 위한 힌트"
-#~ msgid "Original templates"
-#~ msgstr "원 서식"
-
#~ msgid "Translated templates"
#~ msgstr "번역된 서식"
+
+#~ msgid "Original templates"
+#~ msgstr "원 서식"
diff --git a/korean/po/mailinglists.ko.po b/korean/po/mailinglists.ko.po
index 449a1c12522..2fa4a8218ff 100644
--- a/korean/po/mailinglists.ko.po
+++ b/korean/po/mailinglists.ko.po
@@ -112,8 +112,8 @@ msgstr ""
msgid "closed"
msgstr ""
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "해지하려는 리스트를 선택하세요."
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "가입하려는 리스트를 선택하세요."
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "해지하려는 리스트를 선택하세요."
diff --git a/korean/po/newsevents.ko.po b/korean/po/newsevents.ko.po
index 91714b553d9..51fd21bafbf 100644
--- a/korean/po/newsevents.ko.po
+++ b/korean/po/newsevents.ko.po
@@ -31,27 +31,27 @@ msgstr ""
msgid "The newsletter for the Debian community"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "전자우편:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "언어:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "주제:"
@@ -341,11 +341,12 @@ 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>."
+#| "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 ""
"이 뉴스를 매주 받아 보려면, <a href=\"https://lists.debian.org/debian-news/"
"\">debian-news 메일링 리스트에 가입</a>하세요."
@@ -460,3 +461,16 @@ msgid ""
"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
"\"mailto:dwn@debian.org\">%s</a>."
msgstr ""
+
+#, 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>."
+#~ msgstr ""
+#~ "이 뉴스를 매주 받아 보려면, <a href=\"https://lists.debian.org/debian-"
+#~ "news/\">debian-news 메일링 리스트에 가입</a>하세요."
diff --git a/korean/po/organization.ko.po b/korean/po/organization.ko.po
index 9ae86ba417c..b83f188dba3 100644
--- a/korean/po/organization.ko.po
+++ b/korean/po/organization.ko.po
@@ -77,7 +77,7 @@ msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr ""
@@ -87,11 +87,11 @@ msgid "Publicity"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr ""
-#. 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 ""
@@ -104,103 +104,103 @@ msgstr ""
msgid "Technical Committee"
msgstr "기술 위원회"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "개발 프로젝트"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP 저장소"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "릴리스 관리"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
#, fuzzy
#| msgid "Release Wizard"
msgid "Release Team"
msgstr "릴리스 마법사"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "품질 보증"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "설치 시스템 팀"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD 이미지"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "문서"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
#, fuzzy
#| msgid "Installation System Team"
msgid "Live System Team"
msgstr "설치 시스템 팀"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr ""
@@ -228,184 +228,183 @@ msgstr ""
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "행사"
-#: ../../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 "사용자 지원"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "버그 추적 시스템"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "개발자 계정 관리자"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "키링 관리자(PGP와 GPG)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "보안 팀"
-#: ../../english/intro/organization.data:360
-#, fuzzy
-#| msgid "Security Team"
-msgid "Testing Security Team"
-msgstr "보안 팀"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "보안 감사 프로젝트"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "웹 페이지"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "자문 페이지"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "CD 판매사 페이지"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "정책"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr ""
-#: ../../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."
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "미러"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "DNS 관리자"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "패키지 추적 시스템"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "데비안 여성 프로젝트"
-#: ../../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 ""
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "의학 실습과 연구를 위한 데비안"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "교육을 위한 데비안"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "장애우를 위한 데비안"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "의학 실습과 연구를 위한 데비안"
-#~ msgid "Mailing List Archives"
-#~ msgstr "메일링 리스트 모음"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "커스텀 데비안 배포판"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "데비안 멀티미디어 배포판"
+#~ msgid "Release Managers for ``stable''"
+#~ msgstr "``stable'' 릴리스 관리자"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "비영리 조직을 위한 데비안"
+#~ msgid "Security Testing Team"
+#~ msgstr "보안 테스팅 팀"
#~ msgid "Accountant"
#~ msgstr "계정"
-#~ msgid "Security Testing Team"
-#~ msgstr "보안 테스팅 팀"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "비영리 조직을 위한 데비안"
-#~ msgid "Release Managers for ``stable''"
-#~ msgstr "``stable'' 릴리스 관리자"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "데비안 멀티미디어 배포판"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "커스텀 데비안 배포판"
+#~ msgid "Mailing List Archives"
+#~ msgstr "메일링 리스트 모음"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "보안 감사 프로젝트"
+
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "보안 팀"
diff --git a/korean/po/others.ko.po b/korean/po/others.ko.po
index 0f1a3611ce6..a92923c08a6 100644
--- a/korean/po/others.ko.po
+++ b/korean/po/others.ko.po
@@ -166,26 +166,6 @@ msgstr ""
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr ""
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr ""
@@ -230,22 +210,34 @@ msgstr ""
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "귀고리"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
msgstr ""
+#: ../../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 ""
@@ -321,26 +313,26 @@ msgstr ""
msgid "URL"
msgstr ""
-#~ msgid "Email:"
-#~ msgstr "전자우편:"
-
-#~ msgid "Mailing List Subscription"
-#~ msgstr "메일링 리스트 가입"
+#~ msgid "Languages:"
+#~ msgstr "언어:"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "가입하려는 리스트를 선택하세요."
+#~ msgid "Topics:"
+#~ msgstr "주제:"
-#~ msgid "Subscription:"
-#~ msgstr "가입:"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "해지하려는 리스트를 선택하세요."
#~ msgid "Mailing List Unsubscription"
#~ msgstr "메일링 리스트 해지"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "해지하려는 리스트를 선택하세요."
+#~ msgid "Subscription:"
+#~ msgstr "가입:"
-#~ msgid "Topics:"
-#~ msgstr "주제:"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "가입하려는 리스트를 선택하세요."
-#~ msgid "Languages:"
-#~ msgstr "언어:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "메일링 리스트 가입"
+
+#~ msgid "Email:"
+#~ msgstr "전자우편:"
diff --git a/korean/po/ports.ko.po b/korean/po/ports.ko.po
index a29c27a69dd..b1fa8e16b42 100644
--- a/korean/po/ports.ko.po
+++ b/korean/po/ports.ko.po
@@ -117,11 +117,11 @@ msgstr ""
msgid "Debian for Sparc"
msgstr ""
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "libc5 기반 데비안 GNU/FreeBSD"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "데비안 GNU/FreeBSD"
#~ msgid "Date announced"
#~ msgstr "발표 날짜"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "데비안 GNU/FreeBSD"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "libc5 기반 데비안 GNU/FreeBSD"
diff --git a/korean/po/vendors.ko.po b/korean/po/vendors.ko.po
index c01522f9d30..436df201628 100644
--- a/korean/po/vendors.ko.po
+++ b/korean/po/vendors.ko.po
@@ -13,113 +13,98 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "판매사:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "국가"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "국제 배송"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "전자우편"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "CD 형태"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "DVD 형태"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "아키텍처"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "판매사"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr "아키텍처"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "국제 배송"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "연락처"
#. ###################
#. 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 ""
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "전자우편"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "소스"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr ""
-#~ msgid "Custom Release"
-#~ msgstr "커스텀 릴리스"
+#~ msgid "Official CD"
+#~ msgstr "공식 CD"
-#~ msgid "contrib included"
-#~ msgstr "contrib 포함"
+#~ msgid "Official DVD"
+#~ msgstr "공식 DVD"
-#~ msgid "non-free included"
-#~ msgstr "non-free 포함"
+#~ msgid "Development Snapshot"
+#~ msgstr "개발 스냅샷"
#~ msgid "non-US included"
#~ msgstr "non-US 포함"
-#~ msgid "Development Snapshot"
-#~ msgstr "개발 스냅샷"
+#~ msgid "non-free included"
+#~ msgstr "non-free 포함"
-#~ msgid "Official DVD"
-#~ msgstr "공식 DVD"
+#~ msgid "contrib included"
+#~ msgstr "contrib 포함"
-#~ msgid "Official CD"
-#~ msgstr "공식 CD"
+#~ msgid "Custom Release"
+#~ msgstr "커스텀 릴리스"
+
+#~ msgid "Architectures:"
+#~ msgstr "아키텍처"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD 형태"
+
+#~ msgid "CD Type:"
+#~ msgstr "CD 형태"
+
+#~ msgid "email:"
+#~ msgstr "전자우편"
+
+#~ msgid "Ship International:"
+#~ msgstr "국제 배송"
+
+#~ msgid "Country:"
+#~ msgstr "국가"
+
+#~ msgid "Vendor:"
+#~ msgstr "판매사:"
diff --git a/korean/po/vote.ko.po b/korean/po/vote.ko.po
index 213fe954880..142154f00a3 100644
--- a/korean/po/vote.ko.po
+++ b/korean/po/vote.ko.po
@@ -22,229 +22,245 @@ msgid "Time Line"
msgstr ""
#: ../../english/template/debian/votebar.wml:19
-msgid "Nominations"
+msgid "Summary"
msgstr ""
#: ../../english/template/debian/votebar.wml:22
-msgid "Debate"
+msgid "Nominations"
msgstr ""
#: ../../english/template/debian/votebar.wml:25
-msgid "Platforms"
+msgid "Debate"
msgstr ""
#: ../../english/template/debian/votebar.wml:28
-msgid "Proposer"
+msgid "Platforms"
msgstr ""
#: ../../english/template/debian/votebar.wml:31
-msgid "Proposal A Proposer"
+msgid "Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:34
-msgid "Proposal B Proposer"
+msgid "Proposal A Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:37
-msgid "Proposal C Proposer"
+msgid "Proposal B Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:40
-msgid "Proposal D Proposer"
+msgid "Proposal C Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:43
-msgid "Proposal E Proposer"
+msgid "Proposal D Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:46
-msgid "Proposal F Proposer"
+msgid "Proposal E Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:49
-msgid "Seconds"
+msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:52
-msgid "Proposal A Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Proposal B Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal C Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal D Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal E Seconds"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal F Seconds"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Opposition"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Text"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Proposal A"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Proposal B"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal C"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal D"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal E"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal F"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Choices"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Amendment Proposer"
+msgid "Choices"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Amendment Seconds"
+msgid "Amendment Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Text"
+msgid "Amendment Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Proposer A"
+msgid "Amendment Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Seconds A"
+msgid "Amendment Proposer A"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Text A"
+msgid "Amendment Seconds A"
msgstr ""
#: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Proposer B"
+msgid "Amendment Text A"
msgstr ""
#: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Seconds B"
+msgid "Amendment Proposer B"
msgstr ""
#: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Text B"
+msgid "Amendment Seconds B"
msgstr ""
#: ../../english/template/debian/votebar.wml:124
-msgid "Amendments"
+msgid "Amendment Text B"
msgstr ""
#: ../../english/template/debian/votebar.wml:127
-msgid "Proceedings"
+msgid "Amendment Proposer C"
msgstr ""
#: ../../english/template/debian/votebar.wml:130
-msgid "Majority Requirement"
+msgid "Amendment Seconds C"
msgstr ""
#: ../../english/template/debian/votebar.wml:133
-msgid "Data and Statistics"
+msgid "Amendment Text C"
msgstr ""
#: ../../english/template/debian/votebar.wml:136
-msgid "Quorum"
+msgid "Amendments"
msgstr ""
#: ../../english/template/debian/votebar.wml:139
-msgid "Minimum Discussion"
+msgid "Proceedings"
msgstr ""
#: ../../english/template/debian/votebar.wml:142
-msgid "Ballot"
+msgid "Majority Requirement"
msgstr ""
#: ../../english/template/debian/votebar.wml:145
-msgid "Forum"
+msgid "Data and Statistics"
msgstr ""
#: ../../english/template/debian/votebar.wml:148
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:151
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:154
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:157
+msgid "Forum"
+msgstr ""
+
+#: ../../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 ""
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr ""
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr ""
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr ""
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr ""
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr ""
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "투표"
diff --git a/lithuanian/po/bugs.lt.po b/lithuanian/po/bugs.lt.po
index d9dedb14f5a..3e1314f3d35 100644
--- a/lithuanian/po/bugs.lt.po
+++ b/lithuanian/po/bugs.lt.po
@@ -157,146 +157,146 @@ msgstr "Archyvuotos"
msgid "Archived and Unarchived"
msgstr "Archyvuotos ir nearchyvuotos"
-#~ msgid "Flags:"
-#~ msgstr "Vėliavos:"
-
-#~ msgid "active bugs"
-#~ msgstr "aktyvios klaidos"
+#~ msgid "Exclude tag:"
+#~ msgstr "Pašalinti žymę:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "rodyti sujungtos klaidos tik viena kartą"
+#~ msgid "Include tag:"
+#~ msgstr "įskaityti žymę :"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "netvarkyti pagal statusą arba griežtumą"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "Nerodyti lenteles turinį viršutiniame kolontitule"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "Nerodyti statistiką apatiniame kolontitule"
+#~ msgid "wontfix"
+#~ msgstr "nenori ištaisyti "
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "upstream"
+#~ msgstr "prieš srovę"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "neproduktyvus"
-#~ msgid "Package version:"
-#~ msgstr "Paketo versiją:"
+#~ msgid "security"
+#~ msgstr "saugumas"
-#~ msgid "Distribution:"
-#~ msgstr "Distribucija:"
+#~ msgid "patch"
+#~ msgstr "lopas"
-#~ msgid "bugs"
-#~ msgstr "klaidos"
+#~ msgid "moreinfo"
+#~ msgstr "daugiau informacijos"
-#~ msgid "open"
-#~ msgstr "atviras"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "forwarded"
-#~ msgstr "išsiųstas"
+#~ msgid "help"
+#~ msgstr "padėti"
-#~ msgid "pending"
-#~ msgstr "laukimas"
+#~ msgid "fixed-upstream"
+#~ msgstr "Pataisytas prieš srovę"
-#~ msgid "fixed"
-#~ msgstr "fiksuotas"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "pataisytas eksperimentinėje"
-#~ msgid "done"
-#~ msgstr "padarytas"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "Include status:"
-#~ msgstr "įskaityti statusą"
+#~ msgid "confirmed"
+#~ msgstr "patvirtintas"
-#~ msgid "Exclude status:"
-#~ msgstr "Pašalinti statusą:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "kritiškas"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "grave"
-#~ msgstr "rimtas"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "serious"
-#~ msgstr "rimtas"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "important"
-#~ msgstr "svarbus"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "minor"
-#~ msgstr "mažesnis"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "wishlist"
-#~ msgstr "pageidavimo sąrašas "
+#~ msgid "Exclude severity:"
+#~ msgstr "Pašalinti griežtumą:"
#~ msgid "Include severity:"
#~ msgstr "įskaityti griežtumą:"
-#~ msgid "Exclude severity:"
-#~ msgstr "Pašalinti griežtumą:"
+#~ msgid "wishlist"
+#~ msgstr "pageidavimo sąrašas "
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "mažesnis"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "svarbus"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "rimtas"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "rimtas"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "kritiškas"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Pašalinti statusą:"
-#~ msgid "confirmed"
-#~ msgstr "patvirtintas"
+#~ msgid "Include status:"
+#~ msgstr "įskaityti statusą"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "done"
+#~ msgstr "padarytas"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "pataisytas eksperimentinėje"
+#~ msgid "fixed"
+#~ msgstr "fiksuotas"
-#~ msgid "fixed-upstream"
-#~ msgstr "Pataisytas prieš srovę"
+#~ msgid "pending"
+#~ msgstr "laukimas"
-#~ msgid "help"
-#~ msgstr "padėti"
+#~ msgid "forwarded"
+#~ msgstr "išsiųstas"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "open"
+#~ msgstr "atviras"
-#~ msgid "moreinfo"
-#~ msgstr "daugiau informacijos"
+#~ msgid "bugs"
+#~ msgstr "klaidos"
-#~ msgid "patch"
-#~ msgstr "lopas"
+#~ msgid "Distribution:"
+#~ msgstr "Distribucija:"
-#~ msgid "security"
-#~ msgstr "saugumas"
+#~ msgid "Package version:"
+#~ msgstr "Paketo versiją:"
-#~ msgid "unreproducible"
-#~ msgstr "neproduktyvus"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "upstream"
-#~ msgstr "prieš srovę"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "wontfix"
-#~ msgstr "nenori ištaisyti "
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "Nerodyti statistiką apatiniame kolontitule"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "Nerodyti lenteles turinį viršutiniame kolontitule"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "netvarkyti pagal statusą arba griežtumą"
-#~ msgid "Include tag:"
-#~ msgstr "įskaityti žymę :"
+#~ msgid "display merged bugs only once"
+#~ msgstr "rodyti sujungtos klaidos tik viena kartą"
-#~ msgid "Exclude tag:"
-#~ msgstr "Pašalinti žymę:"
+#~ msgid "active bugs"
+#~ msgstr "aktyvios klaidos"
+
+#~ msgid "Flags:"
+#~ msgstr "Vėliavos:"
diff --git a/lithuanian/po/cdimage.lt.po b/lithuanian/po/cdimage.lt.po
index 52e1d3b6f7e..970275baad9 100644
--- a/lithuanian/po/cdimage.lt.po
+++ b/lithuanian/po/cdimage.lt.po
@@ -12,18 +12,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 " Key fingerprint"
-#: ../../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/lithuanian/po/distrib.lt.po b/lithuanian/po/distrib.lt.po
index 1cac68b0397..43a69ca262c 100644
--- a/lithuanian/po/distrib.lt.po
+++ b/lithuanian/po/distrib.lt.po
@@ -131,103 +131,111 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
+msgid "Hard Float ABI ARM"
+msgstr ""
+
+#: ../../english/releases/arches.data:14
#, fuzzy
#| msgid "HP PA/RISC"
msgid "HP PA-RISC"
msgstr "HP PA/RISC"
-#: ../../english/releases/arches.data:14
+#: ../../english/releases/arches.data:15
#, fuzzy
#| msgid "Hurd (i386)"
msgid "Hurd 32-bit PC (i386)"
msgstr "Hurd (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:16
+#: ../../english/releases/arches.data:17
#, fuzzy
#| msgid "Intel IA-64"
msgid "Intel Itanium IA-64"
msgstr "Intel IA-64"
-#: ../../english/releases/arches.data:17
+#: ../../english/releases/arches.data:18
msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
-#: ../../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 "packages that contain files or directories named like this"
-#~ msgstr "paketai kurie turi failų arba direktorijų pavadinimus kaip šitas"
-
-#~ msgid "all files in this package"
-#~ msgstr "visi failai šitame pakete"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "Case sensitive"
-#~ msgstr "Skirti raidžių dydį"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "no"
-#~ msgstr "ne"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "yes"
-#~ msgstr "taip"
+#~ msgid "Search case sensitive"
+#~ msgstr "Leisti ieškoti skiriant raidžių dydį"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Leisti ieškoti pažodžiui"
#~ msgid "MIPS (DEC)"
#~ msgstr "MIPS (DEC)"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Leisti ieškoti pažodžiui"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "Search case sensitive"
-#~ msgstr "Leisti ieškoti skiriant raidžių dydį"
+#~ msgid "yes"
+#~ msgstr "taip"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "no"
+#~ msgstr "ne"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "Case sensitive"
+#~ msgstr "Skirti raidžių dydį"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "all files in this package"
+#~ msgstr "visi failai šitame pakete"
+
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "paketai kurie turi failų arba direktorijų pavadinimus kaip šitas"
diff --git a/lithuanian/po/doc.lt.po b/lithuanian/po/doc.lt.po
index a2bb5051f5b..238c3270182 100644
--- a/lithuanian/po/doc.lt.po
+++ b/lithuanian/po/doc.lt.po
@@ -11,7 +11,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"
@@ -26,7 +43,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"
@@ -35,15 +52,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"
@@ -52,13 +69,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"
@@ -73,7 +90,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 -- "
@@ -83,11 +100,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, "
@@ -107,7 +124,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"
@@ -115,11 +132,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"
@@ -127,11 +144,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"
@@ -143,24 +160,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 "
@@ -169,13 +189,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"
@@ -191,24 +211,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"
@@ -219,11 +239,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"
@@ -233,11 +253,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 "
@@ -248,11 +268,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"
@@ -262,11 +282,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"
@@ -274,7 +294,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 "
@@ -290,7 +310,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 "
@@ -320,49 +340,73 @@ msgstr "CD įtrauktas:"
msgid "Publisher:"
msgstr "Leidėjas:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Autoriai:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Redaktoriai:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Prižiūrėtojas:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "Statusas:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "Prieinamumas"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "Naujausia versija:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(versija <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 "grynas tekstas"
-#. 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 ""
-"Naudokite <a href=\"cvs\">SVN</a> kad parsisiųstumėte SGML teksto šaltinį "
-"<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"
@@ -372,27 +416,34 @@ msgstr ""
" į <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" ir patikrinkite <kbd>boot-floppies/documentation</kbd> modulį."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "CVS web sąsaja"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Debian paketas"
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
#, fuzzy
#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Debian paketas"
-#: ../../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 "Kalba:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Naudokite <a href=\"cvs\">SVN</a> kad parsisiųstumėte SGML teksto šaltinį "
+#~ "<get-var ddp_pkg_loc />."
diff --git a/lithuanian/po/mailinglists.lt.po b/lithuanian/po/mailinglists.lt.po
index 64b1952e83f..ef9ccbf418c 100644
--- a/lithuanian/po/mailinglists.lt.po
+++ b/lithuanian/po/mailinglists.lt.po
@@ -125,9 +125,9 @@ msgstr "atviras"
msgid "closed"
msgstr "uždaras"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Prašome pasirinkti į kurias konferencijas norite prisiregistruoti:"
+
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
#~ "Prašome pasirinkti konferencijas iš kurių jūs norite išsiregistruoti:"
-
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Prašome pasirinkti į kurias konferencijas norite prisiregistruoti:"
diff --git a/lithuanian/po/newsevents.lt.po b/lithuanian/po/newsevents.lt.po
index e4e465f0ba8..8f55013c154 100644
--- a/lithuanian/po/newsevents.lt.po
+++ b/lithuanian/po/newsevents.lt.po
@@ -29,27 +29,27 @@ msgstr "p<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 "Vardas"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "El. paštas"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Ankstyvesni pokalbiai"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Kalbos"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Padėtis:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Temos"
@@ -339,13 +339,18 @@ 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 ""
-"Norėdami gauti naujienlaiškį kartą arba du kartus į savaitę į jūsų pašto "
-"dėžutę, <a href=\"https://lists.debian.org/debian-news/\"> užsiregistruokite "
-"debian-news pašto konferencijoje </a>."
+"Norėdami kas savaitę gauti naujienas į savo pašto dėžutę, <a href=\"m4_HOME/"
+"MailingLists/subscribe#debian-news\">užsiregistruokite</a> debian-news pašto "
+"konferencijoje. "
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
@@ -469,3 +474,12 @@ msgid ""
msgstr ""
"<void id=\"singular\" />Šį Savaitinį Debian Naujienų leidinį išleido <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 ""
+#~ "Norėdami gauti naujienlaiškį kartą arba du kartus į savaitę į jūsų pašto "
+#~ "dėžutę, <a href=\"https://lists.debian.org/debian-news/\"> "
+#~ "užsiregistruokite debian-news pašto konferencijoje </a>."
diff --git a/lithuanian/po/organization.lt.po b/lithuanian/po/organization.lt.po
index 4718b9113d5..71fad9b3a48 100644
--- a/lithuanian/po/organization.lt.po
+++ b/lithuanian/po/organization.lt.po
@@ -74,7 +74,7 @@ msgid "Officers"
msgstr "Pareigūnai"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribucija"
@@ -84,11 +84,11 @@ msgid "Publicity"
msgstr "Viešieji_ryšiai"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Palaikymas ir Infrastruktūra"
-#. 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 ""
@@ -101,105 +101,105 @@ msgstr "Lyderis"
msgid "Technical Committee"
msgstr "Techninis Komitetas"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Sekretorius"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Plėtojimo Projektai"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP Archyvai"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP Meistras"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "FTP Asistentai"
-#: ../../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 "Individualūs paketai"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Vadovavimas Išleidimui"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Išleidimo komanda"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Kokybės Užtikrinimas"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Įdiegimo sistemos komanda"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Išleidimo pastabos"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD atvaizdai"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Produkcija"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Testuojama"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Palaikymas ir Infrastruktūra"
-#: ../../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
#, fuzzy
#| msgid "Buildd Administration"
msgid "Buildd administration"
msgstr "Buildd Administracija"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Dokumentacija"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Reikalaujantis darbo ir Laukiamas paketų sąrašas"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Live sistemos komanda"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Pernešimai"
@@ -227,83 +227,75 @@ msgstr "Ryšiai su žiniasklaida"
msgid "Partner Program"
msgstr "Partnerio Programa"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Įvykiai"
-#: ../../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 "Vartotojų palaikymas"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Klaidų stebėjimo sistema"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Pašto konferencijų administracija ir Pašto konferencijų archyvai"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Naujo plėtojo registracinis stalas"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Debian sąskaitos valdytojai"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Raktinės valdytojai (PGP ir 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 plėtotųjų raktinės komanda"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Saugumo komanda"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "Testing Saugumo komanda"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Saugumo revizijos projektas"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Tinkalalapiai "
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Konsultantų puslapis"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "CD Pardavėjų puslapis"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Debian Planeta"
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Politika"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Sistemos administracija"
-#: ../../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."
@@ -311,7 +303,7 @@ msgstr ""
"Tai yra adresas, kurį naudoti jei iškilus problemoms su Debian mašinoms, "
"įskaitant slaptažodžio problemas arba jie jums reikia įdiegto paketo."
-#: ../../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 "
@@ -321,113 +313,106 @@ msgstr ""
"žiūrėti <a href=\"https://db.debian.org/machines.cgi\"> Debian Mašinos</a> "
"puslapį, jame turi būti mašinos administratoriaus informacija."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP plėtotojų direktorijos administratorius"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Veidrodžiai"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "DNS prižiūrėtojas"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Paketų stebėjimo sistema"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Kompiuterinės įrangos aukojimo koordinatorius"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Revizorius"
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Alioth administratoriai"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Moterys Debian projekte"
-#: ../../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 vaikams nuo 1 iki 99"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian medicinos praktikai ir jų tyrimams"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian švietimui"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian teisėje"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian neįgaliems žmonėms"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian medicinos praktikai ir jų tyrimams"
-#~ msgid "Release Assistants"
-#~ msgstr "Išleidimo Asistentai"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Papildomos Debian distribucijos"
-#~ msgid "APT Team"
-#~ msgstr "APT komanda"
+#~| msgid "Release Manager for ``stable''"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "``stable'' Išleidimo komanda"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Pašto konferencijos archyvai"
+#~ msgid "Vendors"
+#~ msgstr "Pardavėjai"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux Verslui"
+#~ msgid "Handhelds"
+#~ msgstr "Kišeniniai kompiuteriai"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debian Multimedijos Distributyvas"
+#~| msgid "Security Testing Team"
+#~ msgid "Marketing Team"
+#~ msgstr "Prekybos Komanda"
#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
+#~ "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 ""
-#~ "Tai dar ne oficialus vidinis Debian projektas, bet jis paskelbė siekti "
-#~ "integraciją."
-
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian pelno nesiekiančioms organizacijoms"
-
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Universali operacinė sistema jūsų darbastalyje"
-
-#~ msgid "Accountant"
-#~ msgstr "Sąskaitininkas"
-
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Rakto pasirašymo koordinatorius"
+#~ "Administratoriai, atsakingi už tam tikra architektūrą gali būti "
+#~ "pasiekiami <genericemail arch@buildd.debian.org>, pavyzdžiui "
+#~ "<genericemail i386@buildd.debian.org>."
#~ msgid ""
#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
@@ -439,28 +424,42 @@ msgstr "Debian medicinos praktikai ir jų tyrimams"
#~ "architektūrą ir distributyvą kad pažiūrėtumėte galimus buildd ir jų "
#~ "administratorius."
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Rakto pasirašymo koordinatorius"
+
+#~ msgid "Accountant"
+#~ msgstr "Sąskaitininkas"
+
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Universali operacinė sistema jūsų darbastalyje"
+
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian pelno nesiekiančioms organizacijoms"
+
#~ 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>."
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
#~ msgstr ""
-#~ "Administratoriai, atsakingi už tam tikra architektūrą gali būti "
-#~ "pasiekiami <genericemail arch@buildd.debian.org>, pavyzdžiui "
-#~ "<genericemail i386@buildd.debian.org>."
+#~ "Tai dar ne oficialus vidinis Debian projektas, bet jis paskelbė siekti "
+#~ "integraciją."
-#~| msgid "Security Testing Team"
-#~ msgid "Marketing Team"
-#~ msgstr "Prekybos Komanda"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debian Multimedijos Distributyvas"
-#~ msgid "Handhelds"
-#~ msgstr "Kišeniniai kompiuteriai"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux Verslui"
-#~ msgid "Vendors"
-#~ msgstr "Pardavėjai"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Pašto konferencijos archyvai"
-#~| msgid "Release Manager for ``stable''"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "``stable'' Išleidimo komanda"
+#~ msgid "APT Team"
+#~ msgstr "APT komanda"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Papildomos Debian distribucijos"
+#~ msgid "Release Assistants"
+#~ msgstr "Išleidimo Asistentai"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "Saugumo revizijos projektas"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "Testing Saugumo komanda"
diff --git a/lithuanian/po/others.lt.po b/lithuanian/po/others.lt.po
index 668546a01f5..f798d9c88d8 100644
--- a/lithuanian/po/others.lt.po
+++ b/lithuanian/po/others.lt.po
@@ -102,8 +102,8 @@ msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
"(only available in French) for more information."
msgstr ""
-"Žiūrėti <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</"
-"a> (tik prancūziškai) norint gauti daugiau informacijos"
+"Žiūrėti <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/"
+"</a> (tik prancūziškai) norint gauti daugiau informacijos"
#: ../../english/devel/website/tc.data:12
#: ../../english/devel/website/tc.data:14
@@ -117,8 +117,8 @@ msgid ""
"See <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</"
"a> (only available in Spanish) for more information."
msgstr ""
-"Žiūrėti <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/"
-"</a> (tik ispaniškai) norint gauti daugiau informacijos"
+"Žiūrėti <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/"
+"spanish/</a> (tik ispaniškai) norint gauti daugiau informacijos"
#: ../../english/distrib/pre-installed.defs:18
#, fuzzy
@@ -170,26 +170,6 @@ msgstr "[Debian] (mini mygtukas)"
msgid "same as the above"
msgstr "Tas pats kaip ir viršuje"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Ieškoma:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Kas:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Architektūra:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Specifikacijos:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Kur:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Prekės"
@@ -234,24 +214,36 @@ msgstr "ženkliukai"
msgid "basketball goals"
msgstr "krepšinio lentos"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "auskarai"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "lagaminai"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
#, fuzzy
#| msgid "suitcases"
msgid "pillowcases"
msgstr "lagaminai"
+#: ../../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 ""
@@ -326,3 +318,18 @@ msgstr "Versija"
#: ../../english/y2k/l10n.data:36
msgid "URL"
msgstr "URL"
+
+#~ msgid "Where:"
+#~ msgstr "Kur:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Specifikacijos:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Architektūra:"
+
+#~ msgid "Who:"
+#~ msgstr "Kas:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Ieškoma:"
diff --git a/lithuanian/po/ports.lt.po b/lithuanian/po/ports.lt.po
index 98f53001b34..2bc2ab2c498 100644
--- a/lithuanian/po/ports.lt.po
+++ b/lithuanian/po/ports.lt.po
@@ -115,68 +115,65 @@ msgstr "Debian PowerPC"
msgid "Debian for Sparc"
msgstr "Debian for Sparc"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian Sparc64"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian nešiojamiems kompiuteriams"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian S/390"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian AMD64"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian MIPS"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian ARM"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian Beowulf"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgid "Main"
+#~ msgstr "Pagrindinis"
-#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgstr ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian Motorola 680x0"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 L2 cache on die"
+#~ msgid "Vendor/Name"
+#~ msgstr "Pardavėjai/Pavadinimas"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, 64-bit external bus, external L2 cache"
+#~ msgid "Date announced"
+#~ msgstr "Paskelbimo datą"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, 64-bit external bus"
+#~ msgid "Clock"
+#~ msgstr "Clock"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, 32-bit external bus"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgid "Specials"
+#~ msgstr "Specialūs"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "No FPU (R2010), external caches"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "No FPU (R3010)"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Virtual indexed L1 cache, L2 cache controller"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgid "External L1 cache"
+#~ msgstr "External L1 cache"
+
+#~ msgid "Multiple chip CPU"
+#~ msgstr "Multiple chip CPU"
#~ msgid ""
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
@@ -185,62 +182,65 @@ msgstr "Debian for Sparc"
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
#~ "I2C, Watchdog"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "Multiple chip CPU"
-
-#~ msgid "External L1 cache"
-#~ msgstr "External L1 cache"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Virtual indexed L1 cache, L2 cache controller"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "No FPU (R3010)"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "No FPU (R2010), external caches"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgid "Specials"
-#~ msgstr "Specialūs"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, 32-bit external bus"
-#~ msgid "Clock"
-#~ msgstr "Clock"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, 64-bit external bus"
-#~ msgid "Date announced"
-#~ msgstr "Paskelbimo datą"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, 64-bit external bus, external L2 cache"
-#~ msgid "Vendor/Name"
-#~ msgstr "Pardavėjai/Pavadinimas"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 L2 cache on die"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian Motorola 680x0"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgstr ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgid "Main"
-#~ msgstr "Pagrindinis"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian Beowulf"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian ARM"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian MIPS"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian AMD64"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian S/390"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian nešiojamiems kompiuteriams"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian Sparc64"
diff --git a/lithuanian/po/templates.lt.po b/lithuanian/po/templates.lt.po
index 5b4c4dffcfe..a92c929323c 100644
--- a/lithuanian/po/templates.lt.po
+++ b/lithuanian/po/templates.lt.po
@@ -67,7 +67,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "<a href=\"m4_HOME/\">Debian Projekto tinklapis</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 "Pradžia"
@@ -108,7 +108,7 @@ msgid "Support"
msgstr "Techninė pagalba"
#: ../../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 "Plėtotojų kampelis"
@@ -145,7 +145,7 @@ msgid "Miscellaneous"
msgstr "Kita"
#: ../../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 "Kaip gauti Debian"
@@ -200,7 +200,7 @@ msgstr "2.2 versijoje"
#. 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -219,25 +219,25 @@ msgstr ""
"kitą kontaktinę informaciją, žiūrėkite Debian <a href=\"m4_HOME/contact\"> "
"kontaktų puslapį</a>."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Paskutinė redagavimo data"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Autorinės teisės"
-#: ../../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 ""
-#: ../../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 ""
"Žiūrėkite <a href=\"m4_HOME/license\" rel=\"copyright\">licencijavimo "
"tvarką</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."
@@ -300,140 +300,150 @@ msgid "Debian Books"
msgstr "Knygos apie Debian"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "Pagalba Debian"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Pašto konferencijų archyvai"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Pašto konferencijos"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Visuomeninė sutartis"
-#: ../../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 "Aplankykite puslapio rėmėją"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Debian interneto puslapių turinys"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Kūrėjų duomenų bazė"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Knygos apie Debian"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Debian Normų vadovas"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Programuotojų Žinynas"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Naujojo prižiūrėtojo vadovas"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Kritinės išleidimo klaidos"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Lintian pranešimai"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Vartotojų pašto konferencijos archyvas"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Plėtotojų pašto konferencijos archyvas"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "i18n/l10n pašto konferencijos archyvas"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Architektūros migracijų pašto konferencijos archyvas"
-#: ../../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 "Klaidų stebėjimo sistemos archyvai pašto konferencijai"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Kitų pašto konferencijų archyvai"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Laisva programinė įranga"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Vystymas"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Pagalba Debian"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Klaidų pranešimai"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Migracija/Architektūros"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Įdiegimo instrukcija"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "CD pardavėjai"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "CD/USB ISO atvaizdai"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "įdiegti per tinklą"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Jau įdiegta"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Debian-Edu Projektas"
-#: ../../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 "Kokybės Užtikrinimas"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Paketo Stebėjimo Sistema"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Debian plėtotuojų paketų apžiūra"
@@ -518,229 +528,150 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Grįžti į <a href=\"./\">Kas naudoja Debian?</a>."
-#~ msgid "More information"
-#~ msgstr "Daugiau informacijos"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Ateinančios atrakcijos"
-
-#~ msgid "link may no longer be valid"
-#~ msgstr "nuoroda greičiausiai nebe egzistuoja"
-
-#~ msgid "When"
-#~ msgstr "Kada"
-
-#~ msgid "Where"
-#~ msgstr "Kur"
+#~ msgid "Select a server near you"
+#~ msgstr "Pasirinkite tarnybinę stotį, esančią arčiausiai jūsų"
-#~ msgid "More Info"
-#~ msgstr "Daugiau informacijos"
+#~ msgid "More information:"
+#~ msgstr "Daugiau informacijos:"
-#~ msgid "Debian Involvement"
-#~ msgstr "Debian dalyvavimas"
+#~ msgid "Taken by:"
+#~ msgstr "Perimta:"
-#~ msgid "Main Coordinator"
-#~ msgstr "Pagrindinis koordinatorius"
+#~ msgid "Nobody"
+#~ msgstr "Niekieno"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Projekto</th><th>koordinatorius</th>"
+#~ msgid "Rating:"
+#~ msgstr "Reitingas:"
-#~ msgid "Related Links"
-#~ msgstr "Susijusios nuorodos"
+#~ msgid "List of Consultants"
+#~ msgstr "Konsultantų sąraÅ”as"
-#~ msgid "Latest News"
-#~ msgstr "Paskutinės naujienos"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "GrÄÆÅ”ti ÄÆ <a href=\"./\">Debian konsultantų puslapÄÆ</a>."
#, fuzzy
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr "<a href=\"m4_HOME/\">Debian Projekto tinklapis</a>."
+#~ msgid "Download with Jigdo"
+#~ msgstr "parsisiųsti su jigdo"
#, fuzzy
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Norėdami kas savaitę gauti naujienas, <a href=\"m4_HOME/MailingLists/"
-#~ "subscribe#debian-news\">užsiregistruokite</a> debian-news paŔto "
-#~ "konferencijoje. "
-
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "<a href=\"../../\">Ankstesnės naujienos</a>."
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "parsisiųsti http/ftp protokolais"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "Network Install"
+#~ msgstr "ÄÆdiegti per tinklą"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "DUK"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "kita"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "DUK"
#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "GrÄÆÅ”ti ÄÆ <a href=\"./\">Debian konsultantų puslapÄÆ</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "kita"
#, 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>."
-#~ msgstr ""
-#~ "Norėdami kas savaitę gauti naujienas, <a href=\"m4_HOME/MailingLists/"
-#~ "subscribe#debian-news\">užsiregistruokite</a> debian-news paŔto "
-#~ "konferencijoje. "
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "kita"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD komanda"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian kompakte"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "DUK"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
+#~ msgid "http_ftp"
+#~ msgstr "http/ftp"
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "Daugiau informacijos"
+#~ msgid "buy"
+#~ msgstr "pirk"
+
+#~ msgid "net_install"
+#~ msgstr "ÄÆdiegimas per tinklą"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "kita"
#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Paliesti paketai"
+#~ msgid "Nominations"
+#~ msgstr "Parama"
#, fuzzy
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "kita"
+#~ msgid "Debate"
+#~ msgstr "Debian CD komanda"
#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Daugiau informacijos"
+#~ msgid "Proposer"
+#~ msgstr "siūloma"
#, fuzzy
-#~ msgid "Discussion"
+#~ msgid "Minimum Discussion"
#~ msgstr "Vyksta&nbsp;diskusijos"
-#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "Nėra"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Laukia&nbsp;sponsorių"
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (nuoroda neegzistuoja)"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Vyksta&nbsp;diskusijos"
-#~ msgid "buy pre-made images"
-#~ msgstr "nusipirkti paruoŔtas cd kopijas"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Atviras&nbsp;balsavimas"
-#~ msgid "download with pik"
-#~ msgstr "parsisiųsti su pik"
+#~ msgid "Decided"
+#~ msgstr "Nuspręsta"
-#~ msgid "pik"
-#~ msgstr "P.I.K"
+#~ msgid "Withdrawn"
+#~ msgstr "AtŔaukta"
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Norėdami su mumis susisiekti aplankykite <a href=\"m4_HOME/contact"
-#~ "\">kontaktų puslapÄÆ</a>."
+#~ msgid "Other"
+#~ msgstr "Kita"
-#~ msgid "discussed"
-#~ msgstr "aptariama"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Pradinis&nbsp;balsavimo&nbsp;puslapis"
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Debian saugumo patarimas"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kaip"
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Debian saugumo patarimai"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Pateikti&nbsp;siūlymą"
-#~ msgid "Vulnerable"
-#~ msgstr "Pažeidžiama"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Keisti&nbsp;siūlymą"
-#~ msgid "Fixed in"
-#~ msgstr "Pataisyta"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Sekti&nbsp;siūlymą"
-#~ msgid "Source:"
-#~ msgstr "IÅ eities tekstai"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Skaityti&nbsp;rezultatą"
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Komponenetas nepriklausantis nuo architektūros"
+#~ msgid "Vote"
+#~ msgstr "Balsuoti"
#, fuzzy
#~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
-#~ msgstr ""
-#~ "Pateiktų bylų kontrolinės sumos yra <a href=\"%attributes"
-#~ "\">originaliame praneŔime</a>."
-
-#~ msgid "No other external database security references currently available."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
#~ msgstr ""
-#~ "Jokių iÅ”orinių saugumo duomenų bazių Å”altinių Å”iuo metų nėra"
-
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "CERT pažeidimai, patarimai ir atsitikimų pasakojimai:"
-
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "Bugtraq duomenų bazėje (pas SecurityFocus):"
-
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "Mitre CVE žodyne:"
-
-#~ msgid "Security database references"
-#~ msgstr "Saugumo duomenų bazės sąsajos"
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
+#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
#~ msgstr ""
#~ "Debian Savaitines Naujienas redaguoja <a href=\"mailto:dwn@debian.org"
-#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary ir Tollef Fog Heen</a>."
+#~ "\">Joe 'Zonker' Brockmeier ir Martin 'Joey' Schulze</a>."
#~ msgid ""
#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
@@ -749,147 +680,226 @@ msgstr "Grįžti į <a href=\"./\">Kas naudoja Debian?</a>."
#~ "Debian Savaitines Naujienas redaguoja <a href=\"mailto:dwn@debian.org"
#~ "\">Joe 'Zonker' Brockmeier ir Martin 'Joey' Schulze</a>."
-#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
#~ msgstr ""
#~ "Debian Savaitines Naujienas redaguoja <a href=\"mailto:dwn@debian.org"
-#~ "\">Joe 'Zonker' Brockmeier ir Martin 'Joey' Schulze</a>."
+#~ "\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary ir Tollef Fog Heen</a>."
+
+#~ msgid "Security database references"
+#~ msgstr "Saugumo duomenų bazės sąsajos"
+
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "Mitre CVE žodyne:"
+
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "Bugtraq duomenų bazėje (pas SecurityFocus):"
+
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "CERT pažeidimai, patarimai ir atsitikimų pasakojimai:"
+
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "Jokių iÅ”orinių saugumo duomenų bazių Å”altinių Å”iuo metų nėra"
#, fuzzy
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
#~ msgstr ""
-#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
-#~ "\">Joey Hess</a>."
-
-#~ msgid "Vote"
-#~ msgstr "Balsuoti"
+#~ "Pateiktų bylų kontrolinės sumos yra <a href=\"%attributes"
+#~ "\">originaliame praneŔime</a>."
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Skaityti&nbsp;rezultatą"
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Komponenetas nepriklausantis nuo architektūros"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Sekti&nbsp;siūlymą"
+#~ msgid "Source:"
+#~ msgstr "IÅ eities tekstai"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Keisti&nbsp;siūlymą"
+#~ msgid "Fixed in"
+#~ msgstr "Pataisyta"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Pateikti&nbsp;siūlymą"
+#~ msgid "Vulnerable"
+#~ msgstr "Pažeidžiama"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Kaip"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Debian saugumo patarimai"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Pradinis&nbsp;balsavimo&nbsp;puslapis"
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Debian saugumo patarimas"
-#~ msgid "Other"
-#~ msgstr "Kita"
+#~ msgid "discussed"
+#~ msgstr "aptariama"
-#~ msgid "Withdrawn"
-#~ msgstr "AtŔaukta"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Norėdami su mumis susisiekti aplankykite <a href=\"m4_HOME/contact"
+#~ "\">kontaktų puslapÄÆ</a>."
-#~ msgid "Decided"
-#~ msgstr "Nuspręsta"
+#~ msgid "pik"
+#~ msgstr "P.I.K"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Atviras&nbsp;balsavimas"
+#~ msgid "download with pik"
+#~ msgstr "parsisiųsti su pik"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Vyksta&nbsp;diskusijos"
+#~ msgid "buy pre-made images"
+#~ msgstr "nusipirkti paruoŔtas cd kopijas"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Laukia&nbsp;sponsorių"
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (nuoroda neegzistuoja)"
#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "Vyksta&nbsp;diskusijos"
+#~ msgid "non-free"
+#~ msgstr "Nėra"
#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "siūloma"
+#~ msgid "Discussion"
+#~ msgstr "Vyksta&nbsp;diskusijos"
#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Debian CD komanda"
+#~ msgid "License Information"
+#~ msgstr "Daugiau informacijos"
#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Parama"
-
-#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
#~ msgstr "kita"
-#~ msgid "net_install"
-#~ msgstr "ÄÆdiegimas per tinklą"
+#, fuzzy
+#~ msgid "No Requested packages"
+#~ msgstr "Paliesti paketai"
-#~ msgid "buy"
-#~ msgstr "pirk"
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "Daugiau informacijos"
-#~ msgid "http_ftp"
-#~ msgstr "http/ftp"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "DUK"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian kompakte"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD komanda"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "kita"
+#~ 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 ""
+#~ "Norėdami kas savaitę gauti naujienas, <a href=\"m4_HOME/MailingLists/"
+#~ "subscribe#debian-news\">užsiregistruokite</a> debian-news paŔto "
+#~ "konferencijoje. "
#, fuzzy
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "kita"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "GrÄÆÅ”ti ÄÆ <a href=\"./\">Debian konsultantų puslapÄÆ</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "DUK"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "kita"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "DUK"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "ÄÆdiegti per tinklą"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Savaitinės Naujienos redaguojamos <a href=\"mailto:dwn@debian.org"
+#~ "\">Joey Hess</a>."
+
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "<a href=\"../../\">Ankstesnės naujienos</a>."
#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "parsisiųsti http/ftp protokolais"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Norėdami kas savaitę gauti naujienas, <a href=\"m4_HOME/MailingLists/"
+#~ "subscribe#debian-news\">užsiregistruokite</a> debian-news paŔto "
+#~ "konferencijoje. "
#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "parsisiųsti su jigdo"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr "<a href=\"m4_HOME/\">Debian Projekto tinklapis</a>."
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "GrÄÆÅ”ti ÄÆ <a href=\"./\">Debian konsultantų puslapÄÆ</a>."
+#~ msgid "Latest News"
+#~ msgstr "Paskutinės naujienos"
-#~ msgid "List of Consultants"
-#~ msgstr "Konsultantų sąraÅ”as"
+#~ msgid "Related Links"
+#~ msgstr "Susijusios nuorodos"
-#~ msgid "Rating:"
-#~ msgstr "Reitingas:"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Projekto</th><th>koordinatorius</th>"
-#~ msgid "Nobody"
-#~ msgstr "Niekieno"
+#~ msgid "Main Coordinator"
+#~ msgstr "Pagrindinis koordinatorius"
-#~ msgid "Taken by:"
-#~ msgstr "Perimta:"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debian dalyvavimas"
-#~ msgid "More information:"
-#~ msgstr "Daugiau informacijos:"
+#~ msgid "More Info"
+#~ msgstr "Daugiau informacijos"
-#~ msgid "Select a server near you"
-#~ msgstr "Pasirinkite tarnybinę stotį, esančią arčiausiai jūsų"
+#~ msgid "Where"
+#~ msgstr "Kur"
+
+#~ msgid "When"
+#~ msgstr "Kada"
+
+#~ msgid "link may no longer be valid"
+#~ msgstr "nuoroda greičiausiai nebe egzistuoja"
+
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Ateinančios atrakcijos"
+
+#~ msgid "More information"
+#~ msgstr "Daugiau informacijos"
diff --git a/lithuanian/po/vendors.lt.po b/lithuanian/po/vendors.lt.po
index 0f6134e7f41..ef50f819915 100644
--- a/lithuanian/po/vendors.lt.po
+++ b/lithuanian/po/vendors.lt.po
@@ -10,137 +10,130 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Pardavėjas:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL Debian Tinklapiui:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Leidžiama įnešti į Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Šalis:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Tarptautinės Siuntos:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "el. paštas:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "CD Tipas:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "DVD Tipas:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Architektūros"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Pardavėjas"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Leidžia įnašus"
-#: ../../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 "Architektūros"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Tarptautinės Siuntos"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Kontaktas"
#. ###################
#. 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 "Pardavėjo Tinklalapis:"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "puslapis"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "el. paštas"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "Tik Europoje"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "Į kelias šalis"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "išeities tekstas"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "ir"
-#~ msgid "Official CD"
-#~ msgstr "Oficialus CD"
+#~ msgid "updated monthly"
+#~ msgstr "Atnaujinama kas menes"
-#~ msgid "Official DVD"
-#~ msgstr "Oficialus DVD"
+#~ msgid "updated twice weekly"
+#~ msgstr "Atnaujinama dukart per savaitę"
-#~ msgid "Development Snapshot"
-#~ msgstr "Kūrimo momentinė nuotrauka"
+#~ msgid "updated weekly"
+#~ msgstr "Atnaujinama kas savaitę"
-#~ msgid "Vendor Release"
-#~ msgstr "Gamintojo Išleista Versiją"
+#~ msgid "reseller"
+#~ msgstr "perpardavinėtojas"
-#~ msgid "Multiple Distribution"
-#~ msgstr "sudėtinis distributyvas"
+#~ msgid "reseller of $var"
+#~ msgstr "$var perpardavinėtojas "
-#~ msgid "non-US included"
-#~ msgstr "non-US įjungta"
+#~ msgid "Custom Release"
+#~ msgstr "Papildoma išleista versiją"
-#~ msgid "non-free included"
-#~ msgstr "non-free įjungta"
+#~ msgid "vendor additions"
+#~ msgstr "pardavėjų priedai"
#~ msgid "contrib included"
#~ msgstr "contrib įjungta"
-#~ msgid "vendor additions"
-#~ msgstr "pardavėjų priedai"
+#~ msgid "non-free included"
+#~ msgstr "non-free įjungta"
-#~ msgid "Custom Release"
-#~ msgstr "Papildoma išleista versiją"
+#~ msgid "non-US included"
+#~ msgstr "non-US įjungta"
-#~ msgid "reseller of $var"
-#~ msgstr "$var perpardavinėtojas "
+#~ msgid "Multiple Distribution"
+#~ msgstr "sudėtinis distributyvas"
-#~ msgid "reseller"
-#~ msgstr "perpardavinėtojas"
+#~ msgid "Vendor Release"
+#~ msgstr "Gamintojo Išleista Versiją"
-#~ msgid "updated weekly"
-#~ msgstr "Atnaujinama kas savaitę"
+#~ msgid "Development Snapshot"
+#~ msgstr "Kūrimo momentinė nuotrauka"
-#~ msgid "updated twice weekly"
-#~ msgstr "Atnaujinama dukart per savaitę"
+#~ msgid "Official DVD"
+#~ msgstr "Oficialus DVD"
-#~ msgid "updated monthly"
-#~ msgstr "Atnaujinama kas menes"
+#~ msgid "Official CD"
+#~ msgstr "Oficialus CD"
+
+#~ msgid "Architectures:"
+#~ msgstr "Architektūros"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD Tipas:"
+
+#~ msgid "CD Type:"
+#~ msgstr "CD Tipas:"
+
+#~ msgid "email:"
+#~ msgstr "el. paštas:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Tarptautinės Siuntos:"
+
+#~ msgid "Country:"
+#~ msgstr "Šalis:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Leidžiama įnešti į Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL Debian Tinklapiui:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Pardavėjas:"
diff --git a/lithuanian/po/vote.lt.po b/lithuanian/po/vote.lt.po
index ceb6f1de6ae..220a64daaa9 100644
--- a/lithuanian/po/vote.lt.po
+++ b/lithuanian/po/vote.lt.po
@@ -20,229 +20,251 @@ msgid "Time Line"
msgstr "Laiko riba"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Paskyrimai"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Debatai"
-#: ../../english/template/debian/votebar.wml:25
+#: ../../english/template/debian/votebar.wml:28
msgid "Platforms"
msgstr "Platformos"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Proposer"
msgstr "Siūlytojas"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "Siūlytojo Pasiūlymas A"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "Siūlytojo Pasiūlymas B"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "Siūlytojo Pasiūlymas C"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "Siūlytojo Pasiūlymas D"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "Siūlytojo Pasiūlymas E"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "Siūlytojo Pasiūlymas F"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Seconds"
msgstr "Palaikantieji"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
msgid "Proposal A Seconds"
msgstr "Palaikantys Pasiūlymą A"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "Palaikantys Pasiūlymą B"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "Palaikantys Pasiūlymą C"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "Palaikantys Pasiūlymą D"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "Palaikantys Pasiūlymą E"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "Palaikantys Pasiūlymą F"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
msgid "Opposition"
msgstr "Opozicija"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
msgid "Text"
msgstr "Tekstas"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal A"
msgstr "Pasiūlymas A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "Pasiūlymas B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "Pasiūlymas C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "Pasiūlymas D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "Pasiūlymas E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "Pasiūlymas F"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
msgid "Choices"
msgstr "Pasirinkimai"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
msgid "Amendment Proposer"
msgstr "Pataisos Siūlytojas"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
msgid "Amendment Seconds"
msgstr "Palaikantys pataisą"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
msgid "Amendment Text"
msgstr "Pataisos Tekstas"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
msgid "Amendment Proposer A"
msgstr "Pataisos Siūlytojas A"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "Pataisos palaikytojai A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "Pataisos Tekstas A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "Pataisos Siūlytojas B"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "Pataisos palaikytojai B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "Pataisos Tekstas B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "Pataisos Siūlytojas A"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "Pataisos palaikytojai A"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "Pataisos Tekstas A"
+
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendments"
msgstr "Pataisos"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:139
msgid "Proceedings"
msgstr "Posėdžiai"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:142
msgid "Majority Requirement"
msgstr "Daugumos reikalavimas"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:145
msgid "Data and Statistics"
msgstr "Duomenys ir Statistika"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:148
msgid "Quorum"
msgstr "Kvorumas"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:151
msgid "Minimum Discussion"
msgstr "Minimalios diskusijos"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:154
msgid "Ballot"
msgstr "Balsavimo kortelė"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:157
msgid "Forum"
msgstr "Forumas"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:160
msgid "Outcome"
msgstr "Rezultatas"
-#: ../../english/template/debian/votebar.wml:152
+#: ../../english/template/debian/votebar.wml:164
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Laukia&nbsp;rėmėjų"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Vyksta&nbsp;diskusijos"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Atviras&nbsp;balsavimas"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Nuspręsta"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Atšaukta"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Kita"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Pradinis&nbsp;balsavimo&nbsp;puslapis"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Kaip"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Pateikti&nbsp;siūlymą"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Keisti&nbsp;siūlymą"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Sekti&nbsp;siūlymą"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Skaityti&nbsp;rezultatą"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Balsuoti"
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"
diff --git a/persian/po/bugs.fa.po b/persian/po/bugs.fa.po
index 6ec60efd843..d1cc0b81b3e 100644
--- a/persian/po/bugs.fa.po
+++ b/persian/po/bugs.fa.po
@@ -160,152 +160,152 @@ msgstr "بایگانی شده"
msgid "Archived and Unarchived"
msgstr "بایگانی شده و بایگانی نشده"
-#~ msgid "Flags:"
-#~ msgstr "پرچم‌ها"
-
-#~ msgid "active bugs"
-#~ msgstr "اشکالات حل نشده"
+#~ msgid "Exclude tag:"
+#~ msgstr "کنارگذاری برچسب:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "اشکالات ادغام شده را فقط یک بار نمایش بده"
+#~ msgid "Include tag:"
+#~ msgstr "شامل برچسب:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ترتیب بدون توجه به وضعیت یا درجه شدت"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "عدم نمایش فهرست محتویات در سرایند"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "عدم نمایش آمارها در زیرنویس‌ها"
+#~ msgid "wontfix"
+#~ msgstr "حل نخواهد شد"
-#~ msgid "proposed-updates"
-#~ msgstr "به روز رسانی‌های پیشنهادی"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "به روز رسانی‌های پیشنهادی آزمایشی"
+#~ msgid "unreproducible"
+#~ msgstr "غیر قابل تولید مجدد"
-#~ msgid "Package version:"
-#~ msgstr "نسخه بسته:"
+#~ msgid "security"
+#~ msgstr "امنیت"
-#~ msgid "Distribution:"
-#~ msgstr "توزیع:"
+#~ msgid "patch"
+#~ msgstr "وصله"
-#~ msgid "bugs"
-#~ msgstr "اشکالات"
+#~ msgid "moreinfo"
+#~ msgstr "اطلاعات بیشتر"
-#~ msgid "open"
-#~ msgstr "باز"
+#~ msgid "l10n"
+#~ msgstr "محلی‌سازی"
-#~ msgid "forwarded"
-#~ msgstr "فرستاده شده"
+#~ msgid "help"
+#~ msgstr "کمک"
-#~ msgid "pending"
-#~ msgstr "در جریان"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream"
-#~ msgid "fixed"
-#~ msgstr "حل شده"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "حل شده در تجربی"
-#~ msgid "done"
-#~ msgstr "انجام شده"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "Include status:"
-#~ msgstr "شامل وضعیت:"
+#~ msgid "confirmed"
+#~ msgstr "تايید شده"
-#~ msgid "Exclude status:"
-#~ msgstr "کنارگذاری وضعیت:"
+#~ msgid "sid"
+#~ msgstr "سید"
-#~ msgid "critical"
-#~ msgstr "بحرانی"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore"
-#~ msgid "grave"
-#~ msgstr "خطرناک"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "serious"
-#~ msgstr "جدی"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "important"
-#~ msgstr "مهم"
+#~ msgid "etch"
+#~ msgstr "اچ"
-#~ msgid "minor"
-#~ msgstr "جزئی"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "wishlist"
-#~ msgstr "فهرست خواسته‌ها"
+#~ msgid "woody"
+#~ msgstr "وودی"
-#~ msgid "Include severity:"
-#~ msgstr "شامل درجه شدت:"
+#~ msgid "potato"
+#~ msgstr "پوتاتو"
#~ msgid "Exclude severity:"
#~ msgstr "کنارگذاری درجه شدت:"
-#~ msgid "potato"
-#~ msgstr "پوتاتو"
+#~ msgid "Include severity:"
+#~ msgstr "شامل درجه شدت:"
-#~ msgid "woody"
-#~ msgstr "وودی"
+#~ msgid "wishlist"
+#~ msgstr "فهرست خواسته‌ها"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "minor"
+#~ msgstr "جزئی"
-#~ msgid "etch"
-#~ msgstr "اچ"
+#~ msgid "important"
+#~ msgstr "مهم"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "serious"
+#~ msgstr "جدی"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "grave"
+#~ msgstr "خطرناک"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore"
+#~ msgid "critical"
+#~ msgstr "بحرانی"
-#~ msgid "sid"
-#~ msgstr "سید"
+#~ msgid "Exclude status:"
+#~ msgstr "کنارگذاری وضعیت:"
-#~ msgid "confirmed"
-#~ msgstr "تايید شده"
+#~ msgid "Include status:"
+#~ msgstr "شامل وضعیت:"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "done"
+#~ msgstr "انجام شده"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "حل شده در تجربی"
+#~ msgid "fixed"
+#~ msgstr "حل شده"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream"
+#~ msgid "pending"
+#~ msgstr "در جریان"
-#~ msgid "help"
-#~ msgstr "کمک"
+#~ msgid "forwarded"
+#~ msgstr "فرستاده شده"
-#~ msgid "l10n"
-#~ msgstr "محلی‌سازی"
+#~ msgid "open"
+#~ msgstr "باز"
-#~ msgid "moreinfo"
-#~ msgstr "اطلاعات بیشتر"
+#~ msgid "bugs"
+#~ msgstr "اشکالات"
-#~ msgid "patch"
-#~ msgstr "وصله"
+#~ msgid "Distribution:"
+#~ msgstr "توزیع:"
-#~ msgid "security"
-#~ msgstr "امنیت"
+#~ msgid "Package version:"
+#~ msgstr "نسخه بسته:"
-#~ msgid "unreproducible"
-#~ msgstr "غیر قابل تولید مجدد"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "به روز رسانی‌های پیشنهادی آزمایشی"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "proposed-updates"
+#~ msgstr "به روز رسانی‌های پیشنهادی"
-#~ msgid "wontfix"
-#~ msgstr "حل نخواهد شد"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "عدم نمایش آمارها در زیرنویس‌ها"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "عدم نمایش فهرست محتویات در سرایند"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ترتیب بدون توجه به وضعیت یا درجه شدت"
-#~ msgid "Include tag:"
-#~ msgstr "شامل برچسب:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "اشکالات ادغام شده را فقط یک بار نمایش بده"
-#~ msgid "Exclude tag:"
-#~ msgstr "کنارگذاری برچسب:"
+#~ msgid "active bugs"
+#~ msgstr "اشکالات حل نشده"
+
+#~ msgid "Flags:"
+#~ msgstr "پرچم‌ها"
diff --git a/persian/po/cdimage.fa.po b/persian/po/cdimage.fa.po
index 3317253bdd4..167206f0117 100644
--- a/persian/po/cdimage.fa.po
+++ b/persian/po/cdimage.fa.po
@@ -14,22 +14,16 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\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 " Key fingerprint"
-#: ../../english/devel/debian-installer/images.data:90
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "ISO images"
-#: ../../english/devel/debian-installer/images.data:91
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "فایل های Jigdo"
@@ -79,7 +73,6 @@ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
msgstr "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
#: ../../english/template/debian/cdimage.wml:43
-#| msgid "<void id=\"dc_misc\" />Misc"
msgid "<void id=\"dc_verify\" />Verify"
msgstr "<void id=\"dc_verify\" />بررسی"
@@ -124,6 +117,9 @@ msgid "<void id=\"misc-bottom\" />misc"
msgstr "<void id=\"misc-bottom\" />متفرقه"
#: ../../english/template/debian/cdimage.wml:76
-msgid "English-language <a href=\"/MailingLists/disclaimer\">public mailing list</a> for CDs/DVDs:"
-msgstr " <a href=\"/MailingLists/disclaimer\">لیست پستی عمومی</a> انگلیسی زبان، برای سی دی ها و دی وی دی ها:"
-
+msgid ""
+"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
+"a> for CDs/DVDs:"
+msgstr ""
+" <a href=\"/MailingLists/disclaimer\">لیست پستی عمومی</a> انگلیسی زبان، برای "
+"سی دی ها و دی وی دی ها:"
diff --git a/persian/po/consultants.fa.po b/persian/po/consultants.fa.po
index 241fe0fd433..7c5ef4b03b9 100644
--- a/persian/po/consultants.fa.po
+++ b/persian/po/consultants.fa.po
@@ -62,8 +62,12 @@ msgid "Willing to Relocate"
msgstr "خواهان جابجایی"
#: ../../english/consultants/consultant.defs:61
-msgid "<total_consultant> Debian consultants listed in <total_country> countries worldwide."
-msgstr "<total_consultant> مشاور دبیان در <total_country> کشور در سطح جهان لیست شده‌اند."
+msgid ""
+"<total_consultant> Debian consultants listed in <total_country> countries "
+"worldwide."
+msgstr ""
+"<total_consultant> مشاور دبیان در <total_country> کشور در سطح جهان لیست "
+"شده‌اند."
#: ../../english/template/debian/consultant.wml:6
msgid "List of Consultants"
@@ -72,4 +76,3 @@ msgstr "لیست مشاوران"
#: ../../english/template/debian/consultant.wml:9
msgid "Back to the <a href=\"./\">Debian consultants page</a>."
msgstr "بازگشت به <a href=\"./\">صفحه مشاوران دبیان</a>."
-
diff --git a/persian/po/distrib.fa.po b/persian/po/distrib.fa.po
index accf6cb8879..7253bf9f267 100644
--- a/persian/po/distrib.fa.po
+++ b/persian/po/distrib.fa.po
@@ -134,88 +134,98 @@ 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 "Hard Float ABI ARM"
-#: ../../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 "هرد ۳۲ بیتی(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 "اینتل ایتانیوم 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 "موتورولا 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 "پاورپی‌سی"
-#: ../../english/releases/arches.data:23
+#: ../../english/releases/arches.data:24
+msgid "POWER Processors"
+msgstr ""
+
+#: ../../english/releases/arches.data:25
msgid "IBM S/390"
msgstr "آی‌بی‌ام S/390"
-#: ../../english/releases/arches.data:24
+#: ../../english/releases/arches.data:26
msgid "IBM System z"
msgstr "IBM System z"
-#: ../../english/releases/arches.data:25
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr "اسپارک"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "بسته‌هایی که شامل پرونده‌ها یا شاخه‌هایی با این نام باشند"
+#~ msgid "Hurd (i386)"
+#~ msgstr "هرد (i386)"
-#~ msgid "all files in this package"
-#~ msgstr "تمام پرونده‌های موجود در این بسته"
+#~ msgid "non-US"
+#~ msgstr "non-US"
-#~ msgid "Case sensitive"
-#~ msgstr "حساس به حروف کوچک و بزرگ"
+#~ msgid "Search case sensitive"
+#~ msgstr "جستجو در حالت حساس به حروف کوچک و بزرگ"
-#~ msgid "no"
-#~ msgstr "نه"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "جستجو در زیرواژه‌ها"
#~ msgid "yes"
#~ msgstr "بله"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "جستجو در زیرواژه‌ها"
+#~ msgid "no"
+#~ msgstr "نه"
-#~ msgid "Search case sensitive"
-#~ msgstr "جستجو در حالت حساس به حروف کوچک و بزرگ"
+#~ msgid "Case sensitive"
+#~ msgstr "حساس به حروف کوچک و بزرگ"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "all files in this package"
+#~ msgstr "تمام پرونده‌های موجود در این بسته"
-#~ msgid "Hurd (i386)"
-#~ msgstr "هرد (i386)"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "بسته‌هایی که شامل پرونده‌ها یا شاخه‌هایی با این نام باشند"
diff --git a/persian/po/doc.fa.po b/persian/po/doc.fa.po
index e27300d7201..7c8131567ce 100644
--- a/persian/po/doc.fa.po
+++ b/persian/po/doc.fa.po
@@ -13,7 +13,24 @@ msgstr ""
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-SourceCharset: utf-8\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"
@@ -28,7 +45,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"
@@ -37,15 +54,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"
@@ -54,17 +71,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"
@@ -79,35 +92,41 @@ 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 -- from\n"
+" in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+"from\n"
" working with text, images, and sound to productivity and networking\n"
" issues. Like the software the book describes, the book is copylefted\n"
" and its source data is available."
msgstr ""
-#: ../../english/doc/books.data:113
+#: ../../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, Psion5).\n"
+" It covers some devices specifically for quick set-up (LART, Assabet, "
+"Psion5).\n"
" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It also\n"
-" includes extensive tutorial information on GNU/Linux basics for developers\n"
+" toolchain is covered in native and cross-compiler form, as are "
+"bootloaders,\n"
+" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+"also\n"
+" includes extensive tutorial information on GNU/Linux basics for "
+"developers\n"
" coming from other platforms.\n"
" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed you\n"
+" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+"you\n"
" will be working from this distribution and preferably have a Debian based\n"
" host machine too."
msgstr ""
-#: ../../english/doc/books.data:136
+#: ../../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"
@@ -115,11 +134,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"
@@ -127,45 +146,58 @@ 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"
" to the configuration of network services.\n"
" Written by two Debian developers, this book can be of interest to many\n"
-" people: the beginner wishing to discover Debian, the advanced user looking\n"
+" people: the beginner wishing to discover Debian, the advanced user "
+"looking\n"
" for tips to enhance his mastership of the Debian tools and the\n"
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:205
-msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+#: ../../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
-msgid "This book teaches you how to install and configure the system and also how to use Debian in a professional environment. It shows the full potential of the distribution (in its current version 6.0) and provides a practical manual for all users who want to learn more about Debian and its range of services."
+#: ../../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 "
+"the distribution (in its current version 6.0) and provides a practical "
+"manual for all users who want to learn more about Debian and its range of "
+"services."
msgstr ""
-#: ../../english/doc/books.data:249
-msgid "2 editions: One with no CD, the other with Official CD (i386, contrib and sources)"
+#: ../../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"
@@ -181,24 +213,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"
@@ -209,11 +241,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"
@@ -223,25 +255,26 @@ 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 and\n"
+" GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+"and\n"
" maintenance of system and networking,\n"
" X Window System setup, and using multimedia in Debian GNU/Linux.\n"
" This book also includes a guide for maintainers, which stimulates\n"
" people in Korea to become official Debian maintainers."
msgstr ""
-#: ../../english/doc/books.data:366
+#: ../../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"
@@ -251,11 +284,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"
@@ -263,10 +296,11 @@ 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 chapter\n"
+" GNU/Linux, Administration of the system and Advanced operations. Each "
+"chapter\n"
" explains in depth the features of the operating system. The first\n"
" chapters explain the structure of GNU/Linux. These chapters will help\n"
" the reader to understand how the system uses basic resources such as\n"
@@ -278,8 +312,14 @@ msgid ""
" Debian Sarge."
msgstr ""
-#: ../../english/doc/books.data:433
-msgid "This is the right book for you to learn how to create basic and complex IT platforms using only Free Software. Inside it you will find a wide range of procedures reviewed and adjusted to fit into the best practices of technological infrastructure implementation. This easy to read and comprehensive guide will take you by the hand to achieve specific objectives with the Debian GNU/Linux operating system."
+#: ../../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 "
+"procedures reviewed and adjusted to fit into the best practices of "
+"technological infrastructure implementation. This easy to read and "
+"comprehensive guide will take you by the hand to achieve specific objectives "
+"with the Debian GNU/Linux operating system."
msgstr ""
#: ../../english/doc/books.def:38
@@ -302,46 +342,73 @@ msgstr "سی دی شامل:"
msgid "Publisher:"
msgstr "منتشر کننده:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "نویسندگان:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "ویرایش کنندگان:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "نگهدارنده:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "وضعیت:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "دسترس پذیری:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "آخرین نسخه:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(نسخه‌ی <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 "متن خالص"
-#. 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
-msgid "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var ddp_pkg_loc />."
-msgstr "از <a href=\"cvs\">SVN</a> برای دریافت منبع SGML متن برای <get-var ddp_pkg_loc /> استفاده کنید."
+#: ../../english/doc/manuals.defs:154
+msgid ""
+"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 ""
+
+#: ../../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:158
+#: ../../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"
@@ -351,27 +418,32 @@ msgstr ""
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" and check out the <kbd>boot-floppies/documentation</kbd> module."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "CVS از طریق وب"
-#: ../../english/doc/manuals.defs:167
-#: ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "بسته‌ی دبیان"
-#: ../../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 "بسته‌ٔ دبیان (بایگانی شده)"
-#: ../../english/releases/arches.data:32
+#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
msgid "PDF"
msgstr "PDF"
#~ msgid "Language:"
#~ msgstr "زبان:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "از <a href=\"cvs\">SVN</a> برای دریافت منبع SGML متن برای <get-var "
+#~ "ddp_pkg_loc /> استفاده کنید."
diff --git a/persian/po/mailinglists.fa.po b/persian/po/mailinglists.fa.po
index 4044e9f9595..b6ee7706a9b 100644
--- a/persian/po/mailinglists.fa.po
+++ b/persian/po/mailinglists.fa.po
@@ -128,9 +128,9 @@ msgstr "باز"
msgid "closed"
msgstr "بسته"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
+
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
#~ "لطفاً لیست‌های پستی که می‌خواهید عضویتتان در آنها لغو شود را انتخاب کنید:"
-
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
diff --git a/persian/po/newsevents.fa.po b/persian/po/newsevents.fa.po
index 2b74b1d4771..8de56c8cf47 100644
--- a/persian/po/newsevents.fa.po
+++ b/persian/po/newsevents.fa.po
@@ -29,27 +29,27 @@ msgstr "p<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 "نام:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "پست الکترونیکی:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "صحبت‌های قبلی:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "زبان‌ها:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "مکان:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "سرفصل‌ها:"
@@ -336,8 +336,8 @@ msgstr ""
#: ../../english/template/debian/projectnews/footer.wml:6
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 ""
#: ../../english/template/debian/projectnews/footer.wml:10
diff --git a/persian/po/organization.fa.po b/persian/po/organization.fa.po
index 9821317af3a..b9d3a3fde19 100644
--- a/persian/po/organization.fa.po
+++ b/persian/po/organization.fa.po
@@ -75,7 +75,7 @@ msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr ""
@@ -85,11 +85,11 @@ msgid "Publicity"
msgstr ""
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr ""
-#. 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 ""
@@ -102,101 +102,101 @@ msgstr "رهبر"
msgid "Technical Committee"
msgstr "شورای فنی"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "منشی"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "پروژه توسعه"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "بایگانی FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "مدیر FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "دستیار FTP"
-#: ../../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 ""
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "مدیریت انتشار"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "تیم انتشار"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "کنترل کیفیت"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "تیم سیستم نصب"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "نکته های انتشار"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD Images"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "محصول"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr ""
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr ""
@@ -224,165 +224,164 @@ msgstr ""
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "رویدادها"
-#: ../../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 "پشتیبانی کاربران"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr ""
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "تیم امنیت"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "تیم تست امنیت"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "تیم بررسی امنیت"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "صفحات وب"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "صفحه مشاوره ها"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "صفحه فروشندگان CD"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "سیاره دبیان"
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "سیاست"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "مدیر سیستم"
-#: ../../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."
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "آینه های دریافت"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "نگهدارنده DNS"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr ""
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr ""
-#: ../../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 ""
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr ""
+#~ msgid "Volatile Team"
+#~ msgstr "تیم Volatile"
+
#~ msgid "Vendors"
#~ msgstr "فروشنده ها"
-#~ msgid "Volatile Team"
-#~ msgstr "تیم Volatile"
+#~ msgid "Security Audit Project"
+#~ msgstr "تیم بررسی امنیت"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "تیم تست امنیت"
diff --git a/persian/po/others.fa.po b/persian/po/others.fa.po
index 44acb2d9170..e4ba1769228 100644
--- a/persian/po/others.fa.po
+++ b/persian/po/others.fa.po
@@ -176,26 +176,6 @@ msgstr "[دبیان] (دکمه کوچک)"
msgid "same as the above"
msgstr "مانند آنچه در بالا آمده است"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "خواسته شده:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "چه کسی:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "معماری:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "مشخصات:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "کجا:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "محصولات"
@@ -240,24 +220,36 @@ msgstr "علائم"
msgid "basketball goals"
msgstr "گل‌های بسکتبال"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "گوشواره‌ها"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "چمدانها"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
#, fuzzy
#| msgid "suitcases"
msgid "pillowcases"
msgstr "چمدانها"
+#: ../../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 ""
@@ -333,67 +325,69 @@ msgstr "نسخه"
msgid "URL"
msgstr "نشانی اینترنتی"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
-
-#~ msgid "Previous Talks:"
-#~ msgstr "صحبت‌های قبلی:"
+#~ msgid "Name:"
+#~ msgstr "نام:"
-#~ msgid "Languages:"
-#~ msgstr "زبان‌ها:"
+#~ msgid "Company:"
+#~ msgstr "شرکت:"
-#~ msgid "Location:"
-#~ msgstr "مکان:"
+#~ msgid "URL:"
+#~ msgstr "نشانی اینترنتی:"
-#~ msgid "Topics:"
-#~ msgstr "سرفصل‌ها:"
+#~ msgid "or"
+#~ msgstr "یا"
-#~ msgid "closed"
-#~ msgstr "بسته"
+#~ msgid "Email:"
+#~ msgstr "پست الکترونیکی:"
-#~ msgid "open"
-#~ msgstr "باز"
+#~ msgid "Rates:"
+#~ msgstr "میزان‌ها:"
-#~ msgid "Unsubscribe"
-#~ msgstr "لغو عضویت"
+#~ msgid "Willing to Relocate"
+#~ msgstr "خواهان جابجایی"
-#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "لطفاً لیست‌های پستی که می‌خواهید عضویتتان در آنها لغو شود را انتخاب کنید:"
+#~ "<total_consultant> مشاور دبیان در <total_country> کشور در سطح جهان لیست "
+#~ "شده‌اند."
+
+#~ msgid "Mailing List Subscription"
+#~ msgstr "عضویت در لیست پستی"
#~ 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. "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
#~ "برای کسب اطلاعات از نحوه عضویت توسط پست الکترونیکی صفحه <a href=\"./"
#~ "#subunsub\">لیست‌های پستی</a> را مطالعه کنید. همچنین <a href=\"unsubscribe"
#~ "\">فرم لغو عضویت</a> نیز برای لغو عضویت شما از لیست‌های پستی در دسترس است."
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "لغو عضویت لیست پستی"
-
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
#~ msgstr ""
-#~ "لطفاً به <a href=\"./#ads\">سیاستهای تبلیغاتی لیست پستی دبیان </a> احترام "
-#~ "بگذارید."
-
-#~ msgid "Clear"
-#~ msgstr "پاک کردن"
+#~ "توجه داشته باشید که بیشتر لیست‌های پستی دبیان انجمنهای عمومی هستند٬ هر "
+#~ "نامه‌ای که به آن فرستاده می‌شود٬ در بایگانی لیست پستی به صورت عمومی منتشر "
+#~ "می‌شود و توسط موتورهای جستجو طبقه‌بندی می‌گردد. شما برای عضویت در لیست پستی "
+#~ "باید از آدرس پست الکترونیکی استفاده کنید که انتشار آن به صورت عمومی برای "
+#~ "شما اهمیتی نداشته باشد."
-#~ msgid "Subscribe"
-#~ msgstr "عضویت"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "آدرس پست الکترونیکی شما"
+#~ msgid "No description given"
+#~ msgstr "توضیحی در دسترس نیست"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "یک نسخه خلاصه شده٬ فقط خواندنی است."
+#~ msgid "Moderated:"
+#~ msgstr "کنترل شده:"
-#~ msgid "Subscription:"
-#~ msgstr "عضویت:"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "تنها اعضاء اجازه ارسال پیغام دارند."
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -401,66 +395,79 @@ msgstr "نشانی اینترنتی"
#~ "تنها پیغام‌هایی که توسط توسعه‌دهندگان دبیان مشخص شده‌اند در این لیست پذیرفته "
#~ "می‌شوند."
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "تنها اعضاء اجازه ارسال پیغام دارند."
+#~ msgid "Subscription:"
+#~ msgstr "عضویت:"
-#~ msgid "Moderated:"
-#~ msgstr "کنترل شده:"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "یک نسخه خلاصه شده٬ فقط خواندنی است."
-#~ msgid "No description given"
-#~ msgstr "توضیحی در دسترس نیست"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "آدرس پست الکترونیکی شما"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "لطفاً مشخص کنید در کدام لیست‌ها قصد عضویت دارید:"
+#~ msgid "Subscribe"
+#~ msgstr "عضویت"
+
+#~ msgid "Clear"
+#~ msgstr "پاک کردن"
#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "توجه داشته باشید که بیشتر لیست‌های پستی دبیان انجمنهای عمومی هستند٬ هر "
-#~ "نامه‌ای که به آن فرستاده می‌شود٬ در بایگانی لیست پستی به صورت عمومی منتشر "
-#~ "می‌شود و توسط موتورهای جستجو طبقه‌بندی می‌گردد. شما برای عضویت در لیست پستی "
-#~ "باید از آدرس پست الکترونیکی استفاده کنید که انتشار آن به صورت عمومی برای "
-#~ "شما اهمیتی نداشته باشد."
+#~ "لطفاً به <a href=\"./#ads\">سیاستهای تبلیغاتی لیست پستی دبیان </a> احترام "
+#~ "بگذارید."
+
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "لغو عضویت لیست پستی"
#~ 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 ""
#~ "برای کسب اطلاعات از نحوه عضویت توسط پست الکترونیکی صفحه <a href=\"./"
#~ "#subunsub\">لیست‌های پستی</a> را مطالعه کنید. همچنین <a href=\"unsubscribe"
#~ "\">فرم لغو عضویت</a> نیز برای لغو عضویت شما از لیست‌های پستی در دسترس است."
-#~ msgid "Mailing List Subscription"
-#~ msgstr "عضویت در لیست پستی"
-
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
-#~ "<total_consultant> مشاور دبیان در <total_country> کشور در سطح جهان لیست "
-#~ "شده‌اند."
+#~ "لطفاً لیست‌های پستی که می‌خواهید عضویتتان در آنها لغو شود را انتخاب کنید:"
-#~ msgid "Willing to Relocate"
-#~ msgstr "خواهان جابجایی"
+#~ msgid "Unsubscribe"
+#~ msgstr "لغو عضویت"
-#~ msgid "Rates:"
-#~ msgstr "میزان‌ها:"
+#~ msgid "open"
+#~ msgstr "باز"
-#~ msgid "Email:"
-#~ msgstr "پست الکترونیکی:"
+#~ msgid "closed"
+#~ msgstr "بسته"
-#~ msgid "or"
-#~ msgstr "یا"
+#~ msgid "Topics:"
+#~ msgstr "سرفصل‌ها:"
-#~ msgid "URL:"
-#~ msgstr "نشانی اینترنتی:"
+#~ msgid "Location:"
+#~ msgstr "مکان:"
-#~ msgid "Company:"
-#~ msgstr "شرکت:"
+#~ msgid "Languages:"
+#~ msgstr "زبان‌ها:"
-#~ msgid "Name:"
-#~ msgstr "نام:"
+#~ msgid "Previous Talks:"
+#~ msgstr "صحبت‌های قبلی:"
+
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
+
+#~ msgid "Where:"
+#~ msgstr "کجا:"
+
+#~ msgid "Specifications:"
+#~ msgstr "مشخصات:"
+
+#~ msgid "Architecture:"
+#~ msgstr "معماری:"
+
+#~ msgid "Who:"
+#~ msgstr "چه کسی:"
+
+#~ msgid "Wanted:"
+#~ msgstr "خواسته شده:"
diff --git a/persian/po/ports.fa.po b/persian/po/ports.fa.po
index 094d440a0e4..af4bb8b82fd 100644
--- a/persian/po/ports.fa.po
+++ b/persian/po/ports.fa.po
@@ -117,32 +117,32 @@ msgstr "دبیان برای PowerPC"
msgid "Debian for Sparc"
msgstr "دبیان برای Sparc"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "دبیان برای Sparc64"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "دبیان برای S/390"
+#~ msgid "Debian for Laptops"
+#~ msgstr "دبیان برای لپ تاپ"
-#~ msgid "Debian for MIPS"
-#~ msgstr "دبیان برای MIPS"
+#~ msgid "Debian for AMD64"
+#~ msgstr "دبیان برای AMD64"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "دبیان برای موتورولا 680x0"
+#~ msgid "Debian for ARM"
+#~ msgstr "دبیان برای ARM"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "دبیان برای GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "دبیان برای Beowulf"
#~ msgid "Main"
#~ msgstr "اصلی"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "دبیان برای Beowulf"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "دبیان برای GNU/FreeBSD"
-#~ msgid "Debian for ARM"
-#~ msgstr "دبیان برای ARM"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "دبیان برای موتورولا 680x0"
-#~ msgid "Debian for AMD64"
-#~ msgstr "دبیان برای AMD64"
+#~ msgid "Debian for MIPS"
+#~ msgstr "دبیان برای MIPS"
-#~ msgid "Debian for Laptops"
-#~ msgstr "دبیان برای لپ تاپ"
+#~ msgid "Debian for S/390"
+#~ msgstr "دبیان برای S/390"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "دبیان برای Sparc64"
diff --git a/persian/po/templates.fa.po b/persian/po/templates.fa.po
index baedacd8f59..d5ec6022273 100644
--- a/persian/po/templates.fa.po
+++ b/persian/po/templates.fa.po
@@ -69,7 +69,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "بازگشت به <a href=\"m4_HOME/\">صفحه خانگی پروژه دبیان</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 "خانه"
@@ -110,7 +110,7 @@ msgid "Support"
msgstr "پشتیبانی"
#: ../../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 "خلوت توسعه دهندگان"
@@ -147,7 +147,7 @@ msgid "Miscellaneous"
msgstr "گوناگون"
#: ../../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 "دریافت دبیان"
@@ -202,7 +202,7 @@ msgstr "در انتشار ۲.۲"
#. 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -220,24 +220,24 @@ msgstr ""
"\">debian-www@lists.debian.org</a> نامه بزنید. برای دیدن اطلاعات تماس دیگر, "
"به <a href=\"m4_HOME/contact\">صفحه تماس</a> مراجعه کنید."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "آخرین تغییرات انجام شده"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "حق انتشار"
-#: ../../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 ""
-#: ../../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 ""
"صفحه <a href=\"m4_HOME/license\" rel=\"copyright\">شرایط مجوز</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."
@@ -299,140 +299,152 @@ msgid "Debian Books"
msgstr "کتاب های دبیان "
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "کمک به دبیان"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "بایگانی لیست های پستی"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "لیست های پستی"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "قرارداد اجتماعی"
-#: ../../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 "حامی این سایت را ببینید"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr "دبیان ۵٫۰ - سیستم عامل جهانی"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "نقشه سایت صفحات وب دبیان"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "پایگاه داده توسعه دهندگان"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "کتاب های دبیان "
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "راهنمای خط مشی دبیان"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "مرجع توسعه دهندگان"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "راهنمای نگه دارندگان جدید"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "اشکالات بحرانی انتشار"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "گزارش Lintian"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "بایگانی ها برای لیست های پستی کاربران"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "بایگانی ها برای لیست های پستی توسعه دهندگان"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "بایگانی ها برای لیست های پستی i18n/l10n"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "بایگانی ها برای لیست های پستی port ها"
-#: ../../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 "بایگانی ها برای لیست های پستی سیستم دنبال کننده ایرادات"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "بایگانی ها برای لیست های پستی گوناگون"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "نرم افزار آزاد"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "توسعه"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "کمک به دبیان"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "گزارش‌های خطا"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "معماری ها /پورت ها"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "راهنمای نصب"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "فروشندگان لوح فشرده"
-#: ../../english/template/debian/links.tags.wml:122
-msgid "CD ISO images"
+#: ../../english/template/debian/links.tags.wml:128
+#, fuzzy
+#| msgid "CD ISO images"
+msgid "CD/USB ISO images"
msgstr "تصاویر ISO لوح فشرده"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "نصب توسط شبکه"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "از پیش نصب شده"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "پروژه Debian-Edu"
-#: ../../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 "تضمین کیفیت"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "سیستم پیگرد بسته"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "مرور کلی بسته های توسعه دهندگان دبیان"
@@ -517,23 +529,23 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "بازگشت به <a href=\"../\">صفحه چه کسی از دبیان استفاده می کند؟</a>."
-#~ msgid "Rating:"
-#~ msgstr "درجه بندی:"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "آیا در صفحه آرایی سایت مشکلی می بینید؟"
-#~ msgid "Nobody"
-#~ msgstr "هیچ کس"
+#~ msgid "Report it!"
+#~ msgstr "گزارش کنید!"
-#~ msgid "Taken by:"
-#~ msgstr "گرفته شده توسط:"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "سروری که به شما نزدیک است را انتخاب کنید:"
#~ msgid "More information:"
#~ msgstr "اطلاعات بیشتر:"
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "سروری که به شما نزدیک است را انتخاب کنید:"
+#~ msgid "Taken by:"
+#~ msgstr "گرفته شده توسط:"
-#~ msgid "Report it!"
-#~ msgstr "گزارش کنید!"
+#~ msgid "Nobody"
+#~ msgstr "هیچ کس"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "آیا در صفحه آرایی سایت مشکلی می بینید؟"
+#~ msgid "Rating:"
+#~ msgstr "درجه بندی:"
diff --git a/persian/po/vendors.fa.po b/persian/po/vendors.fa.po
index 24b5993f2c6..0ee5ae394e7 100644
--- a/persian/po/vendors.fa.po
+++ b/persian/po/vendors.fa.po
@@ -13,92 +13,85 @@ msgstr ""
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "فروشنده:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL برای صفحه دبیان:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "اجازه دادن به همکاری با دبیان:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "کشور:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "ارسال بین المللی:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "پست الکترونیکی:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "نوع CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "نوع DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "معماری:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "فروشنده"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "اجازه همکاری"
-#: ../../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 "معماری ها:"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "ارسال بین المللی"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "تماس"
#. ###################
#. 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 "خانه فروشنده"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "صفحه"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "پست الکترونیکی"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "در محدوده اروپا"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "به بعضی مکان ها"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "منبع"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "و"
+
+#~ msgid "Architectures:"
+#~ msgstr "معماری:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "نوع DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "نوع CD:"
+
+#~ msgid "email:"
+#~ msgstr "پست الکترونیکی:"
+
+#~ msgid "Ship International:"
+#~ msgstr "ارسال بین المللی:"
+
+#~ msgid "Country:"
+#~ msgstr "کشور:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "اجازه دادن به همکاری با دبیان:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL برای صفحه دبیان:"
+
+#~ msgid "Vendor:"
+#~ msgstr "فروشنده:"
diff --git a/persian/po/vote.fa.po b/persian/po/vote.fa.po
index 1d3f1eafb05..6bdd3367c0a 100644
--- a/persian/po/vote.fa.po
+++ b/persian/po/vote.fa.po
@@ -22,229 +22,251 @@ msgid "Time Line"
msgstr "خط زمان"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "نامزدها"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "بحث"
-#: ../../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
msgid "Proposer"
msgstr "پیشنهاد کننده"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "Aطرح پیشنهادی پیشنهاد کننده "
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "Bطرح پیشنهادی پیشنهادکننده"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "Cطرح پیشنهادی پیشنهاد دهنده "
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "Dطرح پیشنهادی پیشنهاد دهنده"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "Eطرح پیشنهادی پیشنهاد دهنده"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "Fطرح پیشنهادی پیشنهاد دهنده "
-#: ../../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 "Aپیشنهاد دهنده طرح پیشنهادی ثانویه "
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "B طرح پیشنهادی ثانویه پیشنهاد دهنده"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "C طرح پیشنهادی ثانویه"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "D طرح پیشنهادی ثانویه"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "E طرح پیشنهادی ثانویه"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "F طرح پیشنهادی ثانویه"
-#: ../../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 "Aپیشنهاد"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "B پیشنهاد"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "C پیشنهاد"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "D پیشنهاد"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "D طرح"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "F طرح"
-#: ../../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 "A اصلاح پیشنهاد دهنده "
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "A اصلاح ثانویه های "
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "A اصلاح متن"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "B اصلاح پیشنهاد دهنده "
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "B اصلاح ثانویه های "
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "B اصلاح متن"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "A اصلاح پیشنهاد دهنده "
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "A اصلاح ثانویه های "
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "A اصلاح متن"
+
+#: ../../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
msgid "Minimum Discussion"
msgstr "بحث کمینه"
-#: ../../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 "انتظار&nbsp;برای&nbsp;حامیان"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "در حال&nbsp;بحث"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "رای دادن&nbsp;باز"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "قطعی"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "پس گرفته شده"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "دیگر"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "خانه&nbsp;رای&nbsp;صفحه"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "چگونه&nbsp;پیکربندی کردن"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "پیشنهاد کردن&nbsp;a&nbsp;طرح"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "اصلاح کردن&nbsp;a&nbsp;طرح"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "دنبال کردن&nbsp;a&nbsp;طرح"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "خواندن&nbsp;a&nbsp;نتیجه"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "رای"
diff --git a/polish/po/cdimage.pl.po b/polish/po/cdimage.pl.po
index a7f3c5df2e6..e782edf4f80 100644
--- a/polish/po/cdimage.pl.po
+++ b/polish/po/cdimage.pl.po
@@ -17,18 +17,16 @@ msgstr ""
"X-Generator: Gtranslator 2.91.5\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 " Odcisk klucza"
-#: ../../english/devel/debian-installer/images.data:90
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "obrazy ISO"
-#: ../../english/devel/debian-installer/images.data:91
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "pliki jigdo"
diff --git a/polish/po/distrib.pl.po b/polish/po/distrib.pl.po
index 5691c44b3d8..e9a148e9bce 100644
--- a/polish/po/distrib.pl.po
+++ b/polish/po/distrib.pl.po
@@ -131,61 +131,71 @@ 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 "ABI ARM ze sprzętowym FPU"
-#: ../../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 dla 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 dla 32-bit PC (i386)"
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr "kFreeBSD dla 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 "IBM System z"
-#: ../../english/releases/arches.data:25
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr "SPARC"
diff --git a/polish/po/doc.pl.po b/polish/po/doc.pl.po
index f3f931688a0..d5924803c35 100644
--- a/polish/po/doc.pl.po
+++ b/polish/po/doc.pl.po
@@ -3,132 +3,34 @@
#
msgid ""
msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2014-02-20 07:45+0100\n"
"Last-Translator: Mirosław Gabruś <mirekgab@wp.pl>\n"
"Language-Team: polski <debian-l10n-polish@lists.debian.org>\n"
+"Language: \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"PO-Revision-Date: 2014-02-20 07:45+0100\n"
"X-Generator: Gtranslator 2.91.6\n"
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/doc/books.def:41
-msgid "email:"
-msgstr "e-mail:"
-
-#: ../../english/doc/books.def:45
-msgid "Available at:"
-msgstr "Dostępne pod adresem:"
-
-#: ../../english/doc/books.def:48
-msgid "CD Included:"
-msgstr "Zawiera CD:"
-
-#: ../../english/doc/books.def:51
-msgid "Publisher:"
-msgstr "Wydawca:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Autorzy:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Edytorzy:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Opiekun:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Status:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Dostępność:"
-
-#: ../../english/doc/manuals.defs:92
-msgid "Latest version:"
-msgstr "Ostatnia wersja:"
-
-#: ../../english/doc/manuals.defs:108
-msgid "(version <get-var version />)"
-msgstr "(wersja <get-var version />)"
-
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:34
-msgid "plain text"
-msgstr "czysty tekst"
-
-#: ../../english/doc/manuals.defs:154
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
-msgstr ""
-"Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
-"href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
-
-#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
-msgid "Web interface: "
-msgstr "Interfejs WWW:"
-
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
-msgid "VCS interface: "
-msgstr "Interfejs VCS:"
-
-#: ../../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 ""
-"Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
-"href=\"https://packages.debian.org/cvs\">Cvs</a>."
-
-#: ../../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 ""
-"Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
-"href=\"https://packages.debian.org/subversion\">Subversion</a>."
-
-#: ../../english/doc/manuals.defs:178
+#: ../../english/doc/books.data:32
msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
+"\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 ""
-"Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
-"href=\"https://packages.debian.org/git\">Git</a>."
-
-#: ../../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"
-" and check out the <kbd>boot-floppies/documentation</kbd> module."
-msgstr ""
-"Źródła CVS działającej kopi: ustaw <code>CVSROOT</code>\n"
-" na <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-" i sprawdź moduł <kbd>boot-floppies/documentation</kbd>."
-
-#: ../../english/doc/manuals.defs:193
-msgid "CVS via web"
-msgstr "CVS przez www"
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
-msgid "Debian package"
-msgstr "Pakiet Debiana"
-
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
-msgid "Debian package (archived)"
-msgstr "Pakiet Debiana (w archiwum)"
-
-#: ../../english/doc/books.data:30
+#: ../../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"
@@ -155,7 +57,7 @@ msgstr ""
"zabezpieczenia usług, automatyczne instalacje czy wirtualizacja przy\n"
"pomocy Xen, KVM oraz LXC."
-#: ../../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"
@@ -169,15 +71,15 @@ msgstr ""
" wyczerpującym źródłem dla użytkowników, którzy sami instalują i\n"
" opiekują się systemem (czy to w domu, biurze, czy szkole)."
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "CD z instalatorem Sarge'a oraz wybranymi pakietami"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "Live CD z Knoppiksem"
-#: ../../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"
@@ -192,13 +94,13 @@ msgstr ""
" ogólne informacje na temat projektu oraz obszerną informację o systemie\n"
" zarządzania pakietami w Debianie."
-#: ../../english/doc/books.data:77 ../../english/doc/books.data:180
-#: ../../english/doc/books.data:224 ../../english/doc/books.data:269
+#: ../../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 "oficjalna płyta DVD Debian GNU/Linux 3.1r0a sarge (i386)"
-#: ../../english/doc/books.data:80 ../../english/doc/books.data:183
-#: ../../english/doc/books.data:227 ../../english/doc/books.data:272
+#: ../../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"
@@ -226,7 +128,7 @@ msgstr ""
" standardowego podręcznika Linuksa, tak aby dobrze wykorzystać własne\n"
" doświadczenie w świecie Debiana."
-#: ../../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 -- "
@@ -242,11 +144,11 @@ msgstr ""
" opisywane oprogramowanie książka jest dostępna na\n"
" zasadach <i>copyleft</i> i jej materiały źródłowe są dostępne."
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
msgid "Debian 2.2 ARM architecture"
msgstr "Debian 2.2 ARM"
-#: ../../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, "
@@ -281,7 +183,7 @@ msgstr ""
" będziesz pracował z tą dystrybucją, a także będziesz posiadał\n"
" maszynę-hosta opartą na Debianie."
-#: ../../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"
@@ -293,11 +195,11 @@ msgstr ""
" Billa McCarthy'ego, użytkownicy Windowsa otrzymają łagodne\n"
" wprowadzenie do tego ekscytującego komputerowego świata."
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
msgid "Debian 2.1"
msgstr "Debian 2.1"
-#: ../../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"
@@ -311,11 +213,11 @@ msgstr ""
" multimedia. Dodatkowo zakup książki zapewnia 30-dniowe wsparcie\n"
" techniczne przez pocztę elektroniczną."
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "DVD Debian Squeeze i386/amd64"
-#: ../../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"
@@ -335,15 +237,27 @@ msgstr ""
" udoskonalić ich umiejętności oraz administratorów, którzy chcą\n"
" budować niezawodne sieci oparte na Debianie."
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "dwie edycje: Jedna bez DVD, druga z dwiema płytami DVD (i386)"
-#: ../../english/doc/books.data:213
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 i amd64) na DVD"
-#: ../../english/doc/books.data:216
+#: ../../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 "
@@ -356,7 +270,7 @@ msgstr ""
"wersji 6.0) i służy jako praktyczny podręcznik dla wszystkich pragnących "
"poznać bliżej Debiana i wachlarz jego usług."
-#: ../../english/doc/books.data:244
+#: ../../english/doc/books.data:287
msgid ""
"2 editions: One with no CD, the other with Official CD (i386, contrib and "
"sources)"
@@ -364,7 +278,7 @@ msgstr ""
"dwa wydania: jedno bez płyt, drugie z oficjalną płytą CD (i386, sekcja "
"contrib i źródła)"
-#: ../../english/doc/books.data:247
+#: ../../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"
@@ -394,11 +308,11 @@ msgstr ""
" komputerowymi, takie jak: planowanie i budowanie wdzwanianych\n"
" routerów lub serwera dla klientów opartych na Windowsie (Samba)."
-#: ../../english/doc/books.data:290
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "1 CD z Debian GNU/Linux 3.1 Sarge"
-#: ../../english/doc/books.data:293
+#: ../../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"
@@ -409,13 +323,13 @@ msgstr ""
" instalacja na różne sposoby, dostosowywanie pulpitu do własnych\n"
" potrzeb, rozwiązywanie problemów, co warto wiedzieć itd."
-#: ../../english/doc/books.data:306
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
msgstr "Debian GNU/Linux 3.1r0 i386, edycja autora (DVD + CD)"
-#: ../../english/doc/books.data:310
+#: ../../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"
@@ -434,11 +348,11 @@ msgstr ""
" być pożyteczna dla wszystkich użytkowników Debiana: zarówno\n"
" początkujących jak i zaawansowanych."
-#: ../../english/doc/books.data:325
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr "Debian 2.2r0 i386 edycja autora (3 płyty CD)"
-#: ../../english/doc/books.data:328
+#: ../../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"
@@ -454,11 +368,11 @@ msgstr ""
" Dzięki zmodyfikowanym płytom CD, będziesz w stanie bez problemu\n"
" zainstalować swój system i zacząć go używać w języku japońskim."
-#: ../../english/doc/books.data:344
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "1 nieoficjalny Woody, 3 płyty z Potato rev0"
-#: ../../english/doc/books.data:347
+#: ../../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 "
@@ -476,12 +390,12 @@ msgstr ""
" który ma zachęcić ludzi w Korei do zostania oficjalnym deweloperem\n"
" Debiana."
-#: ../../english/doc/books.data:361
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr ""
"trzy oficjalne płyty CD z wydaniem potato r3 i nieoficjalny CD z woody'm"
-#: ../../english/doc/books.data:364
+#: ../../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"
@@ -499,11 +413,11 @@ msgstr ""
" języka koreańskiego. Jest to dobra pozycja również dla\n"
" początkujących."
-#: ../../english/doc/books.data:386
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "Debian GNU/Linux 3.1r0 CD1"
-#: ../../english/doc/books.data:389
+#: ../../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"
@@ -515,7 +429,7 @@ msgstr ""
" WWW, bazy danych, <i>firewall</i>, poczta, ftp. Ponadto znajdują się\n"
" tu również informacje na temat systemu pakietów w Debianie."
-#: ../../english/doc/books.data:405
+#: ../../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 "
@@ -544,7 +458,7 @@ msgstr ""
" gruntownie poznać system GNU/Linux. Informacje podane w książce\n"
" oparte są na wydaniu Sarge."
-#: ../../english/doc/books.data:428
+#: ../../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 "
@@ -561,10 +475,126 @@ msgstr ""
"osiągnięcie konkretnych celów przy pomocy systemu operacyjnego Debian GNU/"
"Linux."
-#: ../../english/releases/arches.data:32
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../../english/doc/books.def:41
+msgid "email:"
+msgstr "e-mail:"
+
+#: ../../english/doc/books.def:45
+msgid "Available at:"
+msgstr "Dostępne pod adresem:"
+
+#: ../../english/doc/books.def:48
+msgid "CD Included:"
+msgstr "Zawiera CD:"
+
+#: ../../english/doc/books.def:51
+msgid "Publisher:"
+msgstr "Wydawca:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Autorzy:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Edytorzy:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Opiekun:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Dostępność:"
+
+#: ../../english/doc/manuals.defs:92
+msgid "Latest version:"
+msgstr "Ostatnia wersja:"
+
+#: ../../english/doc/manuals.defs:108
+msgid "(version <get-var version />)"
+msgstr "(wersja <get-var version />)"
+
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
+msgid "plain text"
+msgstr "czysty tekst"
+
+#: ../../english/doc/manuals.defs:154
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+msgstr ""
+"Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
+"href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
+
+#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
+#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+msgid "Web interface: "
+msgstr "Interfejs WWW:"
+
+#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+msgid "VCS interface: "
+msgstr "Interfejs VCS:"
+
+#: ../../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 ""
+"Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
+"href=\"https://packages.debian.org/cvs\">Cvs</a>."
+
+#: ../../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 ""
+"Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
+"href=\"https://packages.debian.org/subversion\">Subversion</a>."
+
+#: ../../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 ""
+"Aktualne źródło <get-var srctype /> jest dostępne poprzez repozytorium <a "
+"href=\"https://packages.debian.org/git\">Git</a>."
+
+#: ../../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"
+" and check out the <kbd>boot-floppies/documentation</kbd> module."
+msgstr ""
+"Źródła CVS działającej kopi: ustaw <code>CVSROOT</code>\n"
+" na <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+" i sprawdź moduł <kbd>boot-floppies/documentation</kbd>."
+
+#: ../../english/doc/manuals.defs:193
+msgid "CVS via web"
+msgstr "CVS przez www"
+
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+msgid "Debian package"
+msgstr "Pakiet Debiana"
+
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+msgid "Debian package (archived)"
+msgstr "Pakiet Debiana (w archiwum)"
+
+#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
msgid "PDF"
msgstr "PDF"
diff --git a/polish/po/newsevents.pl.po b/polish/po/newsevents.pl.po
index e89a0354ba7..54e837bdaa2 100644
--- a/polish/po/newsevents.pl.po
+++ b/polish/po/newsevents.pl.po
@@ -33,27 +33,27 @@ msgstr "str.<get-var page />"
msgid "The newsletter for the Debian community"
msgstr "Biuletyn dla społeczności Debiana"
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr "Imię i nazwisko:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "E-mail:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Poprzednie wykłady:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Języki:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Miejsce:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Tematy:"
@@ -189,8 +189,8 @@ msgid ""
"There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats"
"\">hints on how to interpret</a> these numbers."
msgstr ""
-"Patrz <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">uwagi na temat "
-"interpretacji</a> tych liczb."
+"Patrz <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">uwagi na "
+"temat interpretacji</a> tych liczb."
#: ../../english/template/debian/projectnews/boilerplates.wml:78
msgid ""
@@ -412,12 +412,17 @@ msgstr ""
"następujące zagadnienia:"
#: ../../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 ""
-"Aby otrzymywać ten biuletyn pocztą elektroniczną w cyklu dwutygodniowym, <a "
-"href=\"https://lists.debian.org/debian-news/\">zapisz się na listę debian-"
+"Aby co tydzień otrzymywać pocztą elektroniczną ten biuletyn <a href="
+"\"m4_HOME/MailingLists/subscribe#debian-news\">zapisz się na listę debian-"
"news</a>."
#: ../../english/template/debian/projectnews/footer.wml:10
@@ -541,3 +546,12 @@ msgid ""
msgstr ""
"<void id=\"plural\" />Ten odcinek Cotygodniowych wiadomości Debiana "
"przygotowali(ły) <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 ""
+#~ "Aby otrzymywać ten biuletyn pocztą elektroniczną w cyklu dwutygodniowym, "
+#~ "<a href=\"https://lists.debian.org/debian-news/\">zapisz się na listę "
+#~ "debian-news</a>."
diff --git a/polish/po/organization.pl.po b/polish/po/organization.pl.po
index 8298e5ace94..9da2653653c 100644
--- a/polish/po/organization.pl.po
+++ b/polish/po/organization.pl.po
@@ -76,7 +76,7 @@ msgid "Officers"
msgstr "Oficerowie"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Dystrybucja"
@@ -86,11 +86,11 @@ msgid "Publicity"
msgstr "Rozgłos"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Wsparcie i Infrastruktura"
-#. 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 "Czyste Mieszanki Debiana (Pure Blends)"
@@ -103,99 +103,99 @@ msgstr "Prowadzący"
msgid "Technical Committee"
msgstr "Komitet Techniczny"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Sekretarz"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Projekty Rozwoju"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Archiwa FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "Główny serwer FTP"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Asystenci FTP"
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "Kreator FTP"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Backporty"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Zespół Backportów"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Pojedyncze Pakiety"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Zarządzanie Wydaniem"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Zespół Wydania"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Kontrola Jakości"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Zespół Systemu Instalacji"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Informacje o Wydaniu"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Obrazy płyt"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Produkcja"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Testowanie"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Infrastruktura automatycznego budowania"
-#: ../../english/intro/organization.data:140
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Zespół wanna-build"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Administracja demona Buildd"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Dokumentacja"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Lista pakietów potencjalnych i wymagających dopracowania"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Zespół Systemu Live"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Adaptacje"
@@ -223,79 +223,71 @@ msgstr "Kontakt z prasą"
msgid "Partner Program"
msgstr "Program partnerski"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Wydarzenia"
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Informacje Debiana"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Wsparcie użytkowników"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "System śledzenia błędów"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administracja i archiwa list dyskusyjnych"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Dział Nowych Członków"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Menedżerowie kont Debiana"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Obsługa kluczy (PGP i GPG)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Obsługa kluczy Deweloperów Debiana (DM - Debian Maintainer)"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Zespół ds. bezpieczeństwa"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "Zespół ds. bezpieczeństwa dla edycji testowej"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Projekt audytu bezpieczeństwa"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Strony internetowe"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Strony konsultatnów"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Strona sprzedawców płyt CD"
-#: ../../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 "Polityka"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Administracja systemu"
-#: ../../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."
@@ -304,7 +296,7 @@ msgstr ""
"do projektu Debian, w tym problemy z hasłami lub prośby o zainstalowanie "
"pakietu."
-#: ../../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 "
@@ -314,77 +306,89 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">Maszyny Debiana</a>, powinna ona "
"zawierać informacje o administratorach poszczególnych maszyn."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Administracja Katalogiem Deweloperów LDAP"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Serwery lustrzane"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Obsługa DNS"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "System śledzenia pakietów"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Koordynacja darowizn sprzętu"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Audyt"
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+#: ../../english/intro/organization.data:413
+#, fuzzy
+#| msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr "Wniosek o użycie <a href=\"m4_HOME/trademark\">znaku handlowego</a>"
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
-msgstr "obecny Lider Projektu Debiana"
-
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Administracja systemu Alioth"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Projekt Kobiecy Debiana"
-#: ../../english/intro/organization.data:443
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "przewodniczący DebConfa"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Przeci molestowaniu"
-#: ../../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 dla dzieci od lat 1 do 99"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian dla medycyny i badań"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian dla edukacji"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian w kancelariach prawnych"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian dla niepełnosprawnych"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian dla nauk ścisłych i powiązanych badań"
#~ msgid "Summer of Code 2013 Administrators"
#~ msgstr "Administratorzy Summer of Code 2013"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "obecny Lider Projektu Debiana"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "Projekt audytu bezpieczeństwa"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "Zespół ds. bezpieczeństwa dla edycji testowej"
diff --git a/polish/po/others.pl.po b/polish/po/others.pl.po
index 885ff074244..f92c8c533ed 100644
--- a/polish/po/others.pl.po
+++ b/polish/po/others.pl.po
@@ -166,26 +166,6 @@ msgstr "[Debian] (miniprzycisk)"
msgid "same as the above"
msgstr "jak wyżej"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Pożądane:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Kto:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Architektura:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Specyfikacje:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Gdzie:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Produkty"
@@ -336,3 +316,18 @@ msgstr "Wersja"
#: ../../english/y2k/l10n.data:36
msgid "URL"
msgstr "URL"
+
+#~ msgid "Where:"
+#~ msgstr "Gdzie:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Specyfikacje:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Architektura:"
+
+#~ msgid "Who:"
+#~ msgstr "Kto:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Pożądane:"
diff --git a/polish/po/stats.pl.po b/polish/po/stats.pl.po
index 57ad6297eda..4d5aceba146 100644
--- a/polish/po/stats.pl.po
+++ b/polish/po/stats.pl.po
@@ -20,75 +20,75 @@ msgstr "Jest %d bajtów do przetłumaczenia."
msgid "There are %d strings to translate."
msgstr "Jest %d napisów do przetłumaczenia."
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "To tłumaczenie jest przestarzałe."
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Nieprawidłowa wersja tłumaczenia"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "Oryginał jest nowszy niż to tłumaczenie"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "Oryginał już nie istnieje"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "liczba odwiedzin nie dostępna"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "odwiedzin(y)"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Kliknij by pobrać statystyki zmian"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "Połączony diff"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "Kolorowy diff"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Podsumowanie tłumaczeń dla"
-#: ../../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 "Nie przetłumaczone"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Zdezaktualizowane"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Przetłumaczone"
-#: ../../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 "Aktualne"
-#: ../../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 "plików"
-#: ../../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 "bajtów"
-#: ../../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."
@@ -96,134 +96,134 @@ msgstr ""
"Uwaga: lista stron jest posortowana według popularności. Najedź wskaźnikiem "
"nad nazwę strony aby zobaczyć liczbę odwiedzin."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Zdezaktualizowane tłumaczenia"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "Plik"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Komentarz"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Dziennik"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Tłumaczenie"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Opiekun"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Stan"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Tłumacz"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Data"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Nie przetłumaczone strony ogólne"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Przetłumaczone strony ogólne"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Nieprzetłumaczone wiadomości"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Nieprzetłumaczone wiadomości"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Nieprzetłumaczone strony konsultantów/użytkowników"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Nieprzetłumaczone strony konsultantów/użytkowników"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Nieprzetłumaczone strony poszczególnych języków"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Nieprzetłumaczone strony poszczególnych języków"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Przetłumaczone strony (aktualne)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Przetłumaczone szablony (pliki PO)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Statystyki tłumaczeń PO"
-#: ../../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 "Nieprzetłumaczone"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Łącznie"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Łącznie:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Utworzone przy pomocy"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Przetłumaczone strony"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Statystyki tłumaczeń według ilości stron"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Język"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Tłumaczenia"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Przetłumaczone strony (według rozmiaru)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Statystyki tłumaczeń według wielkości strony"
diff --git a/polish/po/templates.pl.po b/polish/po/templates.pl.po
index bb897aeceef..8678a1ab8ce 100644
--- a/polish/po/templates.pl.po
+++ b/polish/po/templates.pl.po
@@ -61,7 +61,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Powrót do <a href=\"m4_HOME/\">strony głównej Debiana</a>."
#: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:149
+#: ../../english/template/debian/links.tags.wml:152
msgid "Home"
msgstr "Strona Główna"
@@ -102,7 +102,7 @@ msgid "Support"
msgstr "Pomoc"
#: ../../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 "Kącik deweloperów"
@@ -139,7 +139,7 @@ msgid "Miscellaneous"
msgstr "Różne"
#: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:107
msgid "Getting Debian"
msgstr "Jak zdobyć Debiana"
@@ -287,142 +287,150 @@ msgid "Debian Books"
msgstr "Książki o Debianie"
#: ../../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 "Archiwa List Dyskusyjnych"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Listy Dyskusyjne"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Umowa Społeczna"
-#: ../../english/template/debian/links.tags.wml:49
+#: ../../english/template/debian/links.tags.wml:52
msgid "Code of Conduct"
msgstr "Kodeks Postępowania"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:55
msgid "Visit the site sponsor"
msgstr "Odwiedź sponsora Strony"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr "Debian 5.0 - Uniwersalny system operacyjny"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Mapa witryny Debiana"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Baza danych developerów"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr "FAQ Debiana"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Podręcznik polityki Debiana"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Poradnik dla developerów"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Przewodnik dla początkujących opiekunów pakietów"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Błędy krytyczne dystrybucji"
-#: ../../english/template/debian/links.tags.wml:79
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Raporty lintiana"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Archiwa list dla użytkowników"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Archiwa list dla developerów"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Archiwa list związanych z obsługą różnych języków"
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Archiwa list dyskusyjnych dotyczących adaptacji"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:98
msgid "Archives for mailing lists of the Bug tracking system"
msgstr "Archiwa list związanych z systemem śledzenia błędów"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Archiwa pozostałych list dyskusyjnych"
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Wolne oprogramowanie"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Rozwój"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Jak pomóc Debianowi"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Zgłoszenia błędów"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Adaptacje/Architektury"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Podręcznik instalacji"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Sprzedawcy płyt"
-#: ../../english/template/debian/links.tags.wml:125
-msgid "CD ISO images"
+#: ../../english/template/debian/links.tags.wml:128
+#, fuzzy
+#| msgid "CD ISO images"
+msgid "CD/USB ISO images"
msgstr "Obrazy płyt"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Instalacja przez sieć"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Preinstalowany"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Projekt Debian-Edu"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr "Alioth &ndash; Debian GForge"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "Zapewnienie jakości"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "System śledzenia pakietów"
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Przegląd pakietów developerów Debiana"
diff --git a/polish/po/vendors.pl.po b/polish/po/vendors.pl.po
index 68f44927875..09d76629f13 100644
--- a/polish/po/vendors.pl.po
+++ b/polish/po/vendors.pl.po
@@ -12,92 +12,85 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Dystrybutor:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "Adres strony na temat płyt Debiana:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Umożliwia przekazywanie darów Debianowi:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Kraj:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Sprzedaje za granicę:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "email:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Typ płyty:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Typ płyty DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Architektury:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Dystrybutor"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Umożliwia przekazywanie darów"
-#: ../../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 "Architektury"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Sprzedaje za granicę"
-#: ../../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 "Strona domowa sprzedawcy"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "strona"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "email"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "w Europie"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "Na niektórych obszarach"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "źródła"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "i"
+
+#~ msgid "Architectures:"
+#~ msgstr "Architektury:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Typ płyty DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Typ płyty:"
+
+#~ msgid "email:"
+#~ msgstr "email:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Sprzedaje za granicę:"
+
+#~ msgid "Country:"
+#~ msgstr "Kraj:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Umożliwia przekazywanie darów Debianowi:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Adres strony na temat płyt Debiana:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Dystrybutor:"
diff --git a/polish/po/vote.pl.po b/polish/po/vote.pl.po
index 32e63541c35..cbf6c821333 100644
--- a/polish/po/vote.pl.po
+++ b/polish/po/vote.pl.po
@@ -23,229 +23,251 @@ msgid "Time Line"
msgstr "Termin"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Nominacje"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Debata"
-#: ../../english/template/debian/votebar.wml:25
+#: ../../english/template/debian/votebar.wml:28
msgid "Platforms"
msgstr "Platformy"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Proposer"
msgstr "Wnioskodawca"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "Propozycja wnioskodawcy A"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "Propozycja wnioskodawcy B"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "Propozycja wnioskodawcy C"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "Propozycja wnioskodawcy D"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "Propozycja wnioskodawcy E"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "Propozycja wnioskodawcy F"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Seconds"
msgstr "Popierający"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
msgid "Proposal A Seconds"
msgstr "Popierający propozycję A"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "Popierający propozycję B"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "Popierający propozycję C"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "Popierający propozycję D"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "Popierający propozycję E"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "Popierający propozycję F"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
msgid "Opposition"
msgstr "Przeciwni"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
msgid "Text"
msgstr "Tekst"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal A"
msgstr "Propozycja A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "Propozycja B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "Propozycja C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "Propozycja D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "Propozycja E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "Propozycja F"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
msgid "Choices"
msgstr "Wybory"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
msgid "Amendment Proposer"
msgstr "Proponujący poprawkę"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
msgid "Amendment Seconds"
msgstr "Popierający poprawkę"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
msgid "Amendment Text"
msgstr "Tekst poprawki"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
msgid "Amendment Proposer A"
msgstr "Proponujący poprawkę A"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "Popierający poprawkę A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "Tekst poprawki A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "Proponujący poprawkę B"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "Popierający poprawkę B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "Tekst poprawki B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "Proponujący poprawkę A"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "Popierający poprawkę A"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "Tekst poprawki A"
+
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendments"
msgstr "Poprawki"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:139
msgid "Proceedings"
msgstr "Postępowanie"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:142
msgid "Majority Requirement"
msgstr "Konieczna większość"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:145
msgid "Data and Statistics"
msgstr "Dane i statystyki"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:148
msgid "Quorum"
msgstr "Kworum"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:151
msgid "Minimum Discussion"
msgstr "Dyskusja"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:154
msgid "Ballot"
msgstr "Głosowanie"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:157
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:160
msgid "Outcome"
msgstr "Wynik"
-#: ../../english/template/debian/votebar.wml:152
+#: ../../english/template/debian/votebar.wml:164
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Czeka&nbsp;na&nbsp;Sponsora"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Dyskusja&nbsp;trwa"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Głosowanie&nbsp;Otwarte"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Zadecydowano"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Wycofane"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Inne"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Główna&nbsp;Strona&nbsp;Głosowań"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Jak"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Zgłosić&nbsp;Propozycję"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Poprawić&nbsp;Propozycję"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Poprzeć&nbsp;Propozycję"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Przeczytać&nbsp;Rezultat"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Głosować"
diff --git a/portuguese/po/bugs.pt.po b/portuguese/po/bugs.pt.po
index 805acf5ebaf..2f781c8d11a 100644
--- a/portuguese/po/bugs.pt.po
+++ b/portuguese/po/bugs.pt.po
@@ -164,152 +164,152 @@ msgstr "Arquivados"
msgid "Archived and Unarchived"
msgstr "Arquivados e Desarquivados"
-#~ msgid "Exclude tag:"
-#~ msgstr "Excluir tag:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Incluir tag:"
+#~ msgid "Flags:"
+#~ msgstr "Flags:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "bugs ativos"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "exibir bugs mesclados apenas uma vez"
-#~ msgid "wontfix"
-#~ msgstr "não corrigir (wontfix)"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "não ordenar por estado ou severidade"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "não exibir a tabela de conteúdo no cabeçalho"
-#~ msgid "unreproducible"
-#~ msgstr "não reproduzível (unreproducible)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "não exibir estatísticas no rodapé"
-#~ msgid "security"
-#~ msgstr "segurança (security)"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "moreinfo"
-#~ msgstr "mais informações (moreinfo)"
+#~ msgid "Package version:"
+#~ msgstr "Versão do pacote:"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "Distribution:"
+#~ msgstr "Distribuição:"
-#~ msgid "help"
-#~ msgstr "ajuda (help)"
+#~ msgid "bugs"
+#~ msgstr "bugs"
-#~ msgid "fixed-upstream"
-#~ msgstr "corrigido-upstream (fixed-upstream)"
+#~ msgid "open"
+#~ msgstr "aberto (open)"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "corrigido-na-experimental"
+#~ msgid "forwarded"
+#~ msgstr "encaminhado (forwarded)"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "pendente (pending)"
-#~ msgid "confirmed"
-#~ msgstr "confirmado"
+#~ msgid "fixed"
+#~ msgstr "corrigido (fixed)"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "feito (done)"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore"
+#~ msgid "Include status:"
+#~ msgstr "Incluir estado:"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "Exclude status:"
+#~ msgstr "Excluir estado:"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "crítico (critical)"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "grave (grave)"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "sério (serious)"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "importante (important)"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "menor (minor)"
-#~ msgid "Exclude severity:"
-#~ msgstr "Excluir severidade:"
+#~ msgid "wishlist"
+#~ msgstr "sugestão (wishlist)"
#~ msgid "Include severity:"
#~ msgstr "Incluir severidade:"
-#~ msgid "wishlist"
-#~ msgstr "sugestão (wishlist)"
+#~ msgid "Exclude severity:"
+#~ msgstr "Excluir severidade:"
-#~ msgid "minor"
-#~ msgstr "menor (minor)"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "important"
-#~ msgstr "importante (important)"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "serious"
-#~ msgstr "sério (serious)"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "grave"
-#~ msgstr "grave (grave)"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "critical"
-#~ msgstr "crítico (critical)"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "Excluir estado:"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "Include status:"
-#~ msgstr "Incluir estado:"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore"
-#~ msgid "done"
-#~ msgstr "feito (done)"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "corrigido (fixed)"
+#~ msgid "confirmed"
+#~ msgstr "confirmado"
-#~ msgid "pending"
-#~ msgstr "pendente (pending)"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "encaminhado (forwarded)"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "corrigido-na-experimental"
-#~ msgid "open"
-#~ msgstr "aberto (open)"
+#~ msgid "fixed-upstream"
+#~ msgstr "corrigido-upstream (fixed-upstream)"
-#~ msgid "bugs"
-#~ msgstr "bugs"
+#~ msgid "help"
+#~ msgstr "ajuda (help)"
-#~ msgid "Distribution:"
-#~ msgstr "Distribuição:"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "Package version:"
-#~ msgstr "Versão do pacote:"
+#~ msgid "moreinfo"
+#~ msgstr "mais informações (moreinfo)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "security"
+#~ msgstr "segurança (security)"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "não exibir estatísticas no rodapé"
+#~ msgid "unreproducible"
+#~ msgstr "não reproduzível (unreproducible)"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "não exibir a tabela de conteúdo no cabeçalho"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "não ordenar por estado ou severidade"
+#~ msgid "wontfix"
+#~ msgstr "não corrigir (wontfix)"
-#~ msgid "display merged bugs only once"
-#~ msgstr "exibir bugs mesclados apenas uma vez"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "bugs ativos"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Flags:"
+#~ msgid "Include tag:"
+#~ msgstr "Incluir tag:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Excluir tag:"
diff --git a/portuguese/po/cdimage.pt.po b/portuguese/po/cdimage.pt.po
index 93573d1ca16..c49909c3cf5 100644
--- a/portuguese/po/cdimage.pt.po
+++ b/portuguese/po/cdimage.pt.po
@@ -20,16 +20,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../english/CD/CD-keys.data:5 ../../english/CD/CD-keys.data:9
-#: ../../english/CD/CD-keys.data:14
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
msgid " Key fingerprint"
msgstr " Key fingerprint"
-#: ../../english/devel/debian-installer/images.data:92
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "Imagens ISO"
-#: ../../english/devel/debian-installer/images.data:93
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "Imagens Jigdo"
diff --git a/portuguese/po/distrib.pt.po b/portuguese/po/distrib.pt.po
index a85abe9e5d9..674f62df858 100644
--- a/portuguese/po/distrib.pt.po
+++ b/portuguese/po/distrib.pt.po
@@ -10,7 +10,8 @@ msgstr ""
"Project-Id-Version: Debian WebWML\n"
"PO-Revision-Date: 2015-07-04 11:48-0300\n"
"Last-Translator: Marcelo Gomes de Santana <marcelo@msantana.eng.br>\n"
-"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -203,53 +204,53 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "pacotes que contêm arquivos ou diretórios com este nome"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "all files in this package"
+#~ msgstr "todos os arquivos neste pacote"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "Case sensitive"
+#~ msgstr "Diferenciar maiúsculas e minúsculas"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "no"
+#~ msgstr "não"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "yes"
+#~ msgstr "sim"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "KFreeBSD (Intel x86)"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Permitir pesquisa em sub-palavras"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Search case sensitive"
+#~ msgstr "Pesquisa diferenciando maiúsculas e minúsculas"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "non-US"
+#~ msgstr "não-US"
#~ msgid "MIPS (DEC)"
#~ msgstr "MIPS (DEC)"
-#~ msgid "non-US"
-#~ msgstr "não-US"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "Search case sensitive"
-#~ msgstr "Pesquisa diferenciando maiúsculas e minúsculas"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Permitir pesquisa em sub-palavras"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "KFreeBSD (Intel x86)"
-#~ msgid "yes"
-#~ msgstr "sim"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "no"
-#~ msgstr "não"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "Case sensitive"
-#~ msgstr "Diferenciar maiúsculas e minúsculas"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "all files in this package"
-#~ msgstr "todos os arquivos neste pacote"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "pacotes que contêm arquivos ou diretórios com este nome"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
diff --git a/portuguese/po/doc.pt.po b/portuguese/po/doc.pt.po
index a8e36edcc60..77dda051b0f 100644
--- a/portuguese/po/doc.pt.po
+++ b/portuguese/po/doc.pt.po
@@ -18,7 +18,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"
@@ -44,7 +61,7 @@ msgstr ""
" para serviços seguros, instalações automáticas, ou virtualização com\n"
" Xen, KVM ou LXC."
-#: ../../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"
@@ -59,15 +76,15 @@ msgstr ""
" sistema por conta própria (seja em casa, no escritório, no clube ou na\n"
" escola)."
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "Sarge CD com instalador e uma seleção de pacotes"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "Live CD com Knoppix"
-#: ../../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"
@@ -81,13 +98,13 @@ msgstr ""
" sobre a história do projeto e uma cobertura extensiva sobre o sistema\n"
" de gerenciamento de pacotes único do Debian."
-#: ../../english/doc/books.data:77 ../../english/doc/books.data:180
-#: ../../english/doc/books.data:224 ../../english/doc/books.data:269
+#: ../../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 "Debian GNU/Linux 3.1r0a sarge Oficial em DVD (i386)"
-#: ../../english/doc/books.data:80 ../../english/doc/books.data:183
-#: ../../english/doc/books.data:227 ../../english/doc/books.data:272
+#: ../../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"
@@ -114,7 +131,7 @@ msgstr ""
" referência Linux padrão e alavancar a experiência Linux de um usuário\n"
" com a filosofia <q>bottom-up</q> do Debian."
-#: ../../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 -- "
@@ -129,11 +146,11 @@ msgstr ""
" e temas de rede. Assim como o software que o livro descreve, o livro está\n"
" sob copyleft e seu código fonte está disponível."
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
msgid "Debian 2.2 ARM architecture"
msgstr "Debian 2.2 arquitetura ARM"
-#: ../../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, "
@@ -165,7 +182,7 @@ msgstr ""
" trabalhando nessa distribuição e preferivelmente tenha uma máquina host\n"
" baseada no Debian também."
-#: ../../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"
@@ -178,11 +195,11 @@ msgstr ""
" Usuários de Windows ganham uma introdução boa a esse mundo excitante da\n"
" computação guiados por Bill McCarty no <q>Learning Debian GNU/Linux</q>."
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
msgid "Debian 2.1"
msgstr "Debian 2.1"
-#: ../../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"
@@ -194,11 +211,11 @@ msgstr ""
" GUI, desktop publishing, negócios, coisas divertidas e multimídia.\n"
" 30 dias de suporte gratuito por e-mail incluídos."
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "DVD Debian Squeeze i386/amd64"
-#: ../../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"
@@ -218,15 +235,27 @@ msgstr ""
" Debian e o administrador que quer construir uma rede confiável com o \n"
" Debian."
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "2 edições: Uma sem um DVD, e outra com 2 DVDs (i386)"
-#: ../../english/doc/books.data:213
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 e amd64) em DVD"
-#: ../../english/doc/books.data:216
+#: ../../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 "
@@ -240,14 +269,14 @@ msgstr ""
"manual for all users who want to learn more about Debian and its range of "
"services."
-#: ../../english/doc/books.data:244
+#: ../../english/doc/books.data:287
msgid ""
"2 editions: One with no CD, the other with Official CD (i386, contrib and "
"sources)"
msgstr ""
"2 edições: Uma sem CD, a outra com o CD Oficial CD (i386, contrib e fontes)"
-#: ../../english/doc/books.data:247
+#: ../../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"
@@ -279,11 +308,11 @@ msgstr ""
" de sistemas, como planejar e construir um roteador receptor de chamadas\n"
" ou um servidor para clientes baseados em Windows (SAMBA)."
-#: ../../english/doc/books.data:290
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "instalador do Debian GNU/Linux 3.1 Sarge (single-width CD)"
-#: ../../english/doc/books.data:293
+#: ../../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"
@@ -294,13 +323,13 @@ msgstr ""
" instalação, personalização de áreas de trabalho, resolução de problemas,\n"
" práticas produtivas e assim por diante."
-#: ../../english/doc/books.data:306
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
msgstr "Debian GNU/Linux 3.1r0 i386, edição do autor (DVD + CD)"
-#: ../../english/doc/books.data:310
+#: ../../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"
@@ -318,11 +347,11 @@ msgstr ""
" sua área de trabalho. Este livro pode ser útil para todos os tipos de\n"
" usuários Debian, do básico ao avançado."
-#: ../../english/doc/books.data:325
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr "Debian 2.2r0 i386 edição do autor (3 CDs)"
-#: ../../english/doc/books.data:328
+#: ../../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"
@@ -338,11 +367,11 @@ msgstr ""
" Você estará apto a instalar e começar a usar o Debian GNU/Linux com\n"
" ambiente em japonês muito facilmente com os CDs personalizados."
-#: ../../english/doc/books.data:344
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "1 Woody não oficial, 3 Potato rev0"
-#: ../../english/doc/books.data:347
+#: ../../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 "
@@ -359,11 +388,11 @@ msgstr ""
" Esse livro também cobre o guia do mantenedor, que estimula\n"
" pessoas da Coréia a se tornarem desenvolvedores oficiais do Debian."
-#: ../../english/doc/books.data:361
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr "Três CDs oficiais do potato r3 e um CD não-oficial do woody"
-#: ../../english/doc/books.data:364
+#: ../../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"
@@ -380,11 +409,11 @@ msgstr ""
"o\n"
" ambiente de idioma coreano e é bom para iniciantes também."
-#: ../../english/doc/books.data:386
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "Debian GNU/Linux 3.1r0 CD1"
-#: ../../english/doc/books.data:389
+#: ../../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"
@@ -400,7 +429,7 @@ msgstr ""
"pacotes\n"
" do Debian."
-#: ../../english/doc/books.data:405
+#: ../../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 "
@@ -430,7 +459,7 @@ msgstr ""
" que desejam aprender sobre o GNU/Linux com profundidade. Este livro\n"
" utiliza o Debian Sarge."
-#: ../../english/doc/books.data:428
+#: ../../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 "
@@ -572,6 +601,16 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
+#~ msgid "Language:"
+#~ msgstr "Idioma:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Use o <a href=\"cvs\">SVN</a> para baixar o fonte SGML do <get-var "
+#~ "ddp_pkg_loc />."
+
#~ msgid ""
#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
#~ "mode=viewone&amp;titnr=254925022\">\n"
@@ -585,13 +624,3 @@ msgstr "PDF"
#~ " publicação</a> alternativa está disponível pelo Lehmanns "
#~ "Fachbuchhandlung e\n"
#~ " custa 29.95 &euro; (a partir de 2008)."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Use o <a href=\"cvs\">SVN</a> para baixar o fonte SGML do <get-var "
-#~ "ddp_pkg_loc />."
-
-#~ msgid "Language:"
-#~ msgstr "Idioma:"
diff --git a/portuguese/po/l10n.pt.po b/portuguese/po/l10n.pt.po
index 0e0709951b0..2fcab8efe5b 100644
--- a/portuguese/po/l10n.pt.po
+++ b/portuguese/po/l10n.pt.po
@@ -103,8 +103,8 @@ msgstr "Arquivos POT"
msgid "Hints for translators"
msgstr "Dicas para tradutores"
-#~ msgid "Translated templates"
-#~ msgstr "Modelos traduzidos"
-
#~ msgid "Original templates"
#~ msgstr "Modelo original"
+
+#~ msgid "Translated templates"
+#~ msgstr "Modelos traduzidos"
diff --git a/portuguese/po/legal.pt.po b/portuguese/po/legal.pt.po
index 605052558fa..d739e89196b 100644
--- a/portuguese/po/legal.pt.po
+++ b/portuguese/po/legal.pt.po
@@ -11,7 +11,8 @@ msgstr ""
"Project-Id-Version: Debian Webwml\n"
"PO-Revision-Date: 2015-07-03 12:37-0300\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
-"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/portuguese/po/mailinglists.pt.po b/portuguese/po/mailinglists.pt.po
index db6fd2460f6..efc24e1237a 100644
--- a/portuguese/po/mailinglists.pt.po
+++ b/portuguese/po/mailinglists.pt.po
@@ -139,9 +139,9 @@ msgstr "aberta"
msgid "closed"
msgstr "fechada"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Por favor, selecione as listas nas quais deseja inscrever-se:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
#~ "Por favor, selecione as listas das quais você deseja desinscrever-se:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Por favor, selecione as listas nas quais deseja inscrever-se:"
diff --git a/portuguese/po/organization.pt.po b/portuguese/po/organization.pt.po
index 228bfd259d9..f574b01e5d2 100644
--- a/portuguese/po/organization.pt.po
+++ b/portuguese/po/organization.pt.po
@@ -80,17 +80,17 @@ msgid "Officers"
msgstr "Oficiais"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:79
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribuição"
#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:221
+#: ../../english/intro/organization.data:220
msgid "Publicity"
msgstr "Publicidade"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Suporte e Infra-estrutura"
@@ -107,193 +107,193 @@ msgstr "Líder"
msgid "Technical Committee"
msgstr "Comitê Técnico"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Secretário"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Projetos de Desenvolvimento"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Repositórios FTP"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "FTP Masters"
-#: ../../english/intro/organization.data:89
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Assistentes FTP"
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "Assistentes FTP"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Equipe de Backports"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Pacotes Individuais"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Gerência de Lançamento"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Equipe de Lançamento"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Controle de Qualidade"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Equipe do Sistema de Instalação"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Notas de Lançamento"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Imagens de CDs"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Produção"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Testing"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Infra-estrutura de auto-construção"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Equipe wanna-build"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Administração de Buildd"
-#: ../../english/intro/organization.data:167
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Documentação"
-#: ../../english/intro/organization.data:172
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Lista de Pacotes Prospectivos e que necessitam de trabalho"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Equipe do Sistema \"Live\""
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Portes"
-#: ../../english/intro/organization.data:211
+#: ../../english/intro/organization.data:210
msgid "Special Configurations"
msgstr "Configurações Especiais"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:213
msgid "Laptops"
msgstr "Laptops"
-#: ../../english/intro/organization.data:215
+#: ../../english/intro/organization.data:214
msgid "Firewalls"
msgstr "Firewalls"
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:215
msgid "Embedded systems"
msgstr "Sistemas embarcados/embutidos"
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:223
msgid "Press Contact"
msgstr "Contato de Imprensa"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:229
msgid "Partner Program"
msgstr "Programa de Parcerias"
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Eventos"
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Breves do Debian"
-#: ../../english/intro/organization.data:248
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Suporte ao usuário"
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Sistema de Acompanhamento de Bugs"
-#: ../../english/intro/organization.data:320
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
"Administração das Listas de Discussão e dos Arquivos das Listas de Discussão"
-#: ../../english/intro/organization.data:328
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Recepção de Novos Mantenedores"
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Gerentes de Contas Debian"
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Mantenedores do Chaveiro (Keyring) (PGP e GPG)"
-#: ../../english/intro/organization.data:343
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
"Mantenedores do Chaveiro (Keyring) de Mantenedores Debian (Debian Maintainer)"
-#: ../../english/intro/organization.data:347
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Equipe de Segurança"
-#: ../../english/intro/organization.data:362
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Páginas Web"
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Página de Consultores"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Página de Vendedores de CD"
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Planeta Debian"
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Política (Policy)"
-#: ../../english/intro/organization.data:386
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Administração do Sistema"
-#: ../../english/intro/organization.data:387
+#: ../../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."
@@ -303,7 +303,7 @@ msgstr ""
"precisar que um determinado pacote seja instalado numa das máquinas do "
"Projeto."
-#: ../../english/intro/organization.data:397
+#: ../../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 "
@@ -313,169 +313,168 @@ msgstr ""
"de <a href=\"https://db.debian.org/machines.cgi\">Máquinas do Debian</a>, "
"ela contém informações sobre o administrador de cada máquina."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Administrador do Diretório LDAP de Desenvolvedores"
-#: ../../english/intro/organization.data:399
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Espelhos"
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Mantenedor do DNS"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Sistema de Acompanhamento de Pacotes"
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Coordenação de Doações de Hardware"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Auditor"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:413
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Pedidos de uso da <a name=\"trademark\" href=\"m4_HOME/trademark\">marca</a>"
-#: ../../english/intro/organization.data:417
-msgid "current Debian Project Leader"
-msgstr "atual Líder do Projeto Debian"
-
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Administração do Alioth"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Projeto Debian Women"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "Presidentes da DebConf"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Antiassédio"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:436
msgid "Outreach"
msgstr "Programa de extensão"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:446
msgid "Debian for children from 1 to 99"
msgstr "Debian para crianças de 1 a 99"
-#: ../../english/intro/organization.data:452
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian para prática e pesquisa médica"
-#: ../../english/intro/organization.data:455
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian para educação"
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian em escritórios legais"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian para pessoas com deficiências"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian para ciência e pesquisa relacionada"
-#~ msgid "Testing Security Team"
-#~ msgstr "Equipe de Segurança da Testing"
+#~ msgid "Alpha (Not active: was not released with squeeze)"
+#~ msgstr "Alpha (Não ativo: não foi lançado com o squeeze)"
-#~ msgid "Security Audit Project"
-#~ msgstr "Projeto de Auditoria de Segurança"
+#~ msgid "Volatile Team"
+#~ msgstr "Equipe da Volatile"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Distribuição Personalizada Debian"
+#~ msgid "Vendors"
+#~ msgstr "Distribuidores"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Equipe de Lançamento para ``estável'' (stable)"
+#~ msgid "APT Team"
+#~ msgstr "Equipe do APT"
-#~ msgid "Handhelds"
-#~ msgstr "Handhelds"
+#~ msgid "Release Assistants"
+#~ msgstr "Assistentes de Lançamento"
-#~ msgid "Marketing Team"
-#~ msgstr "Equipe de Marketing"
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "Assistentes de Lançamento para ``estável'' (stable)"
-#~ 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 ""
-#~ "Os administradores responsáveis pelas buildds para uma arquitetura em "
-#~ "particular podem ser contatados em <genericemail arch@buildd.debian.org>, "
-#~ "por exemplo, <genericemail i386@buildd.debian.org>."
+#~ msgid "Release Wizard"
+#~ msgstr "Mago de Lançamento"
+
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Distribuição Debian Multimídia"
#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
#~ msgstr ""
-#~ "Nomes dos administradores das buildds também podem ser encontrados em <a "
-#~ "href=\"http://www.buildd.net\">http://www.buildd.net</a>. Escolha uma "
-#~ "arquitetura e a distribuição para ver as buildds disponíveis e seus "
-#~ "administradores."
+#~ "Este ainda não é um projeto interno oficial do Debian mas anunciou a "
+#~ "intenção de ser integrado."
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Coordenação de Assinatura de Chaves"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux para Computação Empresarial"
-#~ msgid "Accountant"
-#~ msgstr "Contador"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Sistema de Instalação para ``estável''"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "O Sistema Operacional Universal como seu Desktop"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Arquivos das Listas de Discussão"
#~ msgid "Debian for non-profit organisations"
#~ msgstr "Debian para organizações sem fins lucrativos"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Arquivos das Listas de Discussão"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "O Sistema Operacional Universal como seu Desktop"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Sistema de Instalação para ``estável''"
+#~ msgid "Accountant"
+#~ msgstr "Contador"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux para Computação Empresarial"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Coordenação de Assinatura de Chaves"
#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
#~ msgstr ""
-#~ "Este ainda não é um projeto interno oficial do Debian mas anunciou a "
-#~ "intenção de ser integrado."
+#~ "Nomes dos administradores das buildds também podem ser encontrados em <a "
+#~ "href=\"http://www.buildd.net\">http://www.buildd.net</a>. Escolha uma "
+#~ "arquitetura e a distribuição para ver as buildds disponíveis e seus "
+#~ "administradores."
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Distribuição Debian Multimídia"
+#~ 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 ""
+#~ "Os administradores responsáveis pelas buildds para uma arquitetura em "
+#~ "particular podem ser contatados em <genericemail arch@buildd.debian.org>, "
+#~ "por exemplo, <genericemail i386@buildd.debian.org>."
-#~ msgid "Release Wizard"
-#~ msgstr "Mago de Lançamento"
+#~ msgid "Marketing Team"
+#~ msgstr "Equipe de Marketing"
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "Assistentes de Lançamento para ``estável'' (stable)"
+#~ msgid "Handhelds"
+#~ msgstr "Handhelds"
-#~ msgid "Release Assistants"
-#~ msgstr "Assistentes de Lançamento"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Equipe de Lançamento para ``estável'' (stable)"
-#~ msgid "APT Team"
-#~ msgstr "Equipe do APT"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Distribuição Personalizada Debian"
-#~ msgid "Vendors"
-#~ msgstr "Distribuidores"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projeto de Auditoria de Segurança"
-#~ msgid "Volatile Team"
-#~ msgstr "Equipe da Volatile"
+#~ msgid "Testing Security Team"
+#~ msgstr "Equipe de Segurança da Testing"
-#~ msgid "Alpha (Not active: was not released with squeeze)"
-#~ msgstr "Alpha (Não ativo: não foi lançado com o squeeze)"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "atual Líder do Projeto Debian"
diff --git a/portuguese/po/others.pt.po b/portuguese/po/others.pt.po
index 02d0cfa1290..f327f8c0137 100644
--- a/portuguese/po/others.pt.po
+++ b/portuguese/po/others.pt.po
@@ -11,7 +11,8 @@ msgstr ""
"Project-Id-Version: Debian Webwml\n"
"PO-Revision-Date: 2015-07-04 11:56-0300\n"
"Last-Translator: Marcelo Gomes de Santana <marcelo@msantana.eng.br>\n"
-"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -319,69 +320,89 @@ msgstr "Versão"
msgid "URL"
msgstr "URL"
-#~ msgid "Name:"
-#~ msgstr "Nome:"
+#~ msgid "Wanted:"
+#~ msgstr "Desejado:"
-#~ msgid "Company:"
-#~ msgstr "Companhia"
+#~ msgid "Who:"
+#~ msgstr "Quem:"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Architecture:"
+#~ msgstr "Arquitetura:"
-#~ msgid "or"
-#~ msgstr "ou"
+#~ msgid "Specifications:"
+#~ msgstr "Especificação:"
-#~ msgid "Email:"
-#~ msgstr "E-mail:"
+#~ msgid "Where:"
+#~ msgstr "Onde:"
-#~ msgid "Rates:"
-#~ msgstr "Preço:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Aguardando por Realocação"
+#~ msgid "Previous Talks:"
+#~ msgstr "Palestras Anteriores:"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "<total_consultant> consultores Debian listados em <total_country> países. "
+#~ msgid "Languages:"
+#~ msgstr "Idiomas:"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Inscrição em Listas de Discussão"
+#~ msgid "Location:"
+#~ msgstr "Localização:"
+
+#~ msgid "Topics:"
+#~ msgstr "Tópicos:"
+
+#~ msgid "rc1"
+#~ msgstr "rc1"
+
+#~ msgid "beta 4"
+#~ msgstr "beta 4"
+
+#~ msgid "closed"
+#~ msgstr "fechada"
+
+#~ msgid "open"
+#~ msgstr "aberta"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Desinscrever"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr ""
+#~ "Por favor, selecione as listas das quais você deseja desinscrever-se:"
#~ 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 ""
#~ "Consulte a página das <a href=\"./#subunsub\">listas de discussão</a> "
-#~ "para obter informações sobre como inscrever-se usando o e-mail. Um <a "
-#~ "href=\"unsubscribe\">formulário de desinscrição via web</a> também está "
+#~ "para obter informações sobre como desinscrever-se usando o e-mail. Um <a "
+#~ "href=\"subscribe\">formulário para inscrição via web</a> também está "
#~ "disponível. "
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Desinscrição das listas de discussão"
+
#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Note que a maioria das listas de discussão Debian são fóruns públicos. "
-#~ "Quaisquer mensagens enviadas para elas serão publicadas nos arquivos "
-#~ "públicos das listas de discussão e indexados por mecanismos de busca. "
-#~ "Você só deveria se inscrever numa lista de discussão Debian usando um "
-#~ "endereço de e-mail que você não se importa em tornar público."
+#~ "Por favor, respeite a <a href=\"./#ads\">política de propaganda das "
+#~ "listas de discussão Debian</a>."
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Por favor, selecione as listas nas quais deseja inscrever-se:"
+#~ msgid "Clear"
+#~ msgstr "Limpar"
-#~ msgid "No description given"
-#~ msgstr "Nenhuma descrição dada"
+#~ msgid "Subscribe"
+#~ msgstr "Inscrição"
-#~ msgid "Moderated:"
-#~ msgstr "Moderada:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Seu endereço de e-mail:"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Postagem de mensagens permitida apenas para pessoas inscritas."
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "somente leitura, versão resumida (digest)"
+
+#~ msgid "Subscription:"
+#~ msgstr "Inscrição:"
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -389,86 +410,66 @@ msgstr "URL"
#~ "Somente mensagens assinadas por um desenvolvedor Debian serão aceitas "
#~ "nesta lista."
-#~ msgid "Subscription:"
-#~ msgstr "Inscrição:"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "somente leitura, versão resumida (digest)"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Postagem de mensagens permitida apenas para pessoas inscritas."
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Seu endereço de e-mail:"
+#~ msgid "Moderated:"
+#~ msgstr "Moderada:"
-#~ msgid "Subscribe"
-#~ msgstr "Inscrição"
+#~ msgid "No description given"
+#~ msgstr "Nenhuma descrição dada"
-#~ msgid "Clear"
-#~ msgstr "Limpar"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Por favor, selecione as listas nas quais deseja inscrever-se:"
#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
#~ msgstr ""
-#~ "Por favor, respeite a <a href=\"./#ads\">política de propaganda das "
-#~ "listas de discussão Debian</a>."
-
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Desinscrição das listas de discussão"
+#~ "Note que a maioria das listas de discussão Debian são fóruns públicos. "
+#~ "Quaisquer mensagens enviadas para elas serão publicadas nos arquivos "
+#~ "públicos das listas de discussão e indexados por mecanismos de busca. "
+#~ "Você só deveria se inscrever numa lista de discussão Debian usando um "
+#~ "endereço de e-mail que você não se importa em tornar público."
#~ 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. "
+#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
+#~ "web form</a> is also available, for unsubscribing from mailing lists. "
#~ msgstr ""
#~ "Consulte a página das <a href=\"./#subunsub\">listas de discussão</a> "
-#~ "para obter informações sobre como desinscrever-se usando o e-mail. Um <a "
-#~ "href=\"subscribe\">formulário para inscrição via web</a> também está "
+#~ "para obter informações sobre como inscrever-se usando o e-mail. Um <a "
+#~ "href=\"unsubscribe\">formulário de desinscrição via web</a> também está "
#~ "disponível. "
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr ""
-#~ "Por favor, selecione as listas das quais você deseja desinscrever-se:"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Desinscrever"
-
-#~ msgid "open"
-#~ msgstr "aberta"
-
-#~ msgid "closed"
-#~ msgstr "fechada"
-
-#~ msgid "beta 4"
-#~ msgstr "beta 4"
-
-#~ msgid "rc1"
-#~ msgstr "rc1"
-
-#~ msgid "Topics:"
-#~ msgstr "Tópicos:"
-
-#~ msgid "Location:"
-#~ msgstr "Localização:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Inscrição em Listas de Discussão"
-#~ msgid "Languages:"
-#~ msgstr "Idiomas:"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> consultores Debian listados em <total_country> países. "
-#~ msgid "Previous Talks:"
-#~ msgstr "Palestras Anteriores:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Aguardando por Realocação"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Rates:"
+#~ msgstr "Preço:"
-#~ msgid "Where:"
-#~ msgstr "Onde:"
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
-#~ msgid "Specifications:"
-#~ msgstr "Especificação:"
+#~ msgid "or"
+#~ msgstr "ou"
-#~ msgid "Architecture:"
-#~ msgstr "Arquitetura:"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "Who:"
-#~ msgstr "Quem:"
+#~ msgid "Company:"
+#~ msgstr "Companhia"
-#~ msgid "Wanted:"
-#~ msgstr "Desejado:"
+#~ msgid "Name:"
+#~ msgstr "Nome:"
diff --git a/portuguese/po/ports.pt.po b/portuguese/po/ports.pt.po
index 726f9f9ce03..45c1bda932b 100644
--- a/portuguese/po/ports.pt.po
+++ b/portuguese/po/ports.pt.po
@@ -122,138 +122,138 @@ msgstr "Debian para PowerPC"
msgid "Debian for Sparc"
msgstr "Debian para Sparc"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian para Laptops"
-
-#~ msgid "Vendor/Name"
-#~ msgstr "Vendedor/Nome"
-
-#~ msgid "Date announced"
-#~ msgstr "Data anunciada"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian para AMD64"
-#~ msgid "Clock"
-#~ msgstr "Relógio"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian para ARM"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian para Beowulf"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "Main"
+#~ msgstr "Main (principal)"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian para Motorola 680x0"
-#~ msgid "Specials"
-#~ msgstr "Especiais"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian para MIPS"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "Sem FPU (R2010), cache externo"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian para S/390"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "Sem FPU (R3010)"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian para Sparc64"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Cache L1 indexado virtual, controlador de cache L2"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD baseado na libc5"
-#~ msgid "External L1 cache"
-#~ msgstr "Cache L1 externo"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, controlador LCD, Compact Flash, UART, Paralela, RTC, Teclado, "
+#~ "USB, Touchpad, Audio"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "CPU com múltiplos chips"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Compact Flash, UART, Paralela, RTC, Audio, PCIC"
#~ msgid ""
-#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
-#~ "I2C, Watchdog"
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
#~ msgstr ""
-#~ "Extensão isa Mips16, Sem FPU, 512k flash, 12k ram, DMAC, UART, "
-#~ "Temporizador, I2C, Watchdog"
+#~ "Mips 16, RTC, Teclado, Painel sensível ao toque, Audio, Compact-Flash, "
+#~ "UART, Paralela"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr ""
-#~ "Sem FPU, DRAMC, ROMC, DMAC, UART, Temporizador, I2C, Controlador LCD"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "Sem FPU, DRAMC, ROMC, DMAC, UART, Temporizador"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "256 cache L2 on die"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "Sem FPU, DRAMC, ROMC, DMAC, PCIC, UART, Temporizador"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, barramento externo de 64 bits, cache L2"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "Sem FPU, SDRAMC, ROMC, Temporizador, PCMCIA, Controlador LCD, IrDA"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, barramento externo de 64 bits"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr ""
-#~ "Sem FPU, SDRAMC, ROMC, UART, Temporizador, PCMCIA, Controlador LCD, IrDA"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, barramento externo de 32 bits"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "Sem FPU, SDRAMC, ROMC, UART, Temporizador, PCMCIA, IrDA"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 E/S Digital"
#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
#~ msgstr "Sem FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Temporizador"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 E/S Digital"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "Sem FPU, SDRAMC, ROMC, UART, Temporizador, PCMCIA, IrDA"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, barramento externo de 32 bits"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr ""
+#~ "Sem FPU, SDRAMC, ROMC, UART, Temporizador, PCMCIA, Controlador LCD, IrDA"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, barramento externo de 64 bits"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "Sem FPU, SDRAMC, ROMC, Temporizador, PCMCIA, Controlador LCD, IrDA"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, barramento externo de 64 bits, cache L2"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "Sem FPU, DRAMC, ROMC, DMAC, PCIC, UART, Temporizador"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "256 cache L2 on die"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "Sem FPU, DRAMC, ROMC, DMAC, UART, Temporizador"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr ""
+#~ "Sem FPU, DRAMC, ROMC, DMAC, UART, Temporizador, I2C, Controlador LCD"
#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
+#~ "I2C, Watchdog"
#~ msgstr ""
-#~ "Mips 16, RTC, Teclado, Painel sensível ao toque, Audio, Compact-Flash, "
-#~ "UART, Paralela"
+#~ "Extensão isa Mips16, Sem FPU, 512k flash, 12k ram, DMAC, UART, "
+#~ "Temporizador, I2C, Watchdog"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Compact Flash, UART, Paralela, RTC, Audio, PCIC"
+#~ msgid "Multiple chip CPU"
+#~ msgstr "CPU com múltiplos chips"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, controlador LCD, Compact Flash, UART, Paralela, RTC, Teclado, "
-#~ "USB, Touchpad, Audio"
+#~ msgid "External L1 cache"
+#~ msgstr "Cache L1 externo"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD baseado na libc5"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Cache L1 indexado virtual, controlador de cache L2"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian para Sparc64"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "Sem FPU (R3010)"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian para S/390"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "Sem FPU (R2010), cache externo"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian para MIPS"
+#~ msgid "Specials"
+#~ msgstr "Especiais"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian para Motorola 680x0"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "Main"
-#~ msgstr "Main (principal)"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian para Beowulf"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian para ARM"
+#~ msgid "Clock"
+#~ msgstr "Relógio"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian para AMD64"
+#~ msgid "Date announced"
+#~ msgstr "Data anunciada"
+
+#~ msgid "Vendor/Name"
+#~ msgstr "Vendedor/Nome"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian para Laptops"
diff --git a/portuguese/po/security.pt.po b/portuguese/po/security.pt.po
index 0f0f2b42a27..620df5ccdc4 100644
--- a/portuguese/po/security.pt.po
+++ b/portuguese/po/security.pt.po
@@ -10,7 +10,8 @@ msgstr ""
"Project-Id-Version: Debian Webwml\n"
"PO-Revision-Date: 2015-07-03 12:39-0300\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
-"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/portuguese/po/stats.pt.po b/portuguese/po/stats.pt.po
index 44e75c81aba..5f8f858c61b 100644
--- a/portuguese/po/stats.pt.po
+++ b/portuguese/po/stats.pt.po
@@ -31,75 +31,75 @@ msgstr "Existem %d bytes para traduzir."
msgid "There are %d strings to translate."
msgstr "Existem %d strings para traduzir."
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Esta tradução está muito desatualizada"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Versão errada de tradução"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "O original é mais novo do que esta tradução"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "O original não existe mais"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "contagem de acesso N/A"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "acessos"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Clique para obter dados de diffstat"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "diff unificado"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "diff colorido"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Resumo de tradução para"
-#: ../../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 "Não traduzidos"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Desatualizados"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Traduzidos"
-#: ../../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 "Atualizados"
-#: ../../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 "arquivos"
-#: ../../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 "bytes"
-#: ../../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."
@@ -107,134 +107,134 @@ msgstr ""
"Nota: as listas das páginas são classificadas por popularidade. Passe o "
"mouse sobre o nome da página para ver o número de acessos."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Traduções desatualizadas"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "Arquivo"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Comentário"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Log"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Tradução"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Mantenedor"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Tradutor"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Data"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Páginas gerais não traduzidas"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Páginas gerais não traduzidas"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Itens de notícias não traduzidos"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Itens de notícias não traduzidos"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Páginas de consultor/usuário não traduzidas"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Páginas de consultor/usuário não traduzidas"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Páginas internacionais não traduzidas"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Páginas internacionais não traduzidas"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Páginas traduzidas (atualidadas)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Templates traduzidos (arquivos PO)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Estatísticas de tradução de PO"
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr "Aproximados"
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr "Não traduzidos"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Total:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Criado com"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Páginas web traduzidas"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Estatísticas de Tradução por Número de Página"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Idioma"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Traduções"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Páginas web traduzidas (por tamanho)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Estatísticas de Tradução por Tamanho de Página"
diff --git a/portuguese/po/templates.pt.po b/portuguese/po/templates.pt.po
index 289c1443677..8f7406b7ac1 100644
--- a/portuguese/po/templates.pt.po
+++ b/portuguese/po/templates.pt.po
@@ -12,7 +12,8 @@ msgstr ""
"Project-Id-Version: Debian Webwml\n"
"PO-Revision-Date: 2015-07-04 11:59-0300\n"
"Last-Translator: Marcelo Gomes de Santana <marcelo@msantana.eng.br>\n"
-"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -517,569 +518,569 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Voltar para <a href=\"../\">Quem está usando o Debian?</a>."
-#~ msgid "More information:"
-#~ msgstr "Mais informações:"
+#, fuzzy
+#~| msgid "Weekly News"
+#~ msgid "Weekly&nbsp;News"
+#~ msgstr "Notícias Semanais"
-#~ msgid "Taken by:"
-#~ msgstr "Tirado por:"
+#, fuzzy
+#~| msgid "Project News"
+#~ msgid "Project&nbsp;News"
+#~ msgstr "Notícias do Projeto"
-#~ msgid "Nobody"
-#~ msgstr "Ninguém"
+#~ msgid "Select a server near you"
+#~ msgstr "Escolha um servidor próximo de você"
-#~ msgid "Rating:"
-#~ msgstr "Classificação:"
+#~ msgid "More information"
+#~ msgstr "Informações adicionais"
-#~ msgid "List of Consultants"
-#~ msgstr "Lista de Consultores"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Próximas Atrações"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Voltar para a <a href=\"./\">página de consultores do Debian</a>."
+#~ msgid "link may no longer be valid"
+#~ msgstr "o link pode não ser mais válido"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "When"
+#~ msgstr "Quando"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Baixar com Jigdo"
+#~ msgid "Where"
+#~ msgstr "Onde"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Baixar via HTTP/FTP"
+#~ msgid "More Info"
+#~ msgstr "Mais Informações"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Comprar CDs ou DVDs"
+#~ msgid "Debian Involvement"
+#~ msgstr "Envolvimento do Debian"
-#~ msgid "Network Install"
-#~ msgstr "Instalação via Rede"
+#~ msgid "Main Coordinator"
+#~ msgstr "Coordenador Principal"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Baixar"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Coordenador do</th><th>Projeto</th>"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Misc"
+#~ msgid "Related Links"
+#~ msgstr "Links Relacionados"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Arte gráfica"
+#~ msgid "Latest News"
+#~ msgstr "Últimas Notícias"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Espelhando"
+#~ msgid "Download calendar entry"
+#~ msgstr "Baixar entrada no calendário"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Espelhos Rsync"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Voltar para: outras <a href=\"./\">notícias Debian</a> || <a href="
+#~ "\"m4_HOME/\">página inicial do Projeto Debian</a>."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Baixar com Torrent"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (link quebrado)"
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Informações sobre o Lançamento da Imagem"
+#~ 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 ""
+#~ "Para receber este boletim quinzenalmente em sua caixa postal, <a href="
+#~ "\"https://lists.debian.org/debian-news-portuguese/\">inscreva-se na lista "
+#~ "debian-news-portuguese</a> (versão em Português Brasileiro). Para receber "
+#~ "o boletim em inglês, <a href=\"https://lists.debian.org/debian-news/"
+#~ "\">inscreva-se na lista debian-news</a>."
-#~ msgid "Debian CD team"
-#~ msgstr "Equipe Debian CD"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "<a href=\"../../\">Edições anteriores</a> deste boletim estão disponíveis."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_em_cd"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />As Notícias do Projeto Debian são editadas por <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />As Notícias do Projeto Debian são editadas por <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Esta edição das Notícias do Projeto Debian foi "
+#~ "editada por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Esta edição das Notícias do Projeto Debian foi "
+#~ "editada por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "buy"
-#~ msgstr "compre"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Ela foi traduzida por %s."
-#~ msgid "net_install"
-#~ msgstr "net_install"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Ela foi traduzida por %s."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />misc"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Ela foi traduzida por %s."
+
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Ela foi traduzida por %s."
+
+#~ msgid "List of Speakers"
+#~ msgstr "Lista de Palestrantes"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Voltar para a <a href=\"./\">página de palestrantes do Debian</a>."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "<a href=\"/MailingLists/disclaimer\">Lista de discussão pública</a> em "
-#~ "inglês para CDs/DVDs:"
+#~ "Para receber este boletim semanalmente em sua caixa postal, <a href="
+#~ "\"https://lists.debian.org/debian-news-portuguese/\">inscreva-se na lista "
+#~ "debian-news-portuguese</a> (versão em Português Brasileiro). Para receber "
+#~ "o boletim em inglês, <a href=\"https://lists.debian.org/debian-news/"
+#~ "\">inscreva-se na lista debian-news</a>."
-#~ msgid "Date"
-#~ msgstr "Data"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />As Notícias Semanais Debian são editadas por <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Time Line"
-#~ msgstr "Linha do Tempo"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />As Notícias Semanais Debian são editadas por <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Nominations"
-#~ msgstr "Candidaturas"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Esta edição das Notícias Semanais Debian foi "
+#~ "editada por <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Debate"
-#~ msgstr "Debate"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Esta edição das Notícias Semanais Debian foi "
+#~ "editada por <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Platforms"
-#~ msgstr "Plataformas"
+#~ msgid "No requests for adoption"
+#~ msgstr "Nenhuma requisição para adoção"
-#~ msgid "Proposer"
-#~ msgstr "Proponente"
+#~ msgid "No orphaned packages"
+#~ msgstr "Nenhum pacote órfão"
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Proponente da Proposta A"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Nenhum pacote esperando para ser adotado"
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Proponente da Proposta B"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Nenhum pacote esperando para ser empacotado"
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Proponente da Proposta C"
+#~ msgid "No Requested packages"
+#~ msgstr "Nenhum pacote requisitado"
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Proponente da Proposta D"
+#~ msgid "No help requested"
+#~ msgstr "Nenhuma ajuda requisitada"
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Proponente da Proposta E"
+#~ msgid "in adoption since today."
+#~ msgstr "em adoção desde hoje."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Proponente da Proposta F"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "em adoção desde ontem."
-#~ msgid "Seconds"
-#~ msgstr "Padrinhos"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s dias em adoção."
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Padrinhos da Proposta A"
+#~ msgid "in preparation since today."
+#~ msgstr "em preparação desde hoje."
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Padrinhos da Proposta B"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "em preparação desde ontem."
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Padrinhos da Proposta C"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s dias em preparação."
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Padrinhos da Proposta D"
+#~ msgid "requested today."
+#~ msgstr "requisitado hoje."
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Padrinhos da Proposta E"
+#~ msgid "requested yesterday."
+#~ msgstr "requisitado ontem."
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Padrinhos da Proposta F"
+#~ msgid "requested %s days ago."
+#~ msgstr "requisitado a %s dias."
-#~ msgid "Opposition"
-#~ msgstr "Oposição"
+#~ msgid "package info"
+#~ msgstr "informações do pacote"
-#~ msgid "Text"
-#~ msgstr "Texto"
+#~ msgid "License Information"
+#~ msgstr "Informações de Licença"
-#~ msgid "Proposal A"
-#~ msgstr "Proposta A"
+#~ msgid "DLS Index"
+#~ msgstr "Índice DLS"
-#~ msgid "Proposal B"
-#~ msgstr "Proposta B"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Proposal C"
-#~ msgstr "Proposta C"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG FAQ"
-#~ msgid "Proposal D"
-#~ msgstr "Proposta D"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Arquivo Debian-Legal"
-#~ msgid "Proposal E"
-#~ msgstr "Proposta E"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Proposal F"
-#~ msgstr "Proposta F"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Versão %s: %s"
-#~ msgid "Choices"
-#~ msgstr "Opções"
+#~ msgid "Date published"
+#~ msgstr "Data de publicação"
-#~ msgid "Amendment Proposer"
-#~ msgstr "Proponente da Emenda"
+#~ msgid "License"
+#~ msgstr "Licença"
-#~ msgid "Amendment Seconds"
-#~ msgstr "Padrinhos da Emenda"
+#~ msgid "Version"
+#~ msgstr "Versão"
-#~ msgid "Amendment Text"
-#~ msgstr "Texto da Emenda"
+#~ msgid "Summary"
+#~ msgstr "Sumário"
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Proponente da Emenda A"
+#~ msgid "Justification"
+#~ msgstr "Justificativa"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Padrinhos da Emenda A"
+#~ msgid "Discussion"
+#~ msgstr "Discussão"
-#~ msgid "Amendment Text A"
-#~ msgstr "Texto da Emenda A"
+#~ msgid "Original Summary"
+#~ msgstr "Sumário Original"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Proponente da Emenda B"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "O sumário original por <summary-author/> pode ser encontrado nos <a href="
+#~ "\"<summary-url/>\">arquivos da lista</a>."
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Padrinhos da Emenda B"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Este sumário foi preparado por <summary-author/>."
-#~ msgid "Amendment Text B"
-#~ msgstr "Texto da Emenda B"
+#~ msgid "License text (translated)"
+#~ msgstr "Texto da Licença (traduzido)"
-#~ msgid "Amendments"
-#~ msgstr "Emendas"
+#~ msgid "License text"
+#~ msgstr "Texto da Licença"
-#~ msgid "Proceedings"
-#~ msgstr "Encaminhamentos"
+#~ msgid "free"
+#~ msgstr "livre"
-#~ msgid "Majority Requirement"
-#~ msgstr "Maioria Requerida"
+#~ msgid "non-free"
+#~ msgstr "não-livre"
-#~ msgid "Data and Statistics"
-#~ msgstr "Dados e Estatísticas"
+#~ msgid "not redistributable"
+#~ msgstr "não-redistribuível"
-#~ msgid "Quorum"
-#~ msgstr "Quorum"
+#~ msgid "Free"
+#~ msgstr "Livre"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Discussão Mínima"
+#~ msgid "Non-Free"
+#~ msgstr "Não-Livre "
-#~ msgid "Ballot"
-#~ msgstr "Cédula"
+#~ msgid "Not Redistributable"
+#~ msgstr "Não Redistribuível"
-#~ msgid "Forum"
-#~ msgstr "Fórum"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Veja a página de <a href=\"./\">informação sobre licenças</a> para uma "
+#~ "visão geral dos Sumários de Licença Debian (DLS)."
-#~ msgid "Outcome"
-#~ msgstr "Resultado"
+#~ msgid "buy pre-made images"
+#~ msgstr "compre imagens pré-feitas"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Aguardando&nbsp;Patrocinadores"
+#~ msgid "network install"
+#~ msgstr "instalação via rede"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Em&nbsp;Discussão"
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Voltar para outras <a href=\"./\">notícias Debian</a>."
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Votação&nbsp;Aberta"
+#~ msgid "discussed"
+#~ msgstr "discutido"
-#~ msgid "Decided"
-#~ msgstr "Decidido"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Kit de Pseudo Imagens"
-#~ msgid "Withdrawn"
-#~ msgstr "Retirado"
+#~ msgid "Vote"
+#~ msgstr "Votar"
-#~ msgid "Other"
-#~ msgstr "Outro"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Ler&nbsp;um&nbsp;Resultado"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Página&nbsp;principal&nbsp;de&nbsp;Votação"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Apoiar&nbsp;uma&nbsp;Proposta"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Como Fazer"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Corrigir&nbsp;uma&nbsp;Proposta"
#~ msgid "Submit&nbsp;a&nbsp;Proposal"
#~ msgstr "Enviar&nbsp;Proposta"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Corrigir&nbsp;uma&nbsp;Proposta"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Como Fazer"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Apoiar&nbsp;uma&nbsp;Proposta"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Página&nbsp;principal&nbsp;de&nbsp;Votação"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Ler&nbsp;um&nbsp;Resultado"
+#~ msgid "Other"
+#~ msgstr "Outro"
-#~ msgid "Vote"
-#~ msgstr "Votar"
+#~ msgid "Withdrawn"
+#~ msgstr "Retirado"
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Kit de Pseudo Imagens"
+#~ msgid "Decided"
+#~ msgstr "Decidido"
-#~ msgid "discussed"
-#~ msgstr "discutido"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Votação&nbsp;Aberta"
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Voltar para outras <a href=\"./\">notícias Debian</a>."
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Em&nbsp;Discussão"
-#~ msgid "network install"
-#~ msgstr "instalação via rede"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Aguardando&nbsp;Patrocinadores"
-#~ msgid "buy pre-made images"
-#~ msgstr "compre imagens pré-feitas"
+#~ msgid "Outcome"
+#~ msgstr "Resultado"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Veja a página de <a href=\"./\">informação sobre licenças</a> para uma "
-#~ "visão geral dos Sumários de Licença Debian (DLS)."
+#~ msgid "Forum"
+#~ msgstr "Fórum"
-#~ msgid "Not Redistributable"
-#~ msgstr "Não Redistribuível"
+#~ msgid "Ballot"
+#~ msgstr "Cédula"
-#~ msgid "Non-Free"
-#~ msgstr "Não-Livre "
+#~ msgid "Minimum Discussion"
+#~ msgstr "Discussão Mínima"
-#~ msgid "Free"
-#~ msgstr "Livre"
+#~ msgid "Quorum"
+#~ msgstr "Quorum"
-#~ msgid "not redistributable"
-#~ msgstr "não-redistribuível"
+#~ msgid "Data and Statistics"
+#~ msgstr "Dados e Estatísticas"
-#~ msgid "non-free"
-#~ msgstr "não-livre"
+#~ msgid "Majority Requirement"
+#~ msgstr "Maioria Requerida"
-#~ msgid "free"
-#~ msgstr "livre"
+#~ msgid "Proceedings"
+#~ msgstr "Encaminhamentos"
-#~ msgid "License text"
-#~ msgstr "Texto da Licença"
+#~ msgid "Amendments"
+#~ msgstr "Emendas"
-#~ msgid "License text (translated)"
-#~ msgstr "Texto da Licença (traduzido)"
+#~ msgid "Amendment Text B"
+#~ msgstr "Texto da Emenda B"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Este sumário foi preparado por <summary-author/>."
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Padrinhos da Emenda B"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "O sumário original por <summary-author/> pode ser encontrado nos <a href="
-#~ "\"<summary-url/>\">arquivos da lista</a>."
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Proponente da Emenda B"
-#~ msgid "Original Summary"
-#~ msgstr "Sumário Original"
+#~ msgid "Amendment Text A"
+#~ msgstr "Texto da Emenda A"
-#~ msgid "Discussion"
-#~ msgstr "Discussão"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Padrinhos da Emenda A"
-#~ msgid "Justification"
-#~ msgstr "Justificativa"
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Proponente da Emenda A"
-#~ msgid "Summary"
-#~ msgstr "Sumário"
+#~ msgid "Amendment Text"
+#~ msgstr "Texto da Emenda"
-#~ msgid "Version"
-#~ msgstr "Versão"
+#~ msgid "Amendment Seconds"
+#~ msgstr "Padrinhos da Emenda"
-#~ msgid "License"
-#~ msgstr "Licença"
+#~ msgid "Amendment Proposer"
+#~ msgstr "Proponente da Emenda"
-#~ msgid "Date published"
-#~ msgstr "Data de publicação"
+#~ msgid "Choices"
+#~ msgstr "Opções"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Versão %s: %s"
+#~ msgid "Proposal F"
+#~ msgstr "Proposta F"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Proposal E"
+#~ msgstr "Proposta E"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Arquivo Debian-Legal"
+#~ msgid "Proposal D"
+#~ msgstr "Proposta D"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG FAQ"
+#~ msgid "Proposal C"
+#~ msgstr "Proposta C"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Proposal B"
+#~ msgstr "Proposta B"
-#~ msgid "DLS Index"
-#~ msgstr "Índice DLS"
+#~ msgid "Proposal A"
+#~ msgstr "Proposta A"
-#~ msgid "License Information"
-#~ msgstr "Informações de Licença"
+#~ msgid "Text"
+#~ msgstr "Texto"
-#~ msgid "package info"
-#~ msgstr "informações do pacote"
+#~ msgid "Opposition"
+#~ msgstr "Oposição"
-#~ msgid "requested %s days ago."
-#~ msgstr "requisitado a %s dias."
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Padrinhos da Proposta F"
-#~ msgid "requested yesterday."
-#~ msgstr "requisitado ontem."
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Padrinhos da Proposta E"
-#~ msgid "requested today."
-#~ msgstr "requisitado hoje."
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Padrinhos da Proposta D"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s dias em preparação."
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Padrinhos da Proposta C"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "em preparação desde ontem."
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Padrinhos da Proposta B"
-#~ msgid "in preparation since today."
-#~ msgstr "em preparação desde hoje."
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Padrinhos da Proposta A"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s dias em adoção."
+#~ msgid "Seconds"
+#~ msgstr "Padrinhos"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "em adoção desde ontem."
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Proponente da Proposta F"
-#~ msgid "in adoption since today."
-#~ msgstr "em adoção desde hoje."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Proponente da Proposta E"
-#~ msgid "No help requested"
-#~ msgstr "Nenhuma ajuda requisitada"
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Proponente da Proposta D"
-#~ msgid "No Requested packages"
-#~ msgstr "Nenhum pacote requisitado"
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Proponente da Proposta C"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Nenhum pacote esperando para ser empacotado"
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Proponente da Proposta B"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Nenhum pacote esperando para ser adotado"
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Proponente da Proposta A"
-#~ msgid "No orphaned packages"
-#~ msgstr "Nenhum pacote órfão"
+#~ msgid "Proposer"
+#~ msgstr "Proponente"
-#~ msgid "No requests for adoption"
-#~ msgstr "Nenhuma requisição para adoção"
+#~ msgid "Platforms"
+#~ msgstr "Plataformas"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Esta edição das Notícias Semanais Debian foi "
-#~ "editada por <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Debate"
+#~ msgstr "Debate"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Esta edição das Notícias Semanais Debian foi "
-#~ "editada por <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Nominations"
+#~ msgstr "Candidaturas"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />As Notícias Semanais Debian são editadas por <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Time Line"
+#~ msgstr "Linha do Tempo"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />As Notícias Semanais Debian são editadas por <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Date"
+#~ msgstr "Data"
#~ 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>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "Para receber este boletim semanalmente em sua caixa postal, <a href="
-#~ "\"https://lists.debian.org/debian-news-portuguese/\">inscreva-se na lista "
-#~ "debian-news-portuguese</a> (versão em Português Brasileiro). Para receber "
-#~ "o boletim em inglês, <a href=\"https://lists.debian.org/debian-news/"
-#~ "\">inscreva-se na lista debian-news</a>."
-
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Voltar para a <a href=\"./\">página de palestrantes do Debian</a>."
-
-#~ msgid "List of Speakers"
-#~ msgstr "Lista de Palestrantes"
-
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Ela foi traduzida por %s."
+#~ "<a href=\"/MailingLists/disclaimer\">Lista de discussão pública</a> em "
+#~ "inglês para CDs/DVDs:"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Ela foi traduzida por %s."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />misc"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Ela foi traduzida por %s."
+#~ msgid "net_install"
+#~ msgstr "net_install"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Ela foi traduzida por %s."
+#~ msgid "buy"
+#~ msgstr "compre"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Esta edição das Notícias do Projeto Debian foi "
-#~ "editada por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Esta edição das Notícias do Projeto Debian foi "
-#~ "editada por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />As Notícias do Projeto Debian são editadas por <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />As Notícias do Projeto Debian são editadas por <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_em_cd"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "<a href=\"../../\">Edições anteriores</a> deste boletim estão disponíveis."
+#~ msgid "Debian CD team"
+#~ msgstr "Equipe Debian CD"
-#~ 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 ""
-#~ "Para receber este boletim quinzenalmente em sua caixa postal, <a href="
-#~ "\"https://lists.debian.org/debian-news-portuguese/\">inscreva-se na lista "
-#~ "debian-news-portuguese</a> (versão em Português Brasileiro). Para receber "
-#~ "o boletim em inglês, <a href=\"https://lists.debian.org/debian-news/"
-#~ "\">inscreva-se na lista debian-news</a>."
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Informações sobre o Lançamento da Imagem"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (link quebrado)"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Baixar com Torrent"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Voltar para: outras <a href=\"./\">notícias Debian</a> || <a href="
-#~ "\"m4_HOME/\">página inicial do Projeto Debian</a>."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Espelhos Rsync"
-#~ msgid "Download calendar entry"
-#~ msgstr "Baixar entrada no calendário"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Espelhando"
-#~ msgid "Latest News"
-#~ msgstr "Últimas Notícias"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Arte gráfica"
-#~ msgid "Related Links"
-#~ msgstr "Links Relacionados"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Misc"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Coordenador do</th><th>Projeto</th>"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Baixar"
-#~ msgid "Main Coordinator"
-#~ msgstr "Coordenador Principal"
+#~ msgid "Network Install"
+#~ msgstr "Instalação via Rede"
-#~ msgid "Debian Involvement"
-#~ msgstr "Envolvimento do Debian"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Comprar CDs ou DVDs"
-#~ msgid "More Info"
-#~ msgstr "Mais Informações"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Baixar via HTTP/FTP"
-#~ msgid "Where"
-#~ msgstr "Onde"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Baixar com Jigdo"
-#~ msgid "When"
-#~ msgstr "Quando"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "link may no longer be valid"
-#~ msgstr "o link pode não ser mais válido"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Voltar para a <a href=\"./\">página de consultores do Debian</a>."
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Próximas Atrações"
+#~ msgid "List of Consultants"
+#~ msgstr "Lista de Consultores"
-#~ msgid "More information"
-#~ msgstr "Informações adicionais"
+#~ msgid "Rating:"
+#~ msgstr "Classificação:"
-#~ msgid "Select a server near you"
-#~ msgstr "Escolha um servidor próximo de você"
+#~ msgid "Nobody"
+#~ msgstr "Ninguém"
-#, fuzzy
-#~| msgid "Project News"
-#~ msgid "Project&nbsp;News"
-#~ msgstr "Notícias do Projeto"
+#~ msgid "Taken by:"
+#~ msgstr "Tirado por:"
-#, fuzzy
-#~| msgid "Weekly News"
-#~ msgid "Weekly&nbsp;News"
-#~ msgstr "Notícias Semanais"
+#~ msgid "More information:"
+#~ msgstr "Mais informações:"
diff --git a/portuguese/po/vendors.pt.po b/portuguese/po/vendors.pt.po
index bfbe35b7345..744e982d251 100644
--- a/portuguese/po/vendors.pt.po
+++ b/portuguese/po/vendors.pt.po
@@ -10,151 +10,141 @@ msgstr ""
"Project-Id-Version: Debian Webwml\n"
"PO-Revision-Date: 2015-07-04 12:00-0300\n"
"Last-Translator: Marcelo Gomes de Santana <marcelo@msantana.eng.br>\n"
-"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Vendedor:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL da Página Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Permitem Contribuição para o Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "País:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Entrega internacional:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "e-mail:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Tipo de CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Tipo de DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "BD Type:"
-msgstr "Tipo de BD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:15
-msgid "USB Type:"
-msgstr "Tipo de USB:"
-
-#: ../../english/CD/vendors/vendors.CD.def:16
-msgid "Architectures:"
-msgstr "Arquiteturas:"
-
-#: ../../english/CD/vendors/vendors.CD.def:28
msgid "Vendor"
msgstr "Vendedor"
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Permitem Contribuições"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:16
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD/BD/USB"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr "Arquiteturas"
-#: ../../english/CD/vendors/vendors.CD.def:32
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Entrega Internacional"
-#: ../../english/CD/vendors/vendors.CD.def:33
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Contato"
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:58
+#: ../../english/CD/vendors/vendors.CD.def:44
msgid "Vendor Home"
msgstr "Página Web do Vendedor"
-#: ../../english/CD/vendors/vendors.CD.def:84
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "página"
-#: ../../english/CD/vendors/vendors.CD.def:85
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "e-mail"
-#: ../../english/CD/vendors/vendors.CD.def:128
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "na Europa"
-#: ../../english/CD/vendors/vendors.CD.def:132
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "Para algumas áreas"
-#: ../../english/CD/vendors/vendors.CD.def:136
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "fonte"
-#: ../../english/CD/vendors/vendors.CD.def:140
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "e"
-#~ msgid "Official CD"
-#~ msgstr "CD Oficial"
+#~ msgid "updated monthly"
+#~ msgstr "atualizado mensalmente"
-#~ msgid "Official DVD"
-#~ msgstr "DVD Oficial"
+#~ msgid "updated twice weekly"
+#~ msgstr "atualizado duas vezes por semana"
-#~ msgid "Development Snapshot"
-#~ msgstr "Versão de desenvolvimento"
+#~ msgid "updated weekly"
+#~ msgstr "atualização semanal"
-#~ msgid "Vendor Release"
-#~ msgstr "Versão do Vendedor"
+#~ msgid "reseller"
+#~ msgstr "revendedor"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Distribuição múltipla"
+#~ msgid "reseller of $var"
+#~ msgstr "revendedor de $var"
-#~ msgid "non-US included"
-#~ msgstr "non-US incluído"
+#~ msgid "Custom Release"
+#~ msgstr "Versão customizada"
-#~ msgid "non-free included"
-#~ msgstr "non-free incluído"
+#~ msgid "vendor additions"
+#~ msgstr "adições do vendedor"
#~ msgid "contrib included"
#~ msgstr "contrib incluído"
-#~ msgid "vendor additions"
-#~ msgstr "adições do vendedor"
+#~ msgid "non-free included"
+#~ msgstr "non-free incluído"
-#~ msgid "Custom Release"
-#~ msgstr "Versão customizada"
+#~ msgid "non-US included"
+#~ msgstr "non-US incluído"
-#~ msgid "reseller of $var"
-#~ msgstr "revendedor de $var"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Distribuição múltipla"
-#~ msgid "reseller"
-#~ msgstr "revendedor"
+#~ msgid "Vendor Release"
+#~ msgstr "Versão do Vendedor"
-#~ msgid "updated weekly"
-#~ msgstr "atualização semanal"
+#~ msgid "Development Snapshot"
+#~ msgstr "Versão de desenvolvimento"
-#~ msgid "updated twice weekly"
-#~ msgstr "atualizado duas vezes por semana"
+#~ msgid "Official DVD"
+#~ msgstr "DVD Oficial"
-#~ msgid "updated monthly"
-#~ msgstr "atualizado mensalmente"
+#~ msgid "Official CD"
+#~ msgstr "CD Oficial"
+
+#~ msgid "Architectures:"
+#~ msgstr "Arquiteturas:"
+
+#~ msgid "USB Type:"
+#~ msgstr "Tipo de USB:"
+
+#~ msgid "BD Type:"
+#~ msgstr "Tipo de BD:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Tipo de DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Tipo de CD:"
+
+#~ msgid "email:"
+#~ msgstr "e-mail:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Entrega internacional:"
+
+#~ msgid "Country:"
+#~ msgstr "País:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Permitem Contribuição para o Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL da Página Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Vendedor:"
diff --git a/portuguese/po/vote.pt.po b/portuguese/po/vote.pt.po
index 832e5c86b1e..ed7a270009d 100644
--- a/portuguese/po/vote.pt.po
+++ b/portuguese/po/vote.pt.po
@@ -12,7 +12,8 @@ msgstr ""
"Project-Id-Version: Debian Webwml\n"
"PO-Revision-Date: 2015-07-04 12:01-0300\n"
"Last-Translator: Marcelo Gomes de Santana <marcelo@msantana.eng.br>\n"
-"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/romanian/po/bugs.ro.po b/romanian/po/bugs.ro.po
index 2b330562d87..51ad07a8e21 100644
--- a/romanian/po/bugs.ro.po
+++ b/romanian/po/bugs.ro.po
@@ -27,7 +27,6 @@ msgstr "etichetate"
#: ../../english/Bugs/pkgreport-opts.inc:23
#: ../../english/Bugs/pkgreport-opts.inc:63
#: ../../english/Bugs/pkgreport-opts.inc:97
-#| msgid "severities"
msgid "with severity"
msgstr "cu severitatea"
@@ -48,7 +47,6 @@ msgid "owned by"
msgstr "deținute de"
#: ../../english/Bugs/pkgreport-opts.inc:38
-#| msgid "status"
msgid "with status"
msgstr "cu starea"
@@ -103,7 +101,6 @@ msgid "raw"
msgstr "brut"
#: ../../english/Bugs/pkgreport-opts.inc:131
-#| msgid "sarge"
msgid "age"
msgstr "vârstă"
@@ -152,12 +149,10 @@ msgid "unstable"
msgstr "unstable"
#: ../../english/Bugs/pkgreport-opts.inc:152
-#| msgid "archived bugs"
msgid "Unarchived"
msgstr "Nearhivate"
#: ../../english/Bugs/pkgreport-opts.inc:155
-#| msgid "archived bugs"
msgid "Archived"
msgstr "Arhivate"
@@ -165,131 +160,131 @@ msgstr "Arhivate"
msgid "Archived and Unarchived"
msgstr "Arhivate și nearhivate"
-#~ msgid "Flag"
-#~ msgstr "Opțiuni:"
-
-#~ msgid "active bugs"
-#~ msgstr "probleme nerezolvate"
+#~ msgid "Exclude tag:"
+#~ msgstr "Exclude tag:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "arată problemele numai o dată"
+#~ msgid "Include tag:"
+#~ msgstr "Include tag:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "fără ordine"
+#~ msgid "wontfix"
+#~ msgstr "nu va fi rezolvat"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "nu arăta indexul în antet"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "nu arăta statistici în josul paginii"
+#~ msgid "unreproducible"
+#~ msgstr "imposibil de reprodus"
-#~ msgid "bugs"
-#~ msgstr "probleme"
+#~ msgid "security"
+#~ msgstr "securitate"
-#~ msgid "open"
-#~ msgstr "deschis"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "forwarded"
-#~ msgstr "redirecționat"
+#~ msgid "moreinfo"
+#~ msgstr "mai multe informatii"
-#~ msgid "pending"
-#~ msgstr "pe cale de a fi rezolvat"
+#~ msgid "help"
+#~ msgstr "ajutor"
-#~ msgid "fixed"
-#~ msgstr "rezolvat"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixat-upstream"
-#~ msgid "done"
-#~ msgstr "terminat"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixat-in-experimental"
-#~ msgid "Include status:"
-#~ msgstr "Inclus:"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "Exclude status:"
-#~ msgstr "Exclus"
+#~ msgid "confirmed"
+#~ msgstr "confirmat"
-#~ msgid "critical"
-#~ msgstr "critic"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "grave"
-#~ msgstr "grav"
+#, fuzzy
+#~ msgid "lenny-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "serious"
-#~ msgstr "serios"
+#, fuzzy
+#~ msgid "etch-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "important"
-#~ msgstr "important"
+#, fuzzy
+#~ msgid "etch"
+#~ msgstr "patch"
-#~ msgid "minor"
-#~ msgstr "minor"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "wishlist"
-#~ msgstr "sub examinare"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "Include severity:"
-#~ msgstr "Include severitatea:"
+#~ msgid "potato"
+#~ msgstr "potato"
#~ msgid "Exclude severity:"
#~ msgstr "Exclude severitatea:"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Include severitatea:"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "sub examinare"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "minor"
+#~ msgstr "minor"
-#, fuzzy
-#~ msgid "etch"
-#~ msgstr "patch"
+#~ msgid "important"
+#~ msgstr "important"
-#, fuzzy
-#~ msgid "etch-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "serios"
-#, fuzzy
-#~ msgid "lenny-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "grave"
+#~ msgstr "grav"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "critical"
+#~ msgstr "critic"
-#~ msgid "confirmed"
-#~ msgstr "confirmat"
+#~ msgid "Exclude status:"
+#~ msgstr "Exclus"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "Include status:"
+#~ msgstr "Inclus:"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixat-in-experimental"
+#~ msgid "done"
+#~ msgstr "terminat"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixat-upstream"
+#~ msgid "fixed"
+#~ msgstr "rezolvat"
-#~ msgid "help"
-#~ msgstr "ajutor"
+#~ msgid "pending"
+#~ msgstr "pe cale de a fi rezolvat"
-#~ msgid "moreinfo"
-#~ msgstr "mai multe informatii"
+#~ msgid "forwarded"
+#~ msgstr "redirecționat"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "open"
+#~ msgstr "deschis"
-#~ msgid "security"
-#~ msgstr "securitate"
+#~ msgid "bugs"
+#~ msgstr "probleme"
-#~ msgid "unreproducible"
-#~ msgstr "imposibil de reprodus"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "nu arăta statistici în josul paginii"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "nu arăta indexul în antet"
-#~ msgid "wontfix"
-#~ msgstr "nu va fi rezolvat"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "fără ordine"
-#~ msgid "Include tag:"
-#~ msgstr "Include tag:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "arată problemele numai o dată"
-#~ msgid "Exclude tag:"
-#~ msgstr "Exclude tag:"
+#~ msgid "active bugs"
+#~ msgstr "probleme nerezolvate"
+
+#~ msgid "Flag"
+#~ msgstr "Opțiuni:"
diff --git a/romanian/po/cdimage.ro.po b/romanian/po/cdimage.ro.po
index 0e91d721282..3c53eae57f2 100644
--- a/romanian/po/cdimage.ro.po
+++ b/romanian/po/cdimage.ro.po
@@ -14,28 +14,26 @@ msgstr ""
"X-Generator: Lokalize 1.5\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
-msgid " Key fingerprint"
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
+msgid " Key fingerprint"
msgstr " Amprentă cheie"
-#: ../../english/devel/debian-installer/images.data:90
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "Imagini ISO"
-#: ../../english/devel/debian-installer/images.data:91
-msgid "Jigdo files"
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
msgstr "Fișiere Jigdo"
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
-msgid "&middot;"
+msgid "&middot;"
msgstr "&middot;"
#: ../../english/template/debian/cdimage.wml:13
-msgid "<void id=\"dc_faq\" />FAQ"
+msgid "<void id=\"dc_faq\" />FAQ"
msgstr "<void id=\"dc_faq\" />Întrebări frecvente"
#: ../../english/template/debian/cdimage.wml:16
@@ -55,35 +53,35 @@ msgid "Network Install"
msgstr "Instalare prin rețea"
#: ../../english/template/debian/cdimage.wml:28
-msgid "<void id=\"dc_download\" />Download"
+msgid "<void id=\"dc_download\" />Download"
msgstr "<void id=\"dc_download\" />Descarcă"
#: ../../english/template/debian/cdimage.wml:31
-msgid "<void id=\"dc_misc\" />Misc"
+msgid "<void id=\"dc_misc\" />Misc"
msgstr "<void id=\"dc_misc\" />Diverse"
#: ../../english/template/debian/cdimage.wml:34
-msgid "<void id=\"dc_artwork\" />Artwork"
+msgid "<void id=\"dc_artwork\" />Artwork"
msgstr "<void id=\"dc_artwork\" />Grafică"
#: ../../english/template/debian/cdimage.wml:37
-msgid "<void id=\"dc_mirroring\" />Mirroring"
+msgid "<void id=\"dc_mirroring\" />Mirroring"
msgstr "<void id=\"dc_mirroring\" />Oglindire"
#: ../../english/template/debian/cdimage.wml:40
-msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
msgstr "<void id=\"dc_rsyncmirrors\" />Oglinzi rsync"
#: ../../english/template/debian/cdimage.wml:43
-msgid "<void id=\"dc_verify\" />Verify"
+msgid "<void id=\"dc_verify\" />Verify"
msgstr "<void id=\"dc_verify\" />Verifică"
#: ../../english/template/debian/cdimage.wml:46
-msgid "<void id=\"dc_torrent\" />Download with Torrent"
+msgid "<void id=\"dc_torrent\" />Download with Torrent"
msgstr "<void id=\"dc_torrent\" />Descarcă prin Torrent"
#: ../../english/template/debian/cdimage.wml:49
-msgid "<void id=\"dc_relinfo\" />Image Release Info"
+msgid "<void id=\"dc_relinfo\" />Image Release Info"
msgstr "<void id=\"dc_relinfo\" />Informații de lansare imagine"
#: ../../english/template/debian/cdimage.wml:52
@@ -91,11 +89,11 @@ msgid "Debian CD team"
msgstr "Echipa Debian CD"
#: ../../english/template/debian/cdimage.wml:55
-msgid "debian_on_cd"
+msgid "debian_on_cd"
msgstr "debian_pe_cd"
#: ../../english/template/debian/cdimage.wml:58
-msgid "<void id=\"faq-bottom\" />faq"
+msgid "<void id=\"faq-bottom\" />faq"
msgstr "<void id=\"faq-bottom\" />întrebări frecvente"
#: ../../english/template/debian/cdimage.wml:61
@@ -103,7 +101,7 @@ msgid "jigdo"
msgstr "jigdo"
#: ../../english/template/debian/cdimage.wml:64
-msgid "http_ftp"
+msgid "http_ftp"
msgstr "http_ftp"
#: ../../english/template/debian/cdimage.wml:67
@@ -111,11 +109,11 @@ msgid "buy"
msgstr "cumpără"
#: ../../english/template/debian/cdimage.wml:70
-msgid "net_install"
+msgid "net_install"
msgstr "net_install"
#: ../../english/template/debian/cdimage.wml:73
-msgid "<void id=\"misc-bottom\" />misc"
+msgid "<void id=\"misc-bottom\" />misc"
msgstr "<void id=\"misc-bottom\" />diverse"
#: ../../english/template/debian/cdimage.wml:76
@@ -123,6 +121,5 @@ msgid ""
"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
"a> for CDs/DVDs:"
msgstr ""
-"<a href=\"/MailingLists/disclaimer\">listă de discuții publică</"
-"a> în limba engleză pentru CD-uri/DVD-uri:"
-
+"<a href=\"/MailingLists/disclaimer\">listă de discuții publică</a> în limba "
+"engleză pentru CD-uri/DVD-uri:"
diff --git a/romanian/po/consultants.ro.po b/romanian/po/consultants.ro.po
index e706c1cd765..26cfaff2b4f 100644
--- a/romanian/po/consultants.ro.po
+++ b/romanian/po/consultants.ro.po
@@ -65,8 +65,8 @@ msgid ""
"<total_consultant> Debian consultants listed in <total_country> countries "
"worldwide."
msgstr ""
-"<total_consultant> consultanți Debian listați în <total_country> țări "
-"din întreaga lume."
+"<total_consultant> consultanți Debian listați în <total_country> țări din "
+"întreaga lume."
#: ../../english/template/debian/consultant.wml:6
msgid "List of Consultants"
@@ -75,4 +75,3 @@ msgstr "Lista consultanților"
#: ../../english/template/debian/consultant.wml:9
msgid "Back to the <a href=\"./\">Debian consultants page</a>."
msgstr "Înapoi la <a href=\"./\">pagina consultanților Debian</a>."
-
diff --git a/romanian/po/countries.ro.po b/romanian/po/countries.ro.po
index 7f8d4a9fc19..30199379c43 100644
--- a/romanian/po/countries.ro.po
+++ b/romanian/po/countries.ro.po
@@ -261,7 +261,7 @@ msgid "Montenegro"
msgstr "Muntenegru"
#: ../../english/template/debian/countries.wml:297
-msgid "Madagascar"
+msgid "Madagascar"
msgstr "Madagascar"
#: ../../english/template/debian/countries.wml:300
@@ -401,7 +401,7 @@ msgid "Uruguay"
msgstr "Uruguay"
#: ../../english/template/debian/countries.wml:402
-msgid "Uzbekistan"
+msgid "Uzbekistan"
msgstr "Uzbekistan"
#: ../../english/template/debian/countries.wml:405
@@ -409,7 +409,7 @@ msgid "Venezuela"
msgstr "Venezuela"
#: ../../english/template/debian/countries.wml:408
-msgid "Vietnam"
+msgid "Vietnam"
msgstr "Vietnam"
#: ../../english/template/debian/countries.wml:411
@@ -421,9 +421,8 @@ msgid "South Africa"
msgstr "Africa de Sud"
#: ../../english/template/debian/countries.wml:417
-msgid "Zimbabwe"
+msgid "Zimbabwe"
msgstr "Zimbabwe"
#~ msgid "Great Britain"
#~ msgstr "Marea&nbsp;Britanie"
-
diff --git a/romanian/po/date.ro.po b/romanian/po/date.ro.po
index 48003a0b474..5ce3d77ca48 100644
--- a/romanian/po/date.ro.po
+++ b/romanian/po/date.ro.po
@@ -195,8 +195,7 @@ msgstr "q{[%]d [%]s}, $mday, $mon_str"
#. Percent signs are escaped because they are special during pass 2,
#. replace all % by [%]
#: ../../english/template/debian/ctime.wml:99
-#| msgid "q{[%]02d [%]s [%]d}, $mday, $mon_str, $year"
-msgid "q{[%]s [%]s}, $mon_str, $year"
+msgid "q{[%]s [%]s}, $mon_str, $year"
msgstr "q{[%]s [%]s}, $mon_str, $year"
#. $rangeform_samemonth: Date format (sprintf) for date ranges
@@ -223,4 +222,3 @@ msgstr "q{[%]d-[%]d [%]s}, $sday, $eday, $smon_str"
#: ../../english/template/debian/ctime.wml:122
msgid "q{[%]d [%]s-[%]d [%]s}, $sday, $smon_str, $eday, $emon_str"
msgstr "q{[%]d [%]s-[%]d [%]s}, $sday, $smon_str, $eday, $emon_str"
-
diff --git a/romanian/po/distrib.ro.po b/romanian/po/distrib.ro.po
index b9bc6dea98c..c5352bb48fc 100644
--- a/romanian/po/distrib.ro.po
+++ b/romanian/po/distrib.ro.po
@@ -130,71 +130,79 @@ msgid "ARM"
msgstr ""
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
-msgid "HP PA-RISC"
+msgid "Hard Float ABI ARM"
msgstr ""
#: ../../english/releases/arches.data:14
-msgid "Hurd 32-bit PC (i386)"
+msgid "HP PA-RISC"
msgstr ""
#: ../../english/releases/arches.data:15
-msgid "32-bit PC (i386)"
+msgid "Hurd 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:16
-msgid "Intel Itanium IA-64"
+msgid "32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:17
-msgid "kFreeBSD 32-bit PC (i386)"
+msgid "Intel Itanium IA-64"
msgstr ""
#: ../../english/releases/arches.data:18
-msgid "kFreeBSD 64-bit PC (amd64)"
+msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:19
-msgid "Motorola 680x0"
+msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
#: ../../english/releases/arches.data:20
-msgid "MIPS (big endian)"
+msgid "Motorola 680x0"
msgstr ""
#: ../../english/releases/arches.data:21
-msgid "MIPS (little endian)"
+msgid "MIPS (big endian)"
msgstr ""
#: ../../english/releases/arches.data:22
-msgid "PowerPC"
+msgid "MIPS (little endian)"
msgstr ""
#: ../../english/releases/arches.data:23
-msgid "IBM S/390"
+msgid "PowerPC"
msgstr ""
#: ../../english/releases/arches.data:24
-msgid "IBM System z"
+msgid "POWER Processors"
msgstr ""
#: ../../english/releases/arches.data:25
+msgid "IBM S/390"
+msgstr ""
+
+#: ../../english/releases/arches.data:26
+msgid "IBM System z"
+msgstr ""
+
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr ""
-#, fuzzy
-#~ msgid "Case sensitive"
+#~ msgid "Search case sensitive"
#~ msgstr "Caut&#259; majuscule/minuscule"
#~ msgid "Allow searching on subwords"
#~ msgstr "Permite c&#259;utare cu"
-#~ msgid "Search case sensitive"
+#, fuzzy
+#~ msgid "Case sensitive"
#~ msgstr "Caut&#259; majuscule/minuscule"
diff --git a/romanian/po/doc.ro.po b/romanian/po/doc.ro.po
index 5789a797948..8d211332135 100644
--- a/romanian/po/doc.ro.po
+++ b/romanian/po/doc.ro.po
@@ -14,7 +14,24 @@ msgstr ""
"20)) ? 1 : 2;\n"
"X-Generator: Lokalize 1.5\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"
@@ -29,18 +46,21 @@ msgid ""
" virtualization with Xen, KVM or LXC."
msgstr ""
"Scris de doi dezvoltatori Debian, această carte gratuită\n"
-" a început ca o traducere a best-sellerului lor în franceză denumit „Cahier de\n"
+" a început ca o traducere a best-sellerului lor în franceză denumit „Cahier "
+"de\n"
" l'admin Debian” (publicat de Eyrolles). Accesibilă tuturor, această carte\n"
" predă conceptele esențiale oricui vrea să devină un administrator Debian \n"
" GNU/Linux eficient și independent. \n"
-" Aceasta acoperă toate subiectele pe care un administrator competent ar trebui\n"
-" să le stăpânească, pornind de la instalarea și actualizarea sistemului, până\n"
+" Aceasta acoperă toate subiectele pe care un administrator competent ar "
+"trebui\n"
+" să le stăpânească, pornind de la instalarea și actualizarea sistemului, "
+"până\n"
" la crearea de pachete și compilarea kernelului, dar și\n"
" monitorizare, backup și migrații, fără să uite de subiecte avansate, \n"
" cum ar fi configurarea SELinux pentru a securiza serviciile, instalări\n"
" automatizate sau virtualizare cu Xen, KVM or LXC."
-#: ../../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"
@@ -50,19 +70,21 @@ msgid ""
msgstr ""
"Scopul acestei cărți disponibilă în mod gratuit și actualizată este de a\n"
" familiariza cu Debian, (inclusiv atât versiunea stabilă actuală, cât și\n"
-" distribuția instabilă actuală). Este un ghid cuprinzător cu suport de bază\n"
-" pentru utilizatorul care instalează și menține sistemul de unul singur (fie \n"
+" distribuția instabilă actuală). Este un ghid cuprinzător cu suport de "
+"bază\n"
+" pentru utilizatorul care instalează și menține sistemul de unul singur "
+"(fie \n"
" de acasă, de la birou, club sau școală)."
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "CD Sarge cu program de instalare și o selecție de pachete"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "CD live cu Knoppix"
-#: ../../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"
@@ -71,18 +93,19 @@ msgid ""
" Debian's unique package management system."
msgstr ""
"Începătorii și utilizatorii avansați vor găsi în această carte o \n"
-" sursă cuprinzătoare de informații pentru a utiliza Debian pentru desktopuri,\n"
+" sursă cuprinzătoare de informații pentru a utiliza Debian pentru "
+"desktopuri,\n"
" servere intranet și internet și dezvoltare. Mai conține și \n"
" informații despre proiect și tratează în mod detaliat\n"
" sistemul de gestionare al pachetelor specific Debian."
-#: ../../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 "Debian GNU/Linux 3.1r0a „sarge” official pe DVD (i386)"
-#: ../../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"
@@ -96,11 +119,14 @@ msgid ""
" resource alongside a standard Linux reference to bootstrap one's\n"
" Linux experience in Debian's bottom-up philosophy."
msgstr ""
-"Această carte introduce concepte și tehnici ale sistemului de operare Debian\n"
+"Această carte introduce concepte și tehnici ale sistemului de operare "
+"Debian\n"
" care explică utilizarea acestora și capcanele asociate și \n"
" care ilustrează gândirea din spatele fiecărei abordări. Scopul nu este de\n"
-" a fi un ghid de referință, dar de a oferi cititorului suficiente cunoștințe \n"
-" despre mecanismele proiectului și a sistemului de operare pentru a învăța și\n"
+" a fi un ghid de referință, dar de a oferi cititorului suficiente "
+"cunoștințe \n"
+" despre mecanismele proiectului și a sistemului de operare pentru a învăța "
+"și\n"
" îmbrățișa soluțiile sofisticate și elegante, uneori aparent neintuitive\n"
" care au evoluat ca parte din sistemele Debian\n"
" în ultimul deceniu. Deși se adresează unui administrator UNIX/Linux\n"
@@ -108,7 +134,7 @@ msgstr ""
" standard Linux pentru a acumula o experiență inițială\n"
" Linux în cadrul filosofiei „de jos în sus” a Debian."
-#: ../../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 -- "
@@ -120,14 +146,15 @@ msgstr ""
"Un ghid practic de referință pentru sistemul Debian GNU/Linux care arată,\n"
" în mai bine de 1500 de <q>rețete</q>, cum se poate utiliza pentru \n"
" activități de zi cu zi, de la lucrul cu text, imagini și sunete la\n"
-" productivitate și rețelistică. La fel ca și programele descrise în carte, \n"
+" productivitate și rețelistică. La fel ca și programele descrise în "
+"carte, \n"
" cartea este copyleft iar sursele sunt disponibile."
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
msgid "Debian 2.2 ARM architecture"
msgstr "Arhitectura Debian 2.2 ARM"
-#: ../../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, "
@@ -146,11 +173,14 @@ msgid ""
" will be working from this distribution and preferably have a Debian based\n"
" host machine too."
msgstr ""
-"Această carte este pentru dezvoltatori ce lucrează cu GNU/Linux pe procesoare.\n"
-" ARM. Cartea tratează configurarea pentru unele dispozitive, în special LART,\n"
+"Această carte este pentru dezvoltatori ce lucrează cu GNU/Linux pe "
+"procesoare.\n"
+" ARM. Cartea tratează configurarea pentru unele dispozitive, în special "
+"LART,\n"
" Assabet, Psion5.\n"
" Aceasta mai conține informații generice, unelte și tehnici. Ansamblul de\n"
-" unelte GNU este tratat în formă nativă sau pentru cross-compilare, la fel și\n"
+" unelte GNU este tratat în formă nativă sau pentru cross-compilare, la fel "
+"și\n"
"bootloaderele, \n"
" peticele de kernel, discurile RAM, particularitățile ARM și alte\n"
" resurse ARM. Mai\n"
@@ -162,7 +192,7 @@ msgstr ""
" veți lucra pornind de la această distribuție și preferabil veți avea o\n"
" distribuție bazată pe Debian și pe mașina gazdă."
-#: ../../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"
@@ -172,29 +202,32 @@ msgstr ""
"„Să învățăm Debian GNU/Linux” ghidează noul utilizator de Linux prin\n"
" instalarea și configurarea Debian GNU/Linux.\n"
" Utilizatorii de Windows vor avea parte de o introducere blândă în această\n"
-" incitantă lume a tehnicii de calcul cu ajutorul cărții scrise de Bill McCarty."
+" incitantă lume a tehnicii de calcul cu ajutorul cărții scrise de Bill "
+"McCarty."
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
msgid "Debian 2.1"
msgstr "Debian 2.1"
-#: ../../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"
" publishing, business, fun things, and multimedia. 30 days of free e-mail\n"
" support included."
msgstr ""
-"Include mai mult de 230 de pagini și trei discuri CD-ROM. Subiectele acoperite\n"
+"Include mai mult de 230 de pagini și trei discuri CD-ROM. Subiectele "
+"acoperite\n"
" includ Debian Linux, rețelistică, unelte de programare, GUI, desktop\n"
-" publicare, afaceri, lucruri distractive și multimedia. Mai sunt incluse 30\n"
+" publicare, afaceri, lucruri distractive și multimedia. Mai sunt incluse "
+"30\n"
" de zile de suport e-mail gratuit."
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "DVD Debian Squeeze i386/amd64"
-#: ../../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"
@@ -208,34 +241,35 @@ msgstr ""
"Prima carte în franceză despre Debian este deja la a cincea ediție. Aceasta\n"
" acoperă toate aspectele administrării Debian, de la instalare\n"
" la configurarea serviciilor de rețea.\n"
-" Scrisă de doi dezvoltatori Debian, această carte poate să intereseze mulți\n"
-" oameni: începătorul care vrea să descopere Debian, utilizatorul avansat care\n"
-" caută indicii despre cum să-și îmbunătățească măiestria în uneltele Debian și\n"
+" Scrisă de doi dezvoltatori Debian, această carte poate să intereseze "
+"mulți\n"
+" oameni: începătorul care vrea să descopere Debian, utilizatorul avansat "
+"care\n"
+" caută indicii despre cum să-și îmbunătățească măiestria în uneltele Debian "
+"și\n"
" administratorul care vrea să-și construiască o rețea solidă cu Debian."
-#: ../../english/doc/books.data:205
-msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
-msgstr "2 ediții: Una fără DVD, cealaltă cu 2 DVD-uri (i386)"
-
-#: ../../english/doc/books.data:208
+#: ../../english/doc/books.data:234
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)."
+"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 ""
-"O <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
-"mode=viewone&amp;titnr=254925022\">\n"
-" publicație</a> alternativă este disponibilă de la Lehmanns Fachbuchhandlung "
-"și costă 29.95\n"
-" euro (preț actualizat în 2008)."
-#: ../../english/doc/books.data:218
+#: ../../english/doc/books.data:248
+msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+msgstr "2 ediții: Una fără DVD, cealaltă cu 2 DVD-uri (i386)"
+
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) pe DVD"
-#: ../../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 "
@@ -243,21 +277,20 @@ msgid ""
"manual for all users who want to learn more about Debian and its range of "
"services."
msgstr ""
-"Această carte vă învață cum să instalați și să configurați sistemul și cum să "
-"utilizați Debian într-un mediu profesional. Aceasta arată potențialul complet "
-"al distribuției (în versiunea actuală 6.0) și oferă un manual practic "
-"pentru toți utilizatorii care vor să afle mai multe despre Debian și gama de "
-"servicii a acestuia."
+"Această carte vă învață cum să instalați și să configurați sistemul și cum "
+"să utilizați Debian într-un mediu profesional. Aceasta arată potențialul "
+"complet al distribuției (în versiunea actuală 6.0) și oferă un manual "
+"practic pentru toți utilizatorii care vor să afle mai multe despre Debian și "
+"gama de servicii a acestuia."
-#: ../../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 ""
-"2 ediții: Una fără CD, cealaltă cu CD-ul oficial (i386, contrib și "
-"surse)"
+"2 ediții: Una fără CD, cealaltă cu CD-ul oficial (i386, contrib și surse)"
-#: ../../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"
@@ -272,24 +305,28 @@ msgid ""
" administration issues, like planing and building of a dial-in router or\n"
" a server for Windows based clients (Samba)."
msgstr ""
-"Cartea parcurge toți pașii pentru planificarea și instalarea Debian GNU/Linux \n"
+"Cartea parcurge toți pașii pentru planificarea și instalarea Debian GNU/"
+"Linux \n"
" pe hardware tip PC, inclusiv aplicații importante, ca X Window\n"
" System, gestionare de ferestre și medii desktop (KDE, GNOME) și o\n"
-" selecție de servicii importante de sistem. Sunt introduse bazele Unix/Linux și\n"
-" conceptele, împreună cu utilizarea sistemului și componente importante (bash,\n"
+" selecție de servicii importante de sistem. Sunt introduse bazele Unix/"
+"Linux și\n"
+" conceptele, împreună cu utilizarea sistemului și componente importante "
+"(bash,\n"
" servicii de sistem și comenzi importante).\n"
-" Conține o explicare a formatului de pachete Debian și cum se creează pachetele\n"
+" Conține o explicare a formatului de pachete Debian și cum se creează "
+"pachetele\n"
" în acest format. Mai include o privire de ansamblu pentru aplicații Linux\n"
" standard (rețelistică, dezvoltare software, LaTeX și suite de\n"
" birou). Se pune accent puternic pe rețelistică și probleme de\n"
" administrare, precum planificarea și construirea unui router dial-in sau\n"
" a unui server pentru clienți Windows (Samba)."
-#: ../../english/doc/books.data:295
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "Program de instalare Debian GNU/Linux 3.1 Sarge (CD single-width)"
-#: ../../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"
@@ -297,9 +334,10 @@ msgid ""
msgstr ""
"Această carte este sub formă de dicționar și conține sfaturi diverse pentru\n"
" utilizatorii începători și de nivel mediu; instalarea prin varii metode,\n"
-" particularizarea desktopului, depanarea defectelor, cunoștințe valoroase și altele."
+" particularizarea desktopului, depanarea defectelor, cunoștințe valoroase "
+"și altele."
-#: ../../english/doc/books.data:311
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
@@ -307,7 +345,7 @@ msgstr ""
"Debian GNU/Linux 3.1r0 i386, ediția autorului (DVD +\n"
" CD)"
-#: ../../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"
@@ -317,19 +355,23 @@ msgid ""
" font package that decorates your desktop. This book might be useful\n"
" for all Debian users from beginners to advanced users."
msgstr ""
-"Este cea mai recentă carte pentru Sarge a seriei suportată ca o biblie standard\n"
+"Este cea mai recentă carte pentru Sarge a seriei suportată ca o biblie "
+"standard\n"
" pentru Debian în Japonia.\n"
-" Cartea acoperă toate aspectele utilizării Debian GNU/Linux 3.1 Sarge, cum ar\n"
+" Cartea acoperă toate aspectele utilizării Debian GNU/Linux 3.1 Sarge, cum "
+"ar\n"
" fi instalarea, medii desktop, administrarea sistemului și \n"
-" configurarea serverului. De asemenea, cartea mai include un pachet de fonturi\n"
-" comerciale care vă decorează desktopul. Această carte poate fi utilă pentru\n"
+" configurarea serverului. De asemenea, cartea mai include un pachet de "
+"fonturi\n"
+" comerciale care vă decorează desktopul. Această carte poate fi utilă "
+"pentru\n"
" toți utilizatorii Debian, de la începători, la avansați."
-#: ../../english/doc/books.data:330
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr "Debian 2.2r0 i386 ediția autorului (3 CD-uri)"
-#: ../../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"
@@ -339,17 +381,18 @@ msgid ""
" environment very easily with the customized CDs."
msgstr ""
"Această carte acoperă subiecte generale Debian GNU/Linux:\n"
-" instalarea, APT și dpkg, shell, X Window System, rețelistică, administrarea\n"
+" instalarea, APT și dpkg, shell, X Window System, rețelistică, "
+"administrarea\n"
" sistemului, configurarea kernelului, partajarea cu Windows, construirea\n"
" serverelor și altele.\n"
" Veți putea instala și începe să folosiți mediul japonez Debian GNU/Linux\n"
" foarte ușor cu aceste CD-uri particularizate."
-#: ../../english/doc/books.data:349
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "1 Woody neoficial, 3 Potato rev0"
-#: ../../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 "
@@ -363,16 +406,16 @@ msgstr ""
" GNU/Linux, fundamentele comenzilor Unix sau Linux, configurarea de bază "
"și\n"
" mentenanța sistemului și rețelistică,\n"
-" configurarea X Window System și utilizarea fișierelor multimedia în Debian "
-" GNU/Linux.\n"
+" configurarea X Window System și utilizarea fișierelor multimedia în "
+"Debian GNU/Linux.\n"
" Această carte mai include un ghid pentru întreținători, care stimulează\n"
" oamenii din Coreea să devină întreținători oficiali Debian."
-#: ../../english/doc/books.data:366
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr "Trei CD-uri oficiale potato r3 și un CD neoficial woody"
-#: ../../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"
@@ -384,15 +427,17 @@ msgstr ""
"Această carte introduce cititorii în Debian GNU/Linux cu multe\n"
" tutoriale practice și sfaturi. Scrisă în coreeană, această carte acoperă\n"
" aspecte cuprinzătoare ale sistemului Debian GNU/Linux: prima configurare,\n"
-" instalarea pachetelor, configurarea X, conectarea la internet, întreținerea\n"
+" instalarea pachetelor, configurarea X, conectarea la internet, "
+"întreținerea\n"
" rețelei și multe altele. Această carte oferă o mulțime de sfaturi despre\n"
-" setarea mediului Debian în limba coreeană și este utilă și pentru începători."
+" setarea mediului Debian în limba coreeană și este utilă și pentru "
+"începători."
-#: ../../english/doc/books.data:391
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "Debian GNU/Linux 3.1r0 CD1"
-#: ../../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"
@@ -400,11 +445,13 @@ msgid ""
" using GNU/Linux and Debian's powerful package management system."
msgstr ""
"Prima carte în limba persană despre Debian GNU/Linux. Cartea vă ajută să\n"
-" instalați Debian GNU/Linux și să setați servicii de rețea, precum servere web,\n"
-" baze de date, firewall, mail, ftp și altele. De asemenea, vă ajută să începeți\n"
+" instalați Debian GNU/Linux și să setați servicii de rețea, precum servere "
+"web,\n"
+" baze de date, firewall, mail, ftp și altele. De asemenea, vă ajută să "
+"începeți\n"
" să utilizați GNU/Linux și puternicul sistem de pachete Debian."
-#: ../../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 "
@@ -425,13 +472,17 @@ msgstr ""
" explică în detaliu funcțiile sistemului de operare. Primele\n"
" capitole explică structura GNU/Linux. Aceste capitole ajută cititorul să\n"
" înțeleagă cum utilizează sistemul resurse de bază, cum ar fi\n"
-" procesorul sau memoria. O analiză mai detaliată despre sisteme de operare, \n"
-" cum ar fi Ext2, Ext3 și ReiserFS vor permite utilizatorilor să facă alegerea\n"
-" corectă pentru nevoile lor. Multe numere presărate prin carte arată aspecte\n"
-" despre performanța sistemului. Cartea este adresată studenților și oricui dorește\n"
+" procesorul sau memoria. O analiză mai detaliată despre sisteme de "
+"operare, \n"
+" cum ar fi Ext2, Ext3 și ReiserFS vor permite utilizatorilor să facă "
+"alegerea\n"
+" corectă pentru nevoile lor. Multe numere presărate prin carte arată "
+"aspecte\n"
+" despre performanța sistemului. Cartea este adresată studenților și oricui "
+"dorește\n"
" să învețe GNU/Linux în detaliu. Cartea tratează Debian Sarge."
-#: ../../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 "
@@ -443,8 +494,8 @@ msgstr ""
"Aceasta este cartea potrivită pentru a învăța să creați platforme simple sau "
"complexe folosind doar software liber. În interior veți găsi o gamă largă de "
"proceduri revizuite și ajustate să se potrivească bunelor practici în cadrul "
-"implementării infrastructurii tehnologice. Acest ghid ușor de citit "
-"și cuprinzător vă va ghida în mod detaliat pentru atingerea de obiective "
+"implementării infrastructurii tehnologice. Acest ghid ușor de citit și "
+"cuprinzător vă va ghida în mod detaliat pentru atingerea de obiective "
"specifice realizabile cu ajutorul sistemului de operare Debian GNU/Linux."
#: ../../english/doc/books.def:38
@@ -467,49 +518,73 @@ msgstr "CD inclus:"
msgid "Publisher:"
msgstr "Editura:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Autori:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Editori:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Întreținător:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "Stare:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "Disponibilitate:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "Ultima versiune:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(versiunea <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 "text simplu"
-#. 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 ""
+"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 ""
+
+#: ../../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 ""
-"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://packages.debian.org/git\">Git</a> repository."
msgstr ""
-"Folosiți <a href=\"cvs\">SVN</a> pentru a obține sursele SGML pentru <get-var "
-"ddp_pkg_loc />."
-#: ../../english/doc/manuals.defs:158
+#: ../../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"
@@ -517,28 +592,48 @@ msgid ""
msgstr ""
"sursele prin CVS: setați <code>CVSROOT</code>\n"
" = <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-" și extrageți prin „check out” modulul <kbd>boot-floppies/documentation</kbd>."
+" și extrageți prin „check out” modulul <kbd>boot-floppies/documentation</"
+"kbd>."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "CVS prin web"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Pachet Debian"
-#: ../../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 "Pachet Debian (arhivat)"
-#: ../../english/releases/arches.data:32
+#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
msgid "PDF"
msgstr "PDF"
#~ msgid "Language:"
#~ msgstr "Limbaj:"
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Folosiți <a href=\"cvs\">SVN</a> pentru a obține sursele SGML pentru <get-"
+#~ "var ddp_pkg_loc />."
+
+#~ msgid ""
+#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
+#~ "mode=viewone&amp;titnr=254925022\">\n"
+#~ " publication</a> is available from Lehmanns Fachbuchhandlung and costs "
+#~ "29.95\n"
+#~ " euro (as of 2008)."
+#~ msgstr ""
+#~ "O <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?mode=viewone&amp;"
+#~ "titnr=254925022\">\n"
+#~ " publicație</a> alternativă este disponibilă de la Lehmanns "
+#~ "Fachbuchhandlung și costă 29.95\n"
+#~ " euro (preț actualizat în 2008)."
diff --git a/romanian/po/l10n.ro.po b/romanian/po/l10n.ro.po
index 264402caa40..4fd2f4a20f1 100644
--- a/romanian/po/l10n.ro.po
+++ b/romanian/po/l10n.ro.po
@@ -97,8 +97,8 @@ msgstr "Fi&#351;iere pot"
msgid "Hints for translators"
msgstr "Idei ajut&#259;toare pentru traduc&#259;tori"
-#~ msgid "Translated templates"
-#~ msgstr "Modele traduse"
-
#~ msgid "Original templates"
#~ msgstr "Modele originale"
+
+#~ msgid "Translated templates"
+#~ msgstr "Modele traduse"
diff --git a/romanian/po/mailinglists.ro.po b/romanian/po/mailinglists.ro.po
index 41e88aa8f56..506652c8fdd 100644
--- a/romanian/po/mailinglists.ro.po
+++ b/romanian/po/mailinglists.ro.po
@@ -118,12 +118,12 @@ msgstr "deschis&#259;"
msgid "closed"
msgstr "&#238;nchis&#259;"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr ""
-#~ "V&#259; rug&#259;m s&#259; selecta&#355;i listele de la care vre&#355;i "
-#~ "s&#259; v&#259; dezabona&#355;i:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr ""
#~ "V&#259; rug&#259;m s&#259; selecta&#355;i ls ce liste dori&#355;i s&#259; "
#~ "v&#259; abona&#355;i: "
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr ""
+#~ "V&#259; rug&#259;m s&#259; selecta&#355;i listele de la care vre&#355;i "
+#~ "s&#259; v&#259; dezabona&#355;i:"
diff --git a/romanian/po/newsevents.ro.po b/romanian/po/newsevents.ro.po
index 9f12e4e71e8..39e9fb2b91e 100644
--- a/romanian/po/newsevents.ro.po
+++ b/romanian/po/newsevents.ro.po
@@ -27,27 +27,27 @@ msgstr "p<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 "nume:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "e-mail:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "prezentarea anterioar&#259;"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "limbaje"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "loca&#355;ie:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
#, fuzzy
msgid "Topics:"
msgstr "subiect:"
@@ -339,11 +339,12 @@ 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>."
+#| "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 ""
"Pentru a primi &#351;tiri s&#259;pt&#259;minale <a href=\"m4_HOME/"
"MailingLists/subscribe#debian-news\">subscrie&#355;i</a> la lista de mail "
@@ -496,3 +497,17 @@ msgid ""
msgstr ""
"&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
"\"mailto:dwn@debian.org\">%s</a>."
+
+#, 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>."
+#~ msgstr ""
+#~ "Pentru a primi &#351;tiri s&#259;pt&#259;minale <a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">subscrie&#355;i</a> la lista de mail "
+#~ "debian-news."
diff --git a/romanian/po/organization.ro.po b/romanian/po/organization.ro.po
index 5bcdbb1484c..2710a108805 100644
--- a/romanian/po/organization.ro.po
+++ b/romanian/po/organization.ro.po
@@ -72,7 +72,7 @@ msgid "Officers"
msgstr "Ofiteri"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "distribu&#355;ie"
@@ -82,11 +82,11 @@ msgid "Publicity"
msgstr "publicitate"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "suport &#351;i infrastructur&#259;"
-#. 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 ""
@@ -99,107 +99,107 @@ msgstr "Conduc&#259;tor"
msgid "Technical Committee"
msgstr "comitet tehnic"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "secretar"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "proiect de dezvoltare"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "arhive ftp"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr ""
-#: ../../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 "pachete individuale"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "administrarea lans&#259;rii"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "note de lansare"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Controlul calit&#259;&#355;ii"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "echipa systemului de instalare"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "note de lansare"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "imagini pentru CD-uri"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "producere"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "testare"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "suport &#351;i infrastructur&#259;"
-#: ../../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
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "administrarea sistemului"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "documentare"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
#, fuzzy
#| msgid "Installation System Team"
msgid "Live System Team"
msgstr "echipa systemului de instalare"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Port&#259;ri"
@@ -227,87 +227,77 @@ msgstr "contact de pres&#259;"
msgid "Partner Program"
msgstr "program de parteneriat"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "evenimente"
-#: ../../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 "suport pentru utilizatori"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Sistem de urm&#259;rire al erorilor"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
#, fuzzy
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "administrarea listelor de e-mail"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "biroul noilor administratori"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
#, fuzzy
msgid "Debian Account Managers"
msgstr "administratorii conturilor de dezvoltare"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "biroul noilor administratori"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "echipa de securitate"
-#: ../../english/intro/organization.data:360
-#, fuzzy
-#| msgid "Security Team"
-msgid "Testing Security Team"
-msgstr "echipa de securitate"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr ""
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "pagini pe internet"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "pagina consultan&#355;ilor"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "pagina v&#226;nz&#259;torilor de CD-uri"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "regulament"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "administrarea sistemului"
-#: ../../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."
@@ -316,7 +306,7 @@ msgstr ""
"lni&#355;i o problem&#259; peuna sin ma&#351;inile Debian, incluz&#226;nd "
"probleme de parole sau instalare de pachete."
-#: ../../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 "
@@ -327,114 +317,120 @@ msgstr ""
"trebuis&#259; con&#355;in&#259; informa&#355;ii de administrare a fiec&#259;"
"rei ma&#351;ini."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "oglindiri"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "administrator de DSN"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "sistem de urm&#259;rire a pachetelor"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "coordonarea dona&#355;iilor de hardware"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "administrtori Alioth"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
#, fuzzy
msgid "Debian Women Project"
msgstr "proiect de dezvoltare"
-#: ../../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 ""
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr ""
#, fuzzy
-#~ msgid "Release Assistants"
-#~ msgstr "note de lansare"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "distribu&#355;ie"
#, fuzzy
-#~ msgid "Release Assistants for ``stable''"
+#~ msgid "Release Team for ``stable''"
#~ msgstr "administratorul lans&#259;rii pentru &#8222;stable&#8221;"
-#, fuzzy
-#~ msgid "Release Wizard"
-#~ msgstr "administratorul lans&#259;rii"
+#~ msgid "Vendors"
+#~ msgstr "v&#226;nz&#259;tori"
-#~ msgid "APT Team"
-#~ msgstr "Echipa APT"
+#, fuzzy
+#~ msgid "Marketing Team"
+#~ msgstr "echipa de securitate"
-#~ msgid "Internal Projects"
-#~ msgstr "proiecte interne"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "echipa systemului de instalare pentru &#8222;stable&#8221;"
#~ msgid "Mailing List Archives"
#~ msgstr "arhivele listelor de e-mail"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "echipa systemului de instalare pentru &#8222;stable&#8221;"
+#~ msgid "Internal Projects"
+#~ msgstr "proiecte interne"
-#, fuzzy
-#~ msgid "Marketing Team"
-#~ msgstr "echipa de securitate"
+#~ msgid "APT Team"
+#~ msgstr "Echipa APT"
-#~ msgid "Vendors"
-#~ msgstr "v&#226;nz&#259;tori"
+#, fuzzy
+#~ msgid "Release Wizard"
+#~ msgstr "administratorul lans&#259;rii"
#, fuzzy
-#~ msgid "Release Team for ``stable''"
+#~ msgid "Release Assistants for ``stable''"
#~ msgstr "administratorul lans&#259;rii pentru &#8222;stable&#8221;"
#, fuzzy
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "distribu&#355;ie"
+#~ msgid "Release Assistants"
+#~ msgstr "note de lansare"
+
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "echipa de securitate"
diff --git a/romanian/po/others.ro.po b/romanian/po/others.ro.po
index 1f5eac328fb..911cc5d5a55 100644
--- a/romanian/po/others.ro.po
+++ b/romanian/po/others.ro.po
@@ -167,28 +167,6 @@ msgstr ""
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-#, fuzzy
-msgid "Wanted:"
-msgstr "taxe:"
-
-#: ../../english/misc/hardware.def:22
-#, fuzzy
-msgid "Who:"
-msgstr "telefon:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr ""
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Produse"
@@ -233,24 +211,36 @@ msgstr "insigne"
msgid "basketball goals"
msgstr "co&#351;uri de basket"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "cercei"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "valize"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
#, fuzzy
#| msgid "suitcases"
msgid "pillowcases"
msgstr "valize"
+#: ../../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 ""
@@ -326,78 +316,86 @@ msgstr "versiune"
msgid "URL"
msgstr "adres&#259; pe internet"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
-
-#~ msgid "Previous Talks:"
-#~ msgstr "prezentarea anterioar&#259;"
-
-#~ msgid "Languages:"
-#~ msgstr "limbaje"
-
-#~ msgid "Location:"
-#~ msgstr "loca&#355;ie:"
+#~ msgid "Name:"
+#~ msgstr "nume:"
-#, fuzzy
-#~ msgid "Topics:"
-#~ msgstr "subiect:"
+#~ msgid "Company:"
+#~ msgstr "compania:"
-#~ msgid "Q"
-#~ msgstr "&#238;ntreb&#259;ri"
+#~ msgid "URL:"
+#~ msgstr "pagina pe internet:"
-#~ msgid "Debian GNU/Linux: Your next Linux distribution."
-#~ msgstr ""
-#~ "Debian GNU/Linux: dictribu&#355;ia dumneavoastr&#259; urm&#259;toare"
+#~ msgid "or"
+#~ msgstr "sau"
-#~ msgid "Debian: The Perfect OS"
-#~ msgstr "Debian: sistemul de operare perfect"
+#~ msgid "Email:"
+#~ msgstr "e-mail:"
-#~ msgid "Debian: The biggest is still the best."
-#~ msgstr "Debian: cel mai mare este &#238;nc&#259; cel mai bun."
+#~ msgid "Rates:"
+#~ msgstr "taxe:"
-#~ msgid "Older Debian banners"
-#~ msgstr "baner Debian mai vechi"
+#~ msgid "Willing to Relocate"
+#~ msgstr "dispus s&#259; se mute"
-#~ msgid "Debian: the potato has landed. announcing version 2.2"
-#~ msgstr "Debian: potato a aterizat, anun&#355;&#226;nd versiunea 2.2"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> consultan&#355;i Debian lista&#355;i &#238;n "
+#~ "<total_country> &#355;&#259;ri din &#238;ntreaga lume."
-#~ msgid "Debian: apt-get into it."
-#~ msgstr "Debian: apt-get acum."
+#~ msgid "Mailing List Subscription"
+#~ msgstr "subscrierea la liste de dicu&#355;ii"
-#~ msgid "Newer Debian banners"
-#~ msgstr "baner Debian mai nou"
+#~ 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. "
+#~ msgstr ""
+#~ "Vede&#355;i pagina <a href=\"./#subunsub\">listelor de discu&#355;ii</a> "
+#~ "pentru informa&#355;ii despre cum s&#259; v&#259; abona&#355;i folosind e-"
+#~ "mailul. O pagin&#259; <a href=\"unsubscribe\">web de dezabonare </a> este "
+#~ "de asemenea disponibil&#259;, pentru dezabonarea de la listele de "
+#~ "discu&#355;ii."
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "baner&nbsp;animat&nbsp;GIF"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr ""
+#~ "V&#259; rug&#259;m s&#259; selecta&#355;i ls ce liste dori&#355;i s&#259; "
+#~ "v&#259; abona&#355;i: "
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "baner&nbsp;orizontal"
+#~ msgid "No description given"
+#~ msgstr "F&#259;r&#259; descriere"
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "baner&nbsp;vertical"
+#~ msgid "Moderated:"
+#~ msgstr "moderat&#259;:"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "numai pentru comitetul tehnic Debian"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Numai abona&#355;ii pot posta mesaje."
-#~ msgid "deity developers only"
-#~ msgstr "numai pentru dezvoltatorii &#8222;deity&#8221;"
+#~ msgid "Subscription:"
+#~ msgstr "Abonare:"
-#~ msgid "developers only"
-#~ msgstr "numai pentru dezvoltatori"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "este numai pentru citire, versiune digest."
-#~ msgid "closed"
-#~ msgstr "&#238;nchis&#259;"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Adresa dumneavoastr&#259; de e-mail:"
-#~ msgid "open"
-#~ msgstr "deschis&#259;"
+#~ msgid "Subscribe"
+#~ msgstr "Abonare"
-#~ msgid "Unsubscribe"
-#~ msgstr "dezabonare"
+#~ msgid "Clear"
+#~ msgstr "&#350;terge"
-#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "V&#259; rug&#259;m s&#259; selecta&#355;i listele de la care vre&#355;i "
-#~ "s&#259; v&#259; dezabona&#355;i:"
+#~ "V&#259; rug&#259;m s&#259; respecta&#355;i <a href=\"./#ads\"> regulile "
+#~ "de publicitate a listelor de discu&#355;ii Debian</a>."
+
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "dezabonarea de la listele de discu&#355;ii"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
@@ -410,83 +408,83 @@ msgstr "adres&#259; pe internet"
#~ "a> este de asemenea disponibil&#259;, pentru abonarea la listele de "
#~ "discu&#355;ii."
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "dezabonarea de la listele de discu&#355;ii"
-
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
+#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr ""
-#~ "V&#259; rug&#259;m s&#259; respecta&#355;i <a href=\"./#ads\"> regulile "
-#~ "de publicitate a listelor de discu&#355;ii Debian</a>."
+#~ "V&#259; rug&#259;m s&#259; selecta&#355;i listele de la care vre&#355;i "
+#~ "s&#259; v&#259; dezabona&#355;i:"
-#~ msgid "Clear"
-#~ msgstr "&#350;terge"
+#~ msgid "Unsubscribe"
+#~ msgstr "dezabonare"
-#~ msgid "Subscribe"
-#~ msgstr "Abonare"
+#~ msgid "open"
+#~ msgstr "deschis&#259;"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Adresa dumneavoastr&#259; de e-mail:"
+#~ msgid "closed"
+#~ msgstr "&#238;nchis&#259;"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "este numai pentru citire, versiune digest."
+#~ msgid "developers only"
+#~ msgstr "numai pentru dezvoltatori"
-#~ msgid "Subscription:"
-#~ msgstr "Abonare:"
+#~ msgid "deity developers only"
+#~ msgstr "numai pentru dezvoltatorii &#8222;deity&#8221;"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Numai abona&#355;ii pot posta mesaje."
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "numai pentru comitetul tehnic Debian"
-#~ msgid "Moderated:"
-#~ msgstr "moderat&#259;:"
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "baner&nbsp;vertical"
-#~ msgid "No description given"
-#~ msgstr "F&#259;r&#259; descriere"
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "baner&nbsp;orizontal"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr ""
-#~ "V&#259; rug&#259;m s&#259; selecta&#355;i ls ce liste dori&#355;i s&#259; "
-#~ "v&#259; abona&#355;i: "
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "baner&nbsp;animat&nbsp;GIF"
-#~ 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. "
-#~ msgstr ""
-#~ "Vede&#355;i pagina <a href=\"./#subunsub\">listelor de discu&#355;ii</a> "
-#~ "pentru informa&#355;ii despre cum s&#259; v&#259; abona&#355;i folosind e-"
-#~ "mailul. O pagin&#259; <a href=\"unsubscribe\">web de dezabonare </a> este "
-#~ "de asemenea disponibil&#259;, pentru dezabonarea de la listele de "
-#~ "discu&#355;ii."
+#~ msgid "Newer Debian banners"
+#~ msgstr "baner Debian mai nou"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "subscrierea la liste de dicu&#355;ii"
+#~ msgid "Debian: apt-get into it."
+#~ msgstr "Debian: apt-get acum."
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ msgid "Debian: the potato has landed. announcing version 2.2"
+#~ msgstr "Debian: potato a aterizat, anun&#355;&#226;nd versiunea 2.2"
+
+#~ msgid "Older Debian banners"
+#~ msgstr "baner Debian mai vechi"
+
+#~ msgid "Debian: The biggest is still the best."
+#~ msgstr "Debian: cel mai mare este &#238;nc&#259; cel mai bun."
+
+#~ msgid "Debian: The Perfect OS"
+#~ msgstr "Debian: sistemul de operare perfect"
+
+#~ msgid "Debian GNU/Linux: Your next Linux distribution."
#~ msgstr ""
-#~ "<total_consultant> consultan&#355;i Debian lista&#355;i &#238;n "
-#~ "<total_country> &#355;&#259;ri din &#238;ntreaga lume."
+#~ "Debian GNU/Linux: dictribu&#355;ia dumneavoastr&#259; urm&#259;toare"
-#~ msgid "Willing to Relocate"
-#~ msgstr "dispus s&#259; se mute"
+#~ msgid "Q"
+#~ msgstr "&#238;ntreb&#259;ri"
-#~ msgid "Rates:"
-#~ msgstr "taxe:"
+#, fuzzy
+#~ msgid "Topics:"
+#~ msgstr "subiect:"
-#~ msgid "Email:"
-#~ msgstr "e-mail:"
+#~ msgid "Location:"
+#~ msgstr "loca&#355;ie:"
-#~ msgid "or"
-#~ msgstr "sau"
+#~ msgid "Languages:"
+#~ msgstr "limbaje"
-#~ msgid "URL:"
-#~ msgstr "pagina pe internet:"
+#~ msgid "Previous Talks:"
+#~ msgstr "prezentarea anterioar&#259;"
-#~ msgid "Company:"
-#~ msgstr "compania:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
-#~ msgid "Name:"
-#~ msgstr "nume:"
+#, fuzzy
+#~ msgid "Who:"
+#~ msgstr "telefon:"
+
+#, fuzzy
+#~ msgid "Wanted:"
+#~ msgstr "taxe:"
diff --git a/romanian/po/ports.ro.po b/romanian/po/ports.ro.po
index 7e4bf72cb3f..67498e261d9 100644
--- a/romanian/po/ports.ro.po
+++ b/romanian/po/ports.ro.po
@@ -113,47 +113,47 @@ msgstr "Debian pentru PowerPC"
msgid "Debian for Sparc"
msgstr "Debian pentru Sparc"
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD basata cu libc5"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian pentru laptop-uri"
-#~ msgid "Vendor/Name"
-#~ msgstr "v&#226;nz&#259;tor/nume"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian pentru AMD64"
-#~ msgid "Date announced"
-#~ msgstr "data anun&#355;at&#259;"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian pentru ARM"
-#~ msgid "Clock"
-#~ msgstr "ceas"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian pentru Beowulf"
-#~ msgid "Specials"
-#~ msgstr "speciale"
+#~ msgid "Main"
+#~ msgstr "Principal"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian pentru Sparc64"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian pentru S/390"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian pentru Motorola 680x0"
#~ msgid "Debian for MIPS"
#~ msgstr "Debian pentru MIPS"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian pentru Motorola 680x0"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian pentru S/390"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian pentru Sparc64"
-#~ msgid "Main"
-#~ msgstr "Principal"
+#~ msgid "Specials"
+#~ msgstr "speciale"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian pentru Beowulf"
+#~ msgid "Clock"
+#~ msgstr "ceas"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian pentru ARM"
+#~ msgid "Date announced"
+#~ msgstr "data anun&#355;at&#259;"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian pentru AMD64"
+#~ msgid "Vendor/Name"
+#~ msgstr "v&#226;nz&#259;tor/nume"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian pentru laptop-uri"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD basata cu libc5"
diff --git a/romanian/po/templates.ro.po b/romanian/po/templates.ro.po
index f120b99a0f4..6325f194e75 100644
--- a/romanian/po/templates.ro.po
+++ b/romanian/po/templates.ro.po
@@ -14,7 +14,6 @@ msgstr ""
"X-Generator: Lokalize 1.5\n"
#: ../../english/search.xml.in:7
-#| msgid "Debian Project"
msgid "Debian website"
msgstr "Proiectul Debian"
@@ -24,7 +23,6 @@ msgstr "Caută în site-ul Debian."
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
-#| msgid "Help Debian"
msgid "Debian"
msgstr "Debian"
@@ -45,10 +43,6 @@ msgid "Debian Project"
msgstr "Proiectul Debian"
#: ../../english/template/debian/common_translation.wml:13
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -67,7 +61,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Înapoi la <a href=\"m4_HOME/\">pagina principală Debian</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 "Acasă"
@@ -108,7 +102,7 @@ msgid "Support"
msgstr "Suport"
#: ../../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 "Colțul programatorilor"
@@ -145,12 +139,11 @@ 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 "Obțineți Debian"
#: ../../english/template/debian/common_translation.wml:82
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "Blogul Debian"
@@ -159,9 +152,9 @@ msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
"to our <a href=\"mailto:debian-doc@lists.debian.org\">mailing list</a>."
msgstr ""
-"Vă rugăm să trimiteți toate comentariile, criticile "
-"și sugestiile despre aceste pagini la <a href=\"mailto:debian-doc@lists."
-"debian.org\">lista noastră de e-mail</a>."
+"Vă rugăm să trimiteți toate comentariile, criticile și sugestiile despre "
+"aceste pagini la <a href=\"mailto:debian-doc@lists.debian.org\">lista "
+"noastră de e-mail</a>."
#: ../../english/template/debian/fixes_link.wml:11
msgid "not needed"
@@ -200,7 +193,7 @@ msgstr "în versiunea 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 "
@@ -208,33 +201,30 @@ msgid ""
"Web site source code is <a href=\"m4_HOME/devel/website/using_cvs"
"\">available</a>."
msgstr ""
-"Pentru a raporta o problemă cu site-ul web, trimiteți un e-mail la <a "
-"href=\"mailto:debian-"
-"www@lists.debian.org\">debian-www@lists.debian.org</a>. Pentru alte "
-"informații de contact, "
-"vedeți <a href=\"m4_HOME/contact\">pagina de contact</a> Debian. "
-"Codul sursă al site-ului este <a href=\"m4_HOME/devel/website/using_cvs"
-"\">disponibil</a>."
-
-#: ../../english/template/debian/footer.wml:99
+"Pentru a raporta o problemă cu site-ul web, trimiteți un e-mail la <a href="
+"\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</a>. "
+"Pentru alte informații de contact, vedeți <a href=\"m4_HOME/contact\">pagina "
+"de contact</a> Debian. Codul sursă al site-ului este <a href=\"m4_HOME/devel/"
+"website/using_cvs\">disponibil</a>."
+
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Ultima modificare"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Drepturi de autor"
-#: ../../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> și alții;"
-#: ../../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 ""
-"Vedeți <a href=\"m4_HOME/license\" rel=\"copyright\">termenii "
-"licenței</a>."
+"Vedeți <a href=\"m4_HOME/license\" rel=\"copyright\">termenii licenței</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."
@@ -250,8 +240,8 @@ msgstr "Această pagină mai este disponibilă în următoarele limbi:"
#: ../../english/template/debian/languages.wml:265
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
-"Cum să configurați <a href=m4_HOME/intro/cn>limba predefinită a documentului<"
-"/a>"
+"Cum să configurați <a href=m4_HOME/intro/cn>limba predefinită a "
+"documentului</a>"
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
@@ -270,12 +260,10 @@ msgid "Weekly News"
msgstr "Știri săptămânale"
#: ../../english/template/debian/links.tags.wml:16
-#| msgid "Debian Project"
msgid "Debian Project News"
msgstr "Știri Proiectul Debian"
#: ../../english/template/debian/links.tags.wml:19
-#| msgid "Weekly News"
msgid "Project News"
msgstr "Știri ale proiectului"
@@ -300,145 +288,153 @@ msgid "Debian Books"
msgstr "Cărți Debian"
#: ../../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 "Arhivele listelor de discuții"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Liste de discuții"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Contractul social"
-#: ../../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 "Vizitați sponsorii"
-#: ../../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 - Sistemul de operare universal"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Planul paginilor web Debian"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Baza de date a programatorilor"
-#: ../../english/template/debian/links.tags.wml:61
-#| msgid "Debian Books"
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr "Întrebări frecvente Debian"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Manualul de procedură Debian"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Manualul de referință pentru dezvoltatorii de pachete"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Ghidul noului responsabil (maintainer)"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Defecte critice"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Rapoarte Lintian"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Archivele pentru listele de discuții ale utilizatorilor"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Arhivele pentru listele de discuții ale dezvoltatorilor"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Arhivele pentru listele de i18n/l10n"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Arhivele pentru listele de discuții referitoare la portări"
-#: ../../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 ""
"Arhive pentru listele de discuții ale sistemului de urmărire a defectelor"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Arhivele pentru listele de discuții „diverse”"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Software Liber"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Dezvoltare"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Ajutați Debian"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Rapoarte de erori"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Portări/Arhitecturi"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Manuale de instalare"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Distribuitori de CD-uri"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "Imagini ISO de CD/USB"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Instalare prin rețea"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Sisteme preinstalate"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Proiectul Debian-Edu"
-#: ../../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 "Controlul calității"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Sistemul de urmărire a pachetelor"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Sumarul pachetelor unui dezvoltator Debian"
#: ../../english/template/debian/navbar.wml:10
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "Debian Acasă"
@@ -501,8 +497,8 @@ msgid ""
"Warning! This translation is too out of date, please see the <a href=\"$link"
"\">original</a>."
msgstr ""
-"Avertisment! Această traducere este prea veche, vă rugăm să vedeți <a "
-"href=\"$link\">originalul</a>."
+"Avertisment! Această traducere este prea veche, vă rugăm să vedeți <a href="
+"\"$link\">originalul</a>."
#: ../../english/template/debian/translation-check.wml:49
msgid ""
@@ -517,223 +513,129 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Înapoi la pagina <a href=\"./\">Cine utilizează Debian?</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "Lista consultan&#355;ilor"
-
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "&#206;napoi la <a href=\"./\">pagina consultan&#355;ilor</a>."
-
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
-
-#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "desc&#259;rcare cu jigdo"
-
-#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "desc&#259;rcare prin http/ftp"
-
-#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "Instalare prin re&#355;ea"
+#~ msgid "Select a server near you"
+#~ msgstr "Alege&#355;i un server apropiat"
-#, fuzzy
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_faq\" />faq"
+#~ msgid "More information:"
+#~ msgstr "Mai multe informa&#355;ii:"
-#, fuzzy
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />diverse"
+#~ msgid "Taken by:"
+#~ msgstr "Luat&#259; &#238;n grij&#259; de:"
-#, fuzzy
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_faq\" />faq"
+#~ msgid "Nobody"
+#~ msgstr "Nimeni"
-#, fuzzy
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_misc\" />diverse"
+#~ msgid "Rating:"
+#~ msgstr "Cotare:"
-#, fuzzy
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_misc\" />diverse"
+#~ msgid "More information"
+#~ msgstr "Mai multe informa&#355;ii"
-#~ msgid "Debian CD team"
-#~ msgstr "Echipa Debian CD"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Evenimente viitoare"
-#~ msgid "debian_on_cd"
-#~ msgstr "Debian pe CD"
+#~ msgid "link may no longer be valid"
+#~ msgstr "trimiterea poate nu mai este valid&#259;"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "When"
+#~ msgstr "C&#238;nd"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Where"
+#~ msgstr "Unde"
-#~ msgid "http_ftp"
-#~ msgstr "http/ftp"
+#~ msgid "More Info"
+#~ msgstr "Informa&#355;ii suplimentare"
-#~ msgid "buy"
-#~ msgstr "cump&#259;ra&#355;i"
+#~ msgid "Debian Involvement"
+#~ msgstr "Implicarea Debian"
-#~ msgid "net_install"
-#~ msgstr "instalare de pe internet"
+#~ msgid "Main Coordinator"
+#~ msgstr "Coordonatorul principal"
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />diverse"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Coordonatorul de</th><th>proiect</th>"
-#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Dona&#355;ii"
+#~ msgid "Related Links"
+#~ msgstr "Link-uri interesante"
-#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Echipa Debian CD"
+#~ msgid "Latest News"
+#~ msgstr "Ultimele &#351;tiri"
-#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "propuse"
+#~ msgid "Download calendar entry"
+#~ msgstr "Desc&#259;rca&#355;i calendarul"
#, fuzzy
-#~ msgid "Minimum Discussion"
-#~ msgstr "&#206;n discu&#355;ie"
-
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "A&#351;tept&#226;nd sponsorii"
-
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "&#206;n discu&#355;ie"
-
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Vot deschis"
-
-#~ msgid "Decided"
-#~ msgstr "Decis"
-
-#~ msgid "Withdrawn"
-#~ msgstr "Retras"
-
-#~ msgid "Other"
-#~ msgstr "Altele"
-
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Pagina de vot"
-
-#~ msgid "How&nbsp;To"
-#~ msgstr "Cum&nbsp;s&#259;"
-
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Propune&#355;i"
-
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Amenda&#355;i propunerea"
-
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Urm&#259;ri&#355;i propunerea"
-
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Citi&#355;i rezultatul"
-
-#~ msgid "Vote"
-#~ msgstr "Vota&#355;i"
-
-#~ msgid "Debian on CD"
-#~ msgstr "CD-uri cu Debian"
-
-#~ msgid "discussed"
-#~ msgstr "discutate"
-
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "&#206;napoi la alte <a href=\"./\">&#351;tiri Debian</a>."
-
#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
#~ msgstr ""
-#~ "Vede&#355;i <a href=\"m4_HOME/contact\">pagina de contacte</a> Debian "
-#~ "pentru mai multe informa&#355;ii."
-
-#~ msgid "network install"
-#~ msgstr "instalare de pe internet"
-
-#~ msgid "buy pre-made images"
-#~ msgstr "cump&#259;ra&#355;i imagini ISO pre-alc&#259;tuite"
-
-#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "nimic"
-
-#, fuzzy
-#~ msgid "Discussion"
-#~ msgstr "&#206;n discu&#355;ie"
-
-#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Mai multe informa&#355;ii"
-
-#, fuzzy
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_misc\" />diverse"
+#~ "&#206;napoi la <a href=\"m4_HOME/\">pagina principal&#259; Debian</a>."
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "Mai multe informa&#355;ii"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (leg&#259;tur&#259; inexistent)"
#, 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 ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
#~ msgstr ""
-#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ "Pentru a primi &#351;tiri s&#259;pt&#259;minale <a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">subscrie&#355;i</a> la lista de mail "
+#~ "debian-news."
+
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "<a href=\"../../\">Edi&#355;ii mai vechi</a> ale acestor &#351;tiri sunt "
+#~ "disponibile"
#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "<void id=\"singular\" />Debian Weekly News este editat&#259; de c&#259;"
#~ "tre <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 Weekly News is 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 ""
#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <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>."
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
#~ "<void id=\"singular\" />Debian Weekly News este editat&#259; de c&#259;"
#~ "tre <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 ""
-#~ "Pentru a primi &#351;tiri s&#259;pt&#259;minale <a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">subscrie&#355;i</a> la lista de mail "
-#~ "debian-news."
-
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "&#206;napoi la <a href=\"./\">pahina Debian a vorbitorilor</a>."
-
-#~ msgid "List of Speakers"
-#~ msgstr "Lista de vorbitori"
-
#, fuzzy
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
#~ msgstr ""
-#~ "<void id=\"pluralfemale\" />Acest exemplar de &#351;tiri s&#259;pt&#259;"
-#~ "m&#226;nale Debian a fost tradus de %s"
+#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
#, fuzzy
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgid "<void id=\"singular\" />It was translated by %s."
#~ msgstr ""
#~ "<void id=\"singular\" />Acest exemplar de &#351;tiri s&#259;pt&#259;"
-#~ "m&#226;nale Debian a fost tradus de %s"
+#~ "m&#226;nale Debian a fost tradus de %s."
#, fuzzy
#~ msgid "<void id=\"plural\" />It was translated by %s."
@@ -742,125 +644,219 @@ msgstr "Înapoi la pagina <a href=\"./\">Cine utilizează Debian?</a>."
#~ "nale Debian a fost tradus de %s."
#, fuzzy
-#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
#~ msgstr ""
#~ "<void id=\"singular\" />Acest exemplar de &#351;tiri s&#259;pt&#259;"
-#~ "m&#226;nale Debian a fost tradus de %s."
+#~ "m&#226;nale Debian a fost tradus de %s"
#, fuzzy
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr ""
+#~ "<void id=\"pluralfemale\" />Acest exemplar de &#351;tiri s&#259;pt&#259;"
+#~ "m&#226;nale Debian a fost tradus de %s"
+
+#~ msgid "List of Speakers"
+#~ msgstr "Lista de vorbitori"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "&#206;napoi la <a href=\"./\">pahina Debian a vorbitorilor</a>."
+
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"http://lists."
+#~ "debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
#~ msgstr ""
-#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ "Pentru a primi &#351;tiri s&#259;pt&#259;minale <a href=\"m4_HOME/"
+#~ "MailingLists/subscribe#debian-news\">subscrie&#355;i</a> la lista de mail "
+#~ "debian-news."
-#, 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\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "<void id=\"singular\" />Debian Weekly News este editat&#259; de c&#259;"
#~ "tre <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\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
#~ "\"mailto:dwn@debian.org\">%s</a>."
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
#~ "<void id=\"singular\" />Debian Weekly News este editat&#259; de c&#259;"
#~ "tre <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "<a href=\"../../\">Edi&#355;ii mai vechi</a> ale acestor &#351;tiri sunt "
-#~ "disponibile"
-
#, 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>."
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "Pentru a primi &#351;tiri s&#259;pt&#259;minale <a href=\"m4_HOME/"
-#~ "MailingLists/subscribe#debian-news\">subscrie&#355;i</a> la lista de mail "
-#~ "debian-news."
+#~ "&#350;tirile s&#259;pt&#259;m&#226;nale Debian sunt editate de <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (leg&#259;tur&#259; inexistent)"
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "Mai multe informa&#355;ii"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_misc\" />diverse"
+
+#, fuzzy
+#~ msgid "License Information"
+#~ msgstr "Mai multe informa&#355;ii"
#, fuzzy
+#~ msgid "Discussion"
+#~ msgstr "&#206;n discu&#355;ie"
+
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "nimic"
+
+#~ msgid "buy pre-made images"
+#~ msgstr "cump&#259;ra&#355;i imagini ISO pre-alc&#259;tuite"
+
+#~ msgid "network install"
+#~ msgstr "instalare de pe internet"
+
#~ 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 ""
-#~ "&#206;napoi la <a href=\"m4_HOME/\">pagina principal&#259; Debian</a>."
+#~ "Vede&#355;i <a href=\"m4_HOME/contact\">pagina de contacte</a> Debian "
+#~ "pentru mai multe informa&#355;ii."
-#~ msgid "Download calendar entry"
-#~ msgstr "Desc&#259;rca&#355;i calendarul"
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "&#206;napoi la alte <a href=\"./\">&#351;tiri Debian</a>."
-#~ msgid "Latest News"
-#~ msgstr "Ultimele &#351;tiri"
+#~ msgid "discussed"
+#~ msgstr "discutate"
-#~ msgid "Related Links"
-#~ msgstr "Link-uri interesante"
+#~ msgid "Debian on CD"
+#~ msgstr "CD-uri cu Debian"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Coordonatorul de</th><th>proiect</th>"
+#~ msgid "Vote"
+#~ msgstr "Vota&#355;i"
-#~ msgid "Main Coordinator"
-#~ msgstr "Coordonatorul principal"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Citi&#355;i rezultatul"
-#~ msgid "Debian Involvement"
-#~ msgstr "Implicarea Debian"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Urm&#259;ri&#355;i propunerea"
-#~ msgid "More Info"
-#~ msgstr "Informa&#355;ii suplimentare"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Amenda&#355;i propunerea"
-#~ msgid "Where"
-#~ msgstr "Unde"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Propune&#355;i"
-#~ msgid "When"
-#~ msgstr "C&#238;nd"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Cum&nbsp;s&#259;"
-#~ msgid "link may no longer be valid"
-#~ msgstr "trimiterea poate nu mai este valid&#259;"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Pagina de vot"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Evenimente viitoare"
+#~ msgid "Other"
+#~ msgstr "Altele"
-#~ msgid "More information"
-#~ msgstr "Mai multe informa&#355;ii"
+#~ msgid "Withdrawn"
+#~ msgstr "Retras"
-#~ msgid "Rating:"
-#~ msgstr "Cotare:"
+#~ msgid "Decided"
+#~ msgstr "Decis"
-#~ msgid "Nobody"
-#~ msgstr "Nimeni"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Vot deschis"
-#~ msgid "Taken by:"
-#~ msgstr "Luat&#259; &#238;n grij&#259; de:"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "&#206;n discu&#355;ie"
-#~ msgid "More information:"
-#~ msgstr "Mai multe informa&#355;ii:"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "A&#351;tept&#226;nd sponsorii"
-#~ msgid "Select a server near you"
-#~ msgstr "Alege&#355;i un server apropiat"
+#, fuzzy
+#~ msgid "Minimum Discussion"
+#~ msgstr "&#206;n discu&#355;ie"
+
+#, fuzzy
+#~ msgid "Proposer"
+#~ msgstr "propuse"
+
+#, fuzzy
+#~ msgid "Debate"
+#~ msgstr "Echipa Debian CD"
+
+#, fuzzy
+#~ msgid "Nominations"
+#~ msgstr "Dona&#355;ii"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />diverse"
+
+#~ msgid "net_install"
+#~ msgstr "instalare de pe internet"
+
+#~ msgid "buy"
+#~ msgstr "cump&#259;ra&#355;i"
+
+#~ 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 pe CD"
+
+#~ msgid "Debian CD team"
+#~ msgstr "Echipa Debian CD"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_misc\" />diverse"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_misc\" />diverse"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_faq\" />faq"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />diverse"
+
+#, fuzzy
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_faq\" />faq"
+
+#, fuzzy
+#~ msgid "Network Install"
+#~ msgstr "Instalare prin re&#355;ea"
+
+#, fuzzy
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "desc&#259;rcare prin http/ftp"
+
+#, fuzzy
+#~ msgid "Download with Jigdo"
+#~ msgstr "desc&#259;rcare cu jigdo"
+
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "&#206;napoi la <a href=\"./\">pagina consultan&#355;ilor</a>."
+
+#~ msgid "List of Consultants"
+#~ msgstr "Lista consultan&#355;ilor"
diff --git a/romanian/po/vendors.ro.po b/romanian/po/vendors.ro.po
index f1e6080c615..5a7ff0f5ee0 100644
--- a/romanian/po/vendors.ro.po
+++ b/romanian/po/vendors.ro.po
@@ -9,150 +9,141 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Distribuitor:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL-ul pentru pagina Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Permite contribu&#355;ii la Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "&#354;ar&#259;:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Livreaz&#259; interna&#355;ional:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "e-mail:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Tip de CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Tip de DVD"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Arhitecturi:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
#, fuzzy
#| msgid "Vendor:"
msgid "Vendor"
msgstr "Distribuitor:"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
#, fuzzy
#| msgid "Allows Contribution to Debian:"
msgid "Allows Contributions"
msgstr "Permite contribu&#355;ii la Debian:"
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
#, fuzzy
#| msgid "Architectures:"
msgid "Architectures"
msgstr "Arhitecturi:"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
#, fuzzy
#| msgid "Ship International:"
msgid "Ship International"
msgstr "Livreaz&#259; interna&#355;ional:"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr ""
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:54
+#: ../../english/CD/vendors/vendors.CD.def:44
#, fuzzy
#| msgid "Vendor:"
msgid "Vendor Home"
msgstr "Distribuitor:"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
#, fuzzy
#| msgid "email:"
msgid "email"
msgstr "e-mail:"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "&#238;n Europa"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "&#238;n unele zone"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "surs&#259;"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "&#351;i"
-#~ msgid "Official CD"
-#~ msgstr "CD oficial"
+#~ msgid "updated monthly"
+#~ msgstr "actualizat&#259; lunar"
-#, fuzzy
-#~ msgid "Official DVD"
-#~ msgstr "CD oficial"
+#~ msgid "updated twice weekly"
+#~ msgstr "actualizat&#259; de dou&#259; ori pe s&#259;pt&#259;m&#226;n&#259;"
-#~ msgid "Development Snapshot"
-#~ msgstr "Versiunea &#238;n dezvoltare"
+#~ msgid "updated weekly"
+#~ msgstr "actualizat&#259; s&#259;pt&#259;m&#226;nal"
-#~ msgid "Vendor Release"
-#~ msgstr "Versiune specific&#259; distribuitorului"
+#~ msgid "reseller"
+#~ msgstr "re-v&#226;nz&#259;tor"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Distribu&#355;ie multipl&#259;"
+#~ msgid "reseller of $var"
+#~ msgstr "re-v&#226;nz&#259;tor de $var"
-#~ msgid "non-US included"
-#~ msgstr "non-US inclus"
+#~ msgid "Custom Release"
+#~ msgstr "Versiune special&#259; pentru client"
-#~ msgid "non-free included"
-#~ msgstr "non-free inclus"
+#~ msgid "vendor additions"
+#~ msgstr "adaosurile distribuitorului"
#~ msgid "contrib included"
#~ msgstr "contribu&#355;ii incluse"
-#~ msgid "vendor additions"
-#~ msgstr "adaosurile distribuitorului"
+#~ msgid "non-free included"
+#~ msgstr "non-free inclus"
-#~ msgid "Custom Release"
-#~ msgstr "Versiune special&#259; pentru client"
+#~ msgid "non-US included"
+#~ msgstr "non-US inclus"
-#~ msgid "reseller of $var"
-#~ msgstr "re-v&#226;nz&#259;tor de $var"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Distribu&#355;ie multipl&#259;"
-#~ msgid "reseller"
-#~ msgstr "re-v&#226;nz&#259;tor"
+#~ msgid "Vendor Release"
+#~ msgstr "Versiune specific&#259; distribuitorului"
-#~ msgid "updated weekly"
-#~ msgstr "actualizat&#259; s&#259;pt&#259;m&#226;nal"
+#~ msgid "Development Snapshot"
+#~ msgstr "Versiunea &#238;n dezvoltare"
-#~ msgid "updated twice weekly"
-#~ msgstr "actualizat&#259; de dou&#259; ori pe s&#259;pt&#259;m&#226;n&#259;"
+#, fuzzy
+#~ msgid "Official DVD"
+#~ msgstr "CD oficial"
-#~ msgid "updated monthly"
-#~ msgstr "actualizat&#259; lunar"
+#~ msgid "Official CD"
+#~ msgstr "CD oficial"
+
+#~ msgid "Architectures:"
+#~ msgstr "Arhitecturi:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Tip de DVD"
+
+#~ msgid "CD Type:"
+#~ msgstr "Tip de CD:"
+
+#~ msgid "email:"
+#~ msgstr "e-mail:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Livreaz&#259; interna&#355;ional:"
+
+#~ msgid "Country:"
+#~ msgstr "&#354;ar&#259;:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Permite contribu&#355;ii la Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL-ul pentru pagina Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Distribuitor:"
diff --git a/romanian/po/vote.ro.po b/romanian/po/vote.ro.po
index 85e724ebc4e..64983490474 100644
--- a/romanian/po/vote.ro.po
+++ b/romanian/po/vote.ro.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 "Dona&#355;ii"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
#, fuzzy
msgid "Debate"
msgstr "Echipa Debian CD"
-#: ../../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 "propuse"
-#: ../../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 "&#206;n discu&#355;ie"
-#: ../../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 "A&#351;tept&#226;nd sponsorii"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "&#206;n discu&#355;ie"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Vot deschis"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Decis"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Retras"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Altele"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Pagina de vot"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Cum&nbsp;s&#259;"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Propune&#355;i"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Amenda&#355;i propunerea"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Urm&#259;ri&#355;i propunerea"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Citi&#355;i rezultatul"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Vota&#355;i"
diff --git a/russian/po/cdimage.ru.po b/russian/po/cdimage.ru.po
index 68dcf33f05f..e2eec743034 100644
--- a/russian/po/cdimage.ru.po
+++ b/russian/po/cdimage.ru.po
@@ -16,18 +16,16 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 "Отпечаток ключа"
-#: ../../english/devel/debian-installer/images.data:90
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "Образы ISO"
-#: ../../english/devel/debian-installer/images.data:91
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "Файлы jidgo"
diff --git a/russian/po/distrib.ru.po b/russian/po/distrib.ru.po
index 137baa62e7b..61fefd500b3 100644
--- a/russian/po/distrib.ru.po
+++ b/russian/po/distrib.ru.po
@@ -202,23 +202,23 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "Intel x86"
+#~ msgstr "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 "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
diff --git a/russian/po/doc.ru.po b/russian/po/doc.ru.po
index d2aa8fb44eb..6f366ecf85f 100644
--- a/russian/po/doc.ru.po
+++ b/russian/po/doc.ru.po
@@ -16,123 +16,6 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Автор:"
-
-#: ../../english/doc/books.def:41
-msgid "email:"
-msgstr "Эл. адрес:"
-
-#: ../../english/doc/books.def:45
-msgid "Available at:"
-msgstr "Доступно на:"
-
-#: ../../english/doc/books.def:48
-msgid "CD Included:"
-msgstr "Прилагается CD:"
-
-#: ../../english/doc/books.def:51
-msgid "Publisher:"
-msgstr "Издатель:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Авторы:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Редакторы:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Сопровождающий:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Состояние:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Доступность:"
-
-#: ../../english/doc/manuals.defs:92
-msgid "Latest version:"
-msgstr "Последняя версия:"
-
-#: ../../english/doc/manuals.defs:108
-msgid "(version <get-var version />)"
-msgstr "(версия <get-var version />)"
-
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
-msgid "plain text"
-msgstr "простой текст"
-
-#: ../../english/doc/manuals.defs:154
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
-msgstr ""
-"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
-"href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
-
-#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
-msgid "Web interface: "
-msgstr "Веб-интерфейс: "
-
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
-msgid "VCS interface: "
-msgstr "VCS-интерфейс: "
-
-#: ../../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 ""
-"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
-"href=\"https://packages.debian.org/cvs\">Cvs</a>."
-
-#: ../../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 ""
-"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
-"href=\"https://packages.debian.org/subversion\">Subversion</a>."
-
-#: ../../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 ""
-"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
-"href=\"https://packages.debian.org/git\">Git</a>."
-
-#: ../../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"
-" and check out the <kbd>boot-floppies/documentation</kbd> module."
-msgstr ""
-"Чтобы создать рабочую копию исходных текстов из CVS, установите значение "
-"<code>CVSROOT</code>\n"
-" в <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-" и извлеките модуль <kbd>boot-floppies/documentation</kbd>."
-
-#: ../../english/doc/manuals.defs:193
-msgid "CVS via web"
-msgstr "Web-интерфейс CVS"
-
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
-msgid "Debian package"
-msgstr "Пакет Debian"
-
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
-msgid "Debian package (archived)"
-msgstr "Пакет Debian (архив)"
-
#: ../../english/doc/books.data:32
msgid ""
"\n"
@@ -645,6 +528,123 @@ msgstr ""
"руководство по достижению конкретных целей с операционной системой Debian "
"GNU/Linux."
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Автор:"
+
+#: ../../english/doc/books.def:41
+msgid "email:"
+msgstr "Эл. адрес:"
+
+#: ../../english/doc/books.def:45
+msgid "Available at:"
+msgstr "Доступно на:"
+
+#: ../../english/doc/books.def:48
+msgid "CD Included:"
+msgstr "Прилагается CD:"
+
+#: ../../english/doc/books.def:51
+msgid "Publisher:"
+msgstr "Издатель:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Авторы:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Редакторы:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Сопровождающий:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Состояние:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Доступность:"
+
+#: ../../english/doc/manuals.defs:92
+msgid "Latest version:"
+msgstr "Последняя версия:"
+
+#: ../../english/doc/manuals.defs:108
+msgid "(version <get-var version />)"
+msgstr "(версия <get-var version />)"
+
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
+msgid "plain text"
+msgstr "простой текст"
+
+#: ../../english/doc/manuals.defs:154
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+msgstr ""
+"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
+"href=\"https://www.debian.org/doc/cvs\">Subversion</a>."
+
+#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
+#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+msgid "Web interface: "
+msgstr "Веб-интерфейс: "
+
+#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+msgid "VCS interface: "
+msgstr "VCS-интерфейс: "
+
+#: ../../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 ""
+"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
+"href=\"https://packages.debian.org/cvs\">Cvs</a>."
+
+#: ../../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 ""
+"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
+"href=\"https://packages.debian.org/subversion\">Subversion</a>."
+
+#: ../../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 ""
+"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
+"href=\"https://packages.debian.org/git\">Git</a>."
+
+#: ../../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"
+" and check out the <kbd>boot-floppies/documentation</kbd> module."
+msgstr ""
+"Чтобы создать рабочую копию исходных текстов из CVS, установите значение "
+"<code>CVSROOT</code>\n"
+" в <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+" и извлеките модуль <kbd>boot-floppies/documentation</kbd>."
+
+#: ../../english/doc/manuals.defs:193
+msgid "CVS via web"
+msgstr "Web-интерфейс CVS"
+
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+msgid "Debian package"
+msgstr "Пакет Debian"
+
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+msgid "Debian package (archived)"
+msgstr "Пакет Debian (архив)"
+
#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
@@ -653,16 +653,6 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
-#~ msgid "Language:"
-#~ msgstr "Язык:"
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Чтобы получить исходный текст <get-var ddp_pkg_loc /> в формате SGML,"
-#~ "используйте <a href=\"cvs\">SVN</a>."
-
#~ msgid ""
#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
#~ "mode=viewone&amp;titnr=254925022\">\n"
@@ -675,3 +665,13 @@ msgstr "PDF"
#~ "titnr=254925022\">\n"
#~ " публикация</a> доступна от Lehmanns Fachbuchhandlung, и стоит 29.95\n"
#~ " &euro; (по состоянию на 2008 год)."
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Чтобы получить исходный текст <get-var ddp_pkg_loc /> в формате SGML,"
+#~ "используйте <a href=\"cvs\">SVN</a>."
+
+#~ msgid "Language:"
+#~ msgstr "Язык:"
diff --git a/russian/po/mailinglists.ru.po b/russian/po/mailinglists.ru.po
index 1206e737e32..c5c1c4150cd 100644
--- a/russian/po/mailinglists.ru.po
+++ b/russian/po/mailinglists.ru.po
@@ -135,8 +135,8 @@ msgstr "открытая"
msgid "closed"
msgstr "закрытая"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Выберите списки рассылки на которые вы хотели бы подписаться:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "выберите списки от которых вы хотите отписаться:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Выберите списки рассылки на которые вы хотели бы подписаться:"
diff --git a/russian/po/organization.ru.po b/russian/po/organization.ru.po
index ad34759b45a..0b0b4807e97 100644
--- a/russian/po/organization.ru.po
+++ b/russian/po/organization.ru.po
@@ -79,17 +79,17 @@ msgid "Officers"
msgstr "Руководство"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:79
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Дистрибутив"
#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:221
+#: ../../english/intro/organization.data:220
msgid "Publicity"
msgstr "Связи с общественностью"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Поддержка и инфраструктура"
@@ -106,191 +106,191 @@ msgstr "Лидер"
msgid "Technical Committee"
msgstr "Технический Комитет"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Секретарь"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Проекты"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP-архив"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "Менеджер FTP-архива"
-#: ../../english/intro/organization.data:89
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Помощники менеджера FTP-архива"
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "Мастера настройки FTP"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Команда Backports"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Отдельные пакеты"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Управление выпусками"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Команда подготовки выпуска"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Контроль качества"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Команда создания системы установки"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Информация о выпусках"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Образы CD"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Производство"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Тестирование"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Инфраструктура автоматической сборки"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Команда поддержки wanna-build"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Управление buildd"
-#: ../../english/intro/organization.data:167
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Документация"
-#: ../../english/intro/organization.data:172
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Список нуждающихся в доработке и будущих пакетов"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Команда подготовки Live-выпуска"
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Переносы"
-#: ../../english/intro/organization.data:211
+#: ../../english/intro/organization.data:210
msgid "Special Configurations"
msgstr "Особые варианты"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:213
msgid "Laptops"
msgstr "Переносные компьютеры"
-#: ../../english/intro/organization.data:215
+#: ../../english/intro/organization.data:214
msgid "Firewalls"
msgstr "Брандмауэры"
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:215
msgid "Embedded systems"
msgstr "Встроенные системы"
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:223
msgid "Press Contact"
msgstr "Связи с прессой"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:229
msgid "Partner Program"
msgstr "Партнёрская программа"
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "События"
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Bits from Debian"
-#: ../../english/intro/organization.data:248
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Поддержка пользователей"
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Система отслеживания ошибок"
-#: ../../english/intro/organization.data:320
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Администрирование и архивы списков рассылки"
-#: ../../english/intro/organization.data:328
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Регистрационный стол новых членов"
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Управление учётными записями Debian"
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Сопровождающие сети ключей (PGP и GPG)"
-#: ../../english/intro/organization.data:343
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Сопровождающие связки ключей Сопровождающих Debian (DM)"
-#: ../../english/intro/organization.data:347
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Команда безопасности"
-#: ../../english/intro/organization.data:362
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Web-страницы"
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Консультанты"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Поставщики CD"
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Планета Debian"
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Политика"
-#: ../../english/intro/organization.data:386
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Администрирование систем"
-#: ../../english/intro/organization.data:387
+#: ../../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."
@@ -299,7 +299,7 @@ msgstr ""
"Debian, в том числе проблем с паролями или при необходимости установки "
"пакета."
-#: ../../english/intro/organization.data:397
+#: ../../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 "
@@ -309,120 +309,119 @@ msgstr ""
"страницу <a href=\"https://db.debian.org/machines.cgi\">Машины Debian</a>. "
"Там должна быть информация об администраторе каждой конкретной машины."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Администратор каталога разработчиков LDAP"
-#: ../../english/intro/organization.data:399
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Зеркала"
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Сопровождающий DNS"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Система отслеживания пакетов"
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Координация пожертвования аппаратным обеспечением"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Контролёр"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:413
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Запросы по использованию <a name=\"trademark\" href=\"m4_HOME/trademark"
"\">торговой марки</a>"
-#: ../../english/intro/organization.data:417
-msgid "current Debian Project Leader"
-msgstr "текущий Лидер Проекта Debian"
-
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Администраторы Alioth"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Женщины в проекте Debian"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "Председатели DebConf"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Борьба с притеснениями"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:436
msgid "Outreach"
msgstr "Агитационная компания"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:446
msgid "Debian for children from 1 to 99"
msgstr "Debian для детей от 1 до 99"
-#: ../../english/intro/organization.data:452
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian в медицинской практике и исследованиях"
-#: ../../english/intro/organization.data:455
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian в образовании"
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian в юридической конторе"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian для людей с ограниченными возможностями"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian в науке и связанных исследованиях"
-#~ msgid "Summer of Code 2013 Administrators"
-#~ msgstr "Администраторы Summer of Code 2013"
+#~ msgid "Testing Security Team"
+#~ msgstr "Команда безопасности тестируемого дистрибутива"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian в некоммерческих организациях"
+#~ msgid "Security Audit Project"
+#~ msgstr "Проект всесторонней проверки безопасности"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Универсальная операционная система на настольном компьютере"
+#~ msgid "Volatile Team"
+#~ msgstr "Команда поддержки часто меняющихся частей дистрибутива (volatile)"
-#~ msgid "Accountant"
-#~ msgstr "Учётные записи"
+#~ msgid "Vendors"
+#~ msgstr "Поставщики"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Координация подписи ключей"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Пользовательские дистрибутивы Debian"
-#~ msgid "Marketing Team"
-#~ msgstr "Команда работы с рынком"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Команда подготовки стабильного выпуска"
#~ msgid "Handhelds"
#~ msgstr "Карманные компьютеры"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Команда подготовки стабильного выпуска"
+#~ msgid "Marketing Team"
+#~ msgstr "Команда работы с рынком"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Пользовательские дистрибутивы Debian"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Координация подписи ключей"
-#~ msgid "Vendors"
-#~ msgstr "Поставщики"
+#~ msgid "Accountant"
+#~ msgstr "Учётные записи"
-#~ msgid "Volatile Team"
-#~ msgstr "Команда поддержки часто меняющихся частей дистрибутива (volatile)"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Универсальная операционная система на настольном компьютере"
-#~ msgid "Security Audit Project"
-#~ msgstr "Проект всесторонней проверки безопасности"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian в некоммерческих организациях"
-#~ msgid "Testing Security Team"
-#~ msgstr "Команда безопасности тестируемого дистрибутива"
+#~ msgid "Summer of Code 2013 Administrators"
+#~ msgstr "Администраторы Summer of Code 2013"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "текущий Лидер Проекта Debian"
diff --git a/russian/po/others.ru.po b/russian/po/others.ru.po
index 6c0123dd23a..63cf1b975aa 100644
--- a/russian/po/others.ru.po
+++ b/russian/po/others.ru.po
@@ -167,26 +167,6 @@ msgstr "[Debian] (мини-кнопка)"
msgid "same as the above"
msgstr "тоже, что и выше"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Требуется:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Требуется для:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Архитектура:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Спецификация:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Где:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Продукция"
@@ -337,3 +317,17 @@ msgstr "Версия"
msgid "URL"
msgstr "URL"
+#~ msgid "Where:"
+#~ msgstr "Где:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Спецификация:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Архитектура:"
+
+#~ msgid "Who:"
+#~ msgstr "Требуется для:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Требуется:"
diff --git a/russian/po/ports.ru.po b/russian/po/ports.ru.po
index 37b4b8a3d72..a28bea8744a 100644
--- a/russian/po/ports.ru.po
+++ b/russian/po/ports.ru.po
@@ -118,32 +118,32 @@ msgstr "Debian для PowerPC"
msgid "Debian for Sparc"
msgstr "Debian для Sparc"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian для 64-разрядной архитектуры AMD"
-
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian для ARM"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian для переносных компьютеров"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian для Beowulf"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian для Sparc64"
-#~ msgid "Main"
-#~ msgstr "Основная"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian для S/390"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian для MIPS"
#~ msgid "Debian for Motorola 680x0"
#~ msgstr "Debian для Motorola 680x0"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian для MIPS"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian для S/390"
+#~ msgid "Main"
+#~ msgstr "Основная"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian для Sparc64"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian для Beowulf"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian для переносных компьютеров"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian для ARM"
+
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian для 64-разрядной архитектуры AMD"
diff --git a/russian/po/stats.ru.po b/russian/po/stats.ru.po
index 48a96a9d12e..fb9664ced01 100644
--- a/russian/po/stats.ru.po
+++ b/russian/po/stats.ru.po
@@ -15,75 +15,91 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.8.6\n"
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Статистика перевода сайта Debian"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Страниц для перевода: %d."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Байт для перевода: %d."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Строк для перевода: %d."
+
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Этот перевод слишком устарел"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Неверная версия перевода"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "Оригинал новее, чем перевод"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "Оригинал более не существует"
-#: ../../stattrans.pl:437
-msgid "hits"
-msgstr "обращения"
-
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "число обращений не доступно"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:403
+msgid "hits"
+msgstr "обращения"
+
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Нажмите, чтобы получить данные diffstat"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "Унифицированный diff"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "Цветной diff"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Резюме перевода для"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544 ../../stattrans.pl:700 ../../stattrans.pl:746
+#: ../../stattrans.pl:789
+msgid "Not translated"
+msgstr "Не переведено"
+
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
+msgid "Outdated"
+msgstr "Устарело"
+
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Переведено"
-#: ../../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 "Актуально"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
-msgid "Outdated"
-msgstr "Устарело"
-
-#: ../../stattrans.pl:578 ../../stattrans.pl:737 ../../stattrans.pl:783
-#: ../../stattrans.pl:826
-msgid "Not translated"
-msgstr "Не переведено"
-
-#: ../../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 "файлы"
-#: ../../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 "байты"
-#: ../../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."
@@ -91,155 +107,137 @@ msgstr ""
"Замечание: список страниц отсортирован по популярности. Наведите указатель "
"мыши на название страницы, чтобы увидеть количество обращений."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Устаревшие переводы"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "Файл"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Комментарий"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Журнал"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Перевод"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Сопровождающий"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Состояние"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Переводчик"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Дата"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Не переведённые страницы общего характера"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Не переведённые страницы общего характера"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Не переведённые новости"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Не переведённые новости"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Не переведённые страницы о консультантах/пользователях"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Не переведённые страницы консультантов/пользователей"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Не переведённые международные страницы"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Не переведённые международные страницы"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Переведённые страницы (актуальные)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Переведённые шаблоны (файлы PO)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Статистика перевода PO"
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr "Неточные"
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr "Не переведено"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Всего"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Всего:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Создано с помощью"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Переведённые веб-страницы"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Статистика перевода по счетчику страниц"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Язык"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Переводы"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Переведённые веб-страницы (по размеру)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Статистика перевода по размеру страниц"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Статистика перевода сайта Debian"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Страниц для перевода: %d."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Байт для перевода: %d."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Строк для перевода: %d."
-
-#. TRANSLATORS: The first string is hostname of the debian website mirror, second string is date and time.
-#: ../../english/template/debian/stats_tags.wml:23
-msgid "Hit data from %s, gathered %s."
-msgstr "Данные о посещениях с %s, собраны %s."
+#~ msgid "Hit data from %s, gathered %s."
+#~ msgstr "Данные о посещениях с %s, собраны %s."
diff --git a/russian/po/templates.ru.po b/russian/po/templates.ru.po
index e9ebc548633..24bb8247b82 100644
--- a/russian/po/templates.ru.po
+++ b/russian/po/templates.ru.po
@@ -517,23 +517,23 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Назад на страницу <a href=\"./\">Кто использует Debian</a>."
-#~ msgid "Rating:"
-#~ msgstr "Рейтинг:"
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Проблема с отображением сайта?"
-#~ msgid "Nobody"
-#~ msgstr "Никем"
+#~ msgid "Report it!"
+#~ msgstr "Сообщите об этом!"
-#~ msgid "Taken by:"
-#~ msgstr "Ответственный"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Выберите ближайший сервер: &nbsp;"
#~ msgid "More information:"
#~ msgstr "Подробнее:"
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Выберите ближайший сервер: &nbsp;"
+#~ msgid "Taken by:"
+#~ msgstr "Ответственный"
-#~ msgid "Report it!"
-#~ msgstr "Сообщите об этом!"
+#~ msgid "Nobody"
+#~ msgstr "Никем"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Проблема с отображением сайта?"
+#~ msgid "Rating:"
+#~ msgstr "Рейтинг:"
diff --git a/russian/po/vendors.ru.po b/russian/po/vendors.ru.po
index 98dd52cf111..ea54e2bd219 100644
--- a/russian/po/vendors.ru.po
+++ b/russian/po/vendors.ru.po
@@ -15,100 +15,89 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Поставщик:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL страницы Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Жертвует часть дохода Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Страна:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Международные поставки:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "e-mail:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Тип CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Тип DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "BD Type:"
-msgstr "Тип BD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:15
-msgid "USB Type:"
-msgstr "Тип USB:"
-
-#: ../../english/CD/vendors/vendors.CD.def:16
-msgid "Architectures:"
-msgstr "Архитектуры:"
-
-#: ../../english/CD/vendors/vendors.CD.def:28
msgid "Vendor"
msgstr "Поставщик"
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Жертвует часть дохода"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:16
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD/BD/USB"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr "Архитектуры"
-#: ../../english/CD/vendors/vendors.CD.def:32
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Международные поставки"
-#: ../../english/CD/vendors/vendors.CD.def:33
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Контакт"
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:58
+#: ../../english/CD/vendors/vendors.CD.def:44
msgid "Vendor Home"
msgstr "Сайт поставщика"
-#: ../../english/CD/vendors/vendors.CD.def:84
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "страница"
-#: ../../english/CD/vendors/vendors.CD.def:85
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "email"
-#: ../../english/CD/vendors/vendors.CD.def:128
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "Только в Европе"
-#: ../../english/CD/vendors/vendors.CD.def:132
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "В некоторые страны"
-#: ../../english/CD/vendors/vendors.CD.def:136
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "исходный код"
-#: ../../english/CD/vendors/vendors.CD.def:140
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "и"
+
+#~ msgid "Architectures:"
+#~ msgstr "Архитектуры:"
+
+#~ msgid "USB Type:"
+#~ msgstr "Тип USB:"
+
+#~ msgid "BD Type:"
+#~ msgstr "Тип BD:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Тип DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Тип CD:"
+
+#~ msgid "email:"
+#~ msgstr "e-mail:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Международные поставки:"
+
+#~ msgid "Country:"
+#~ msgstr "Страна:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Жертвует часть дохода Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL страницы Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Поставщик:"
diff --git a/slovak/po/bugs.sk.po b/slovak/po/bugs.sk.po
index 5eb9ad1cbc5..742ad611413 100644
--- a/slovak/po/bugs.sk.po
+++ b/slovak/po/bugs.sk.po
@@ -160,143 +160,143 @@ msgstr "Archivované"
msgid "Archived and Unarchived"
msgstr "Archivované aj nearchivované"
-#~ msgid "Exclude tag:"
-#~ msgstr "Okrem značky:"
+#~ msgid "Flags:"
+#~ msgstr "Príznaky:"
-#~ msgid "Include tag:"
-#~ msgstr "So značkou:"
+#~ msgid "active bugs"
+#~ msgstr "aktívne chyby"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "display merged bugs only once"
+#~ msgstr "zobrazovať zlúčené chyby iba raz"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "nezoraovať podľa stavu či závažnosti"
-#~ msgid "wontfix"
-#~ msgstr "neopravíme"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "nezobrazovať obsah v hlavičke"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "nezobrazovať štatistiku v pätke"
-#~ msgid "unreproducible"
-#~ msgstr "nereprodukovateľná"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "security"
-#~ msgstr "bezpečnosť"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "patch"
-#~ msgstr "záplata"
+#~ msgid "Package version:"
+#~ msgstr "Verzia balíka:"
-#~ msgid "moreinfo"
-#~ msgstr "viacinfo"
+#~ msgid "Distribution:"
+#~ msgstr "Distribúcia:"
-#~ msgid "l10n"
-#~ msgstr "lokalizácia"
+#~ msgid "bugs"
+#~ msgstr "chyby"
-#~ msgid "help"
-#~ msgstr "pomoc"
+#~ msgid "open"
+#~ msgstr "otvorené"
-#~ msgid "fixed-upstream"
-#~ msgstr "opravená-v-upstream"
+#~ msgid "forwarded"
+#~ msgstr "preposlané"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "opravená-v-experimental"
+#~ msgid "pending"
+#~ msgstr "čaká sa"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "fixed"
+#~ msgstr "opravené"
-#~ msgid "confirmed"
-#~ msgstr "potvrdená"
+#~ msgid "Include status:"
+#~ msgstr "So stavom:"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Okrem stavu:"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "critical"
+#~ msgstr "kritická"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "grave"
+#~ msgstr "vážna"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "serious"
+#~ msgstr "významná"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "important"
+#~ msgstr "dôležitá"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "minor"
+#~ msgstr "drobná"
-#~ msgid "Exclude severity:"
-#~ msgstr "Okrem závažnosti:"
+#~ msgid "wishlist"
+#~ msgstr "želanie"
#~ msgid "Include severity:"
#~ msgstr "So závažnosťou:"
-#~ msgid "wishlist"
-#~ msgstr "želanie"
+#~ msgid "Exclude severity:"
+#~ msgstr "Okrem závažnosti:"
-#~ msgid "minor"
-#~ msgstr "drobná"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "important"
-#~ msgstr "dôležitá"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "serious"
-#~ msgstr "významná"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "grave"
-#~ msgstr "vážna"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "critical"
-#~ msgstr "kritická"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "Okrem stavu:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "Include status:"
-#~ msgstr "So stavom:"
+#~ msgid "confirmed"
+#~ msgstr "potvrdená"
-#~ msgid "fixed"
-#~ msgstr "opravené"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "pending"
-#~ msgstr "čaká sa"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "opravená-v-experimental"
-#~ msgid "forwarded"
-#~ msgstr "preposlané"
+#~ msgid "fixed-upstream"
+#~ msgstr "opravená-v-upstream"
-#~ msgid "open"
-#~ msgstr "otvorené"
+#~ msgid "help"
+#~ msgstr "pomoc"
-#~ msgid "bugs"
-#~ msgstr "chyby"
+#~ msgid "l10n"
+#~ msgstr "lokalizácia"
-#~ msgid "Distribution:"
-#~ msgstr "Distribúcia:"
+#~ msgid "moreinfo"
+#~ msgstr "viacinfo"
-#~ msgid "Package version:"
-#~ msgstr "Verzia balíka:"
+#~ msgid "patch"
+#~ msgstr "záplata"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "security"
+#~ msgstr "bezpečnosť"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "unreproducible"
+#~ msgstr "nereprodukovateľná"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "nezobrazovať štatistiku v pätke"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "nezobrazovať obsah v hlavičke"
+#~ msgid "wontfix"
+#~ msgstr "neopravíme"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "nezoraovať podľa stavu či závažnosti"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "display merged bugs only once"
-#~ msgstr "zobrazovať zlúčené chyby iba raz"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "active bugs"
-#~ msgstr "aktívne chyby"
+#~ msgid "Include tag:"
+#~ msgstr "So značkou:"
-#~ msgid "Flags:"
-#~ msgstr "Príznaky:"
+#~ msgid "Exclude tag:"
+#~ msgstr "Okrem značky:"
diff --git a/slovak/po/cdimage.sk.po b/slovak/po/cdimage.sk.po
index 0a175375987..1d7c10343b3 100644
--- a/slovak/po/cdimage.sk.po
+++ b/slovak/po/cdimage.sk.po
@@ -15,18 +15,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 " Key fingerprint"
-#: ../../english/devel/debian-installer/images.data:90
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "Obrazy ISO"
-#: ../../english/devel/debian-installer/images.data:91
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "Súbory Jigdo"
diff --git a/slovak/po/countries.sk.po b/slovak/po/countries.sk.po
index d445fa5da31..40414eebfa5 100644
--- a/slovak/po/countries.sk.po
+++ b/slovak/po/countries.sk.po
@@ -428,1019 +428,1019 @@ msgstr "Južná Afrika"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#~ msgid "Great Britain"
-#~ msgstr "Spojené kráľovstvo"
+#~ msgid "Afghanistan"
+#~ msgstr "Afganistan"
-#~ msgid "Kingdom of Nepal"
-#~ msgstr "Nepálske kráľovstvo"
+#, fuzzy
+#~ msgid "Islamic Republic of Afghanistan"
+#~ msgstr "Pakistanská islamská republika"
-#~ msgid "State of Bahrain"
-#~ msgstr "Bahrajnské kráľovstvo"
+#~ msgid "Åland Islands"
+#~ msgstr "Ålandy"
-#~ msgid "The Transitional Islamic State of Afghanistan"
-#~ msgstr "Dočasný afganský islamský štát"
+#~ msgid "Republic of Albania"
+#~ msgstr "Albánska republika"
-#, fuzzy
-#~ msgid "Zaire, Republic of"
-#~ msgstr "Kórejská republika"
+#~ msgid "People's Democratic Republic of Algeria"
+#~ msgstr "Alžírska demokratická ľudová republika"
-#, fuzzy
-#~ msgid "Yugoslavia, Socialist Federal Republic of"
-#~ msgstr "Tanzánijská zjednotená republika"
+#~ msgid "American Samoa"
+#~ msgstr "Americká Samoa"
-#, fuzzy
-#~ msgid "Yemen, Yemen Arab Republic"
-#~ msgstr "Sýrska arabská republika"
+#~ msgid "Andorra"
+#~ msgstr "Andorra"
-#, fuzzy
-#~ msgid "Yemen, Democratic, People's Democratic Republic of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Principality of Andorra"
+#~ msgstr "Andorrské kniežatstvo"
-#, fuzzy
-#~ msgid "Wake Island"
-#~ msgstr "Faerské ostrovy"
+#~ msgid "Angola"
+#~ msgstr "Angola"
-#, fuzzy
-#~ msgid "Viet-Nam, Democratic Republic of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Republic of Angola"
+#~ msgstr "Angolská republika"
-#, fuzzy
-#~ msgid "Vatican City State (Holy See)"
-#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
+#~ msgid "Anguilla"
+#~ msgstr "Anguilla"
-#, fuzzy
-#~ msgid "Upper Volta, Republic of"
-#~ msgstr "Moldavská republika"
+#~ msgid "Antarctica"
+#~ msgstr "Antarktída"
-#, fuzzy
-#~ msgid "Serbia and Montenegro"
-#~ msgstr "Čiernohorská republika"
+#~ msgid "Antigua and Barbuda"
+#~ msgstr "Antigua a Barbuda"
-#, fuzzy
-#~ msgid "Romania, Socialist Republic of"
-#~ msgstr "Vietnamská socialistická republika"
+#~ msgid "Argentine Republic"
+#~ msgstr "Argentínska republika"
-#, fuzzy
-#~ msgid "Panama, Republic of"
-#~ msgstr "Macedónska republika"
+#~ msgid "Republic of Armenia"
+#~ msgstr "Arménska republika"
-#, fuzzy
-#~ msgid "Midway Islands"
-#~ msgstr "Kajmanie ostrovy"
+#~ msgid "Aruba"
+#~ msgstr "Aruba"
-#, fuzzy
-#~ msgid "Johnston Island"
-#~ msgstr "Cookove ostrovy"
+#~ msgid "Republic of Austria"
+#~ msgstr "Rakúska republika"
-#, fuzzy
-#~ msgid "Gilbert and Ellice Islands"
-#~ msgstr "Ostrovy Turks a Caicos"
+#~ msgid "Azerbaijan"
+#~ msgstr "Azerbajdžan"
-#, fuzzy
-#~ msgid "Germany, Federal Republic of"
-#~ msgstr "Nemecká spolková republika"
+#~ msgid "Republic of Azerbaijan"
+#~ msgstr "Azerbajdžanská republika"
-#, fuzzy
-#~ msgid "German Democratic Republic"
-#~ msgstr "Laoská ľudovodemokratická republika"
+#~ msgid "Commonwealth of the Bahamas"
+#~ msgstr "Bahamské spoločenstvo"
-#, fuzzy
-#~ msgid "French Southern and Antarctic Territories"
-#~ msgstr "Francúzske južné a antarktické územia"
+#~ msgid "Bahrain"
+#~ msgstr "Bahrajn"
#, fuzzy
-#~ msgid "Burma, Socialist Republic of the Union of"
-#~ msgstr "Vietnamská socialistická republika"
+#~ msgid "Kingdom of Bahrain"
+#~ msgstr "Bhutánske kráľovstvo"
-#, fuzzy
-#~ msgid "British Antarctic Territory"
-#~ msgstr "Britské indickooceánske územie"
+#~ msgid "People's Republic of Bangladesh"
+#~ msgstr "Bangladéšska ľudová republika"
-#~ msgid "Republic of Zimbabwe"
-#~ msgstr "Zimbabwianska republika"
+#~ msgid "Barbados"
+#~ msgstr "Barbados"
-#~ msgid "Republic of Zambia"
-#~ msgstr "Zambijská republika"
+#~ msgid "Republic of Belarus"
+#~ msgstr "Bieloruská republika"
-#~ msgid "Zambia"
-#~ msgstr "Zambia"
+#~ msgid "Kingdom of Belgium"
+#~ msgstr "Belgické kráľovstvo"
-#~ msgid "Republic of Yemen"
-#~ msgstr "Jemenská republika"
+#~ msgid "Belize"
+#~ msgstr "Belize"
-#~ msgid "Yemen"
-#~ msgstr "Jemen"
+#~ msgid "Benin"
+#~ msgstr "Benin"
-#~ msgid "Western Sahara"
-#~ msgstr "Západná Sahara"
+#~ msgid "Republic of Benin"
+#~ msgstr "Beninská republika"
-#~ msgid "Wallis and Futuna"
-#~ msgstr "Wallis a Futuna"
+#~ msgid "Bermuda"
+#~ msgstr "Bermudy"
-#~ msgid "Virgin Islands of the United States"
-#~ msgstr "Panenské ostrovy Spojených štátov"
+#~ msgid "Bhutan"
+#~ msgstr "Bhután"
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Panenské ostrovy, Americké"
+#~ msgid "Kingdom of Bhutan"
+#~ msgstr "Bhutánske kráľovstvo"
-#~ msgid "British Virgin Islands"
-#~ msgstr "Britské Panenské ostrovy"
+#~ msgid "Bolivia"
+#~ msgstr "Bolívia"
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Panenské ostrovy, Britské"
+#~ msgid "Republic of Bolivia"
+#~ msgstr "Bolívijská republika"
-#~ msgid "Socialist Republic of Viet Nam"
-#~ msgstr "Vietnamská socialistická republika"
+#~ msgid "Republic of Bosnia and Herzegovina"
+#~ msgstr "Republika Bosny a Hercegoviny"
-#~ msgid "Bolivarian Republic of Venezuela"
-#~ msgstr "Venezuelská bolívarovská republika"
+#~ msgid "Botswana"
+#~ msgstr "Botswana"
-#~ msgid "Republic of Vanuatu"
-#~ msgstr "Vanuatská republika"
+#~ msgid "Republic of Botswana"
+#~ msgstr "Botswanská republika"
-#~ msgid "Republic of Uzbekistan"
-#~ msgstr "Uzbecká republika"
+#~ msgid "Bouvet Island"
+#~ msgstr "Bouvetov ostrov"
-#~ msgid "Eastern Republic of Uruguay"
-#~ msgstr "Uruguajská východná republika"
+#~ msgid "Federative Republic of Brazil"
+#~ msgstr "Brazílska federatívna republika"
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Menšie odľahlé ostrovy Spojených štátov"
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "Britské indickooceánske územie"
-#~ msgid "United States of America"
-#~ msgstr "Spojené štáty americké"
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Brunejsko-darussalamský štát"
-#~ msgid "United Kingdom of Great Britain and Northern Ireland"
-#~ msgstr "Spojené kráľovstvo Veľkej Británie a Severného Írska"
+#~ msgid "Republic of Bulgaria"
+#~ msgstr "Bulharská republika"
-#~ msgid "Republic of Uganda"
-#~ msgstr "Ugandská republika"
+#~ msgid "Burkina Faso"
+#~ msgstr "Burkina Faso"
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
+#~ msgid "Burundi"
+#~ msgstr "Burundi"
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
+#~ msgid "Republic of Burundi"
+#~ msgstr "Burundská republika"
-#~ msgid "Turks and Caicos Islands"
-#~ msgstr "Ostrovy Turks a Caicos"
+#~ msgid "Cambodia"
+#~ msgstr "Kambodža"
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkménsko"
+#~ msgid "Kingdom of Cambodia"
+#~ msgstr "Kambodžské kráľovstvo"
-#~ msgid "Republic of Turkey"
-#~ msgstr "Turecká republika"
+#~ msgid "Cameroon"
+#~ msgstr "Kamerun"
-#~ msgid "Republic of Tunisia"
-#~ msgstr "Tuniská republika"
+#~ msgid "Republic of Cameroon"
+#~ msgstr "Kamerunská republika"
-#~ msgid "Republic of Trinidad and Tobago"
-#~ msgstr "Republika Trinidadu a Tobaga"
+#~ msgid "Cape Verde"
+#~ msgstr "Kapverdy"
-#~ msgid "Trinidad and Tobago"
-#~ msgstr "Trinidad a Tobago"
+#~ msgid "Republic of Cape Verde"
+#~ msgstr "Kapverdská republika"
-#~ msgid "Kingdom of Tonga"
-#~ msgstr "Tongské kráľovstvo"
+#~ msgid "Cayman Islands"
+#~ msgstr "Kajmanie ostrovy"
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
+#~ msgid "Central African Republic"
+#~ msgstr "Stredoafrická republika"
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
+#~ msgid "Chad"
+#~ msgstr "Čad"
-#~ msgid "Togolese Republic"
-#~ msgstr "Togská republika"
+#~ msgid "Republic of Chad"
+#~ msgstr "Čadská republika"
-#~ msgid "Togo"
-#~ msgstr "Togo"
+#~ msgid "Republic of Chile"
+#~ msgstr "Čilská republika"
-#~ msgid "Democratic Republic of Timor-Leste"
-#~ msgstr "Východotimorská demokratická republika"
+#~ msgid "People's Republic of China"
+#~ msgstr "Čínska ľudová republika"
-#~ msgid "Timor-Leste"
-#~ msgstr "Východný Timor"
+#~ msgid "Christmas Island"
+#~ msgstr "Vianočný ostrov"
-#~ msgid "Kingdom of Thailand"
-#~ msgstr "Thajské kráľovstvo"
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Kokosové ostrovy"
-#~ msgid "United Republic of Tanzania"
-#~ msgstr "Tanzánijská zjednotená republika"
+#~ msgid "Republic of Colombia"
+#~ msgstr "Kolumbijská republika"
-#~ msgid "Tanzania, United Republic of"
-#~ msgstr "Tanzánijská zjednotená republika"
+#~ msgid "Comoros"
+#~ msgstr "Komory"
-#~ msgid "Republic of Tajikistan"
-#~ msgstr "Tadžická republika"
+#~ msgid "Union of the Comoros"
+#~ msgstr "Komorský zväz"
-#~ msgid "Taiwan, Province of China"
-#~ msgstr "Taiwan, provincia Číny"
+#~ msgid "Congo"
+#~ msgstr "Kongo"
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Sýrska arabská republika"
+#~ msgid "Republic of the Congo"
+#~ msgstr "Konžská republika"
-#~ msgid "Swiss Confederation"
-#~ msgstr "Švajčiarska konfederácia"
+#~ msgid "Congo, The Democratic Republic of the"
+#~ msgstr "Konžská demokratická republika"
-#~ msgid "Kingdom of Sweden"
-#~ msgstr "Švédske kráľovstvo"
+#~ msgid "Cook Islands"
+#~ msgstr "Cookove ostrovy"
-#~ msgid "Kingdom of Swaziland"
-#~ msgstr "Svazijské kráľovstvo"
+#~ msgid "Republic of Costa Rica"
+#~ msgstr "Kostarická republika"
-#~ msgid "Swaziland"
-#~ msgstr "Svazijsko"
+#~ msgid "Côte d'Ivoire"
+#~ msgstr "Pobrežie Slonoviny"
-#~ msgid "Svalbard and Jan Mayen"
-#~ msgstr "Svalbard a Jan Mayen"
+#, fuzzy
+#~ msgid "Republic of Côte d'Ivoire"
+#~ msgstr "Republika Pobrežia Slonoviny"
-#~ msgid "Republic of Suriname"
-#~ msgstr "Surinamská republika"
+#~ msgid "Republic of Croatia"
+#~ msgstr "Chorvátska republika"
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
+#~ msgid "Cuba"
+#~ msgstr "Kuba"
-#~ msgid "Republic of the Sudan"
-#~ msgstr "Sudánska republika"
+#~ msgid "Republic of Cuba"
+#~ msgstr "Kubánska republika"
-#~ msgid "Sudan"
-#~ msgstr "Sudán"
+#~ msgid "Cyprus"
+#~ msgstr "Cyprus"
-#~ msgid "Democratic Socialist Republic of Sri Lanka"
-#~ msgstr "Srílanská demokratická socialistická republika"
+#~ msgid "Republic of Cyprus"
+#~ msgstr "Cyperská republika"
-#~ msgid "Kingdom of Spain"
-#~ msgstr "Španielske kráľovstvo"
+#~ msgid "Kingdom of Denmark"
+#~ msgstr "Dánske kráľovstvo"
-#~ msgid "South Georgia and the South Sandwich Islands"
-#~ msgstr "Južná Georgia a Južné Sandwichove ostrovy"
+#~ msgid "Djibouti"
+#~ msgstr "Džibutsko"
-#~ msgid "Republic of South Africa"
-#~ msgstr "Juhoafrická republika"
+#~ msgid "Republic of Djibouti"
+#~ msgstr "Džibutská republika"
-#~ msgid "Somali Republic"
-#~ msgstr "Somálska republika"
+#~ msgid "Dominica"
+#~ msgstr "Dominika"
-#~ msgid "Somalia"
-#~ msgstr "Somálsko"
+#~ msgid "Commonwealth of Dominica"
+#~ msgstr "Dominické spoločenstvo"
-#~ msgid "Solomon Islands"
-#~ msgstr "Šalamúnove ostrovy"
+#~ msgid "Republic of Ecuador"
+#~ msgstr "Ekvádorská republika"
-#~ msgid "Republic of Slovenia"
-#~ msgstr "Slovinská republika"
+#~ msgid "Arab Republic of Egypt"
+#~ msgstr "Egyptská arabská republika"
-#~ msgid "Slovak Republic"
-#~ msgstr "Slovenská republika"
+#~ msgid "Republic of El Salvador"
+#~ msgstr "Salvádorská republika"
-#~ msgid "Republic of Singapore"
-#~ msgstr "Singapurská republika"
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Rovníková Guinea"
-#~ msgid "Republic of Sierra Leone"
-#~ msgstr "Sierraleonská republika"
+#~ msgid "Republic of Equatorial Guinea"
+#~ msgstr "Republika Rovníkovej Guiney"
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
+#~ msgid "Eritrea"
+#~ msgstr "Eritrea"
-#~ msgid "Republic of Seychelles"
-#~ msgstr "Seychelská republika"
+#~ msgid "Republic of Estonia"
+#~ msgstr "Estónska republika"
-#~ msgid "Seychelles"
-#~ msgstr "Seychely"
+#~ msgid "Federal Democratic Republic of Ethiopia"
+#~ msgstr "Etiópska federatívna demokratická republika"
-#~ msgid "Republic of Serbia"
-#~ msgstr "Srbská republika"
+#~ msgid "Falkland Islands (Malvinas)"
+#~ msgstr "Falklandy (Malvíny)"
-#~ msgid "Republic of Senegal"
-#~ msgstr "Senegalská republika"
+#~ msgid "Fiji"
+#~ msgstr "Fidži"
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
+#~ msgid "Republic of the Fiji Islands"
+#~ msgstr "Republika Fidžijských ostrovov"
-#~ msgid "Kingdom of Saudi Arabia"
-#~ msgstr "Saudskoarabské kráľovstvo"
+#~ msgid "Republic of Finland"
+#~ msgstr "Fínska republika"
-#~ msgid "Democratic Republic of Sao Tome and Principe"
-#~ msgstr "Demokratická republika Svätého Tomáša a Princovho ostrova"
+#~ msgid "French Republic"
+#~ msgstr "Francúzska republika"
-#~ msgid "Sao Tome and Principe"
-#~ msgstr "Svätý Tomáš a Princov ostrov"
+#~ msgid "French Guiana"
+#~ msgstr "Francúzska Guyana"
-#~ msgid "Republic of San Marino"
-#~ msgstr "Sanmarínska republika"
+#~ msgid "French Southern Territories"
+#~ msgstr "Francúzske južné a antarktické územia"
-#~ msgid "San Marino"
-#~ msgstr "San Maríno"
+#~ msgid "Gabon"
+#~ msgstr "Gabon"
-#~ msgid "Independent State of Samoa"
-#~ msgstr "Samojský nezávislý štát"
+#~ msgid "Gabonese Republic"
+#~ msgstr "Gabonská republika"
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
+#~ msgid "Gambia"
+#~ msgstr "Gambia"
-#~ msgid "Saint Vincent and the Grenadines"
-#~ msgstr "Svätý Vincent a Grenadíny"
+#~ msgid "Republic of the Gambia"
+#~ msgstr "Gambijská republika"
-#~ msgid "Saint Pierre and Miquelon"
-#~ msgstr "Saint Pierre a Miquelon"
+#~ msgid "Federal Republic of Germany"
+#~ msgstr "Nemecká spolková republika"
-#~ msgid "Saint Lucia"
-#~ msgstr "Svätá Lucia"
+#~ msgid "Ghana"
+#~ msgstr "Ghana"
-#~ msgid "Saint Kitts and Nevis"
-#~ msgstr "Svätý Krištof a Nevis"
+#~ msgid "Republic of Ghana"
+#~ msgstr "Ghanská republika"
-#~ msgid "Saint Helena"
-#~ msgstr "Svätá Helena"
+#~ msgid "Gibraltar"
+#~ msgstr "Gibraltár"
-#~ msgid "Rwandese Republic"
-#~ msgstr "Rwandská republika"
+# pozn.: Na výslovnú žiadosť gréckej strany sa v medzinárodných dohodách, zmluvách a podobných dokumentoch medzi Gréckou republikou a Slovenskou republikou používa podoba Helénska republika, v ostatných prípadoch podoba Grécka republika.
+#~ msgid "Hellenic Republic"
+#~ msgstr "Grécka republika"
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
+#~ msgid "Guadeloupe"
+#~ msgstr "Guadeloupe"
-#~ msgid "Russian Federation"
-#~ msgstr "Ruská federácia"
+#~ msgid "Guam"
+#~ msgstr "Guam"
-#~ msgid "Reunion"
-#~ msgstr "Réunion"
+#~ msgid "Republic of Guatemala"
+#~ msgstr "Guatemalská republika"
-#~ msgid "State of Qatar"
-#~ msgstr "Katarský štát"
+#~ msgid "Guernsey"
+#~ msgstr "Guernsey"
-#~ msgid "Qatar"
-#~ msgstr "Katar"
+#~ msgid "Guinea"
+#~ msgstr "Guinea"
-#~ msgid "Puerto Rico"
-#~ msgstr "Portoriko"
+#~ msgid "Republic of Guinea"
+#~ msgstr "Guinejská republika"
-#~ msgid "Portuguese Republic"
-#~ msgstr "Portugalská republika"
+#~ msgid "Guinea-Bissau"
+#~ msgstr "Guinea-Bissau"
-#~ msgid "Republic of Poland"
-#~ msgstr "Poľská republika"
+#~ msgid "Republic of Guinea-Bissau"
+#~ msgstr "Guinejsko-bissauská republika"
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairnove ostrovy"
+#~ msgid "Guyana"
+#~ msgstr "Guyana"
-#~ msgid "Republic of the Philippines"
-#~ msgstr "Filipínska republika"
+#~ msgid "Republic of Guyana"
+#~ msgstr "Guyanská kooperatívna republika"
-#~ msgid "Republic of Peru"
-#~ msgstr "Peruánska republika"
+#~ msgid "Haiti"
+#~ msgstr "Haiti"
-#~ msgid "Republic of Paraguay"
-#~ msgstr "Paraguajská republika"
+#~ msgid "Republic of Haiti"
+#~ msgstr "Haitská republika"
-#~ msgid "Paraguay"
-#~ msgstr "Paraguaj"
+#~ msgid "Heard Island and McDonald Islands"
+#~ msgstr "Heardov ostrov"
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua - Nová Guinea"
+#~ msgid "Holy See (Vatican City State)"
+#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
-#~ msgid "Republic of Panama"
-#~ msgstr "Panamská republika"
+#~ msgid "Republic of Honduras"
+#~ msgstr "Honduraská republika"
-#~ msgid "Occupied Palestinian Territory"
-#~ msgstr "Okupované palestínske územie"
+#~ msgid "Hong Kong Special Administrative Region of China"
+#~ msgstr "Osobitná administratívna oblasť Číny Hongkong"
-#~ msgid "Palestinian Territory, Occupied"
-#~ msgstr "palestínske územie, Okupované"
+#~ msgid "Republic of Hungary"
+#~ msgstr "Maďarská republika"
-#~ msgid "Republic of Palau"
-#~ msgstr "Palauská republika"
+#~ msgid "Republic of Iceland"
+#~ msgstr "Islandská republika"
-#~ msgid "Palau"
-#~ msgstr "Palau"
+#~ msgid "Republic of India"
+#~ msgstr "Indická republika"
-#~ msgid "Islamic Republic of Pakistan"
-#~ msgstr "Pakistanská islamská republika"
+#~ msgid "Republic of Indonesia"
+#~ msgstr "Indonézska republika"
-#~ msgid "Sultanate of Oman"
-#~ msgstr "Ománsky sultanát"
+#~ msgid "Iran, Islamic Republic of"
+#~ msgstr "Iránska islamská republika"
-#~ msgid "Oman"
-#~ msgstr "Omán"
+#~ msgid "Islamic Republic of Iran"
+#~ msgstr "Iránska islamská republika"
-#~ msgid "Kingdom of Norway"
-#~ msgstr "Nórske kráľovstvo"
+#~ msgid "Republic of Iraq"
+#~ msgstr "Iracká republika"
-#~ msgid "Commonwealth of the Northern Mariana Islands"
-#~ msgstr "Spoločenstvo Severných Marián"
+#~ msgid "Isle of Man"
+#~ msgstr "Man"
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Severné Mariány"
+#~ msgid "State of Israel"
+#~ msgstr "Izraelský štát"
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolk"
+#~ msgid "Italian Republic"
+#~ msgstr "Talianska republika"
-#~ msgid "Republic of Niue"
-#~ msgstr "Republika Niue"
+#~ msgid "Jamaica"
+#~ msgstr "Jamajka"
-#~ msgid "Niue"
-#~ msgstr "Niue"
+#~ msgid "Jersey"
+#~ msgstr "Jersey"
-#~ msgid "Federal Republic of Nigeria"
-#~ msgstr "Nigérijská federatívna republika"
+#~ msgid "Hashemite Kingdom of Jordan"
+#~ msgstr "Jordánske hášimovské kráľovstvo"
-#~ msgid "Nigeria"
-#~ msgstr "Nigéria"
+#~ msgid "Republic of Kazakhstan"
+#~ msgstr "Kazašská republika"
-#~ msgid "Republic of the Niger"
-#~ msgstr "Nigerská republika"
+#~ msgid "Republic of Kenya"
+#~ msgstr "Kenská republika"
-#~ msgid "Niger"
-#~ msgstr "Niger"
+#~ msgid "Kiribati"
+#~ msgstr "Kiribati"
-#~ msgid "Republic of Nicaragua"
-#~ msgstr "Nikaragujská republika"
+#~ msgid "Republic of Kiribati"
+#~ msgstr "Kiribatská republika"
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Holandské Antily"
+#~ msgid "Korea, Democratic People's Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
-#~ msgid "Kingdom of the Netherlands"
-#~ msgstr "Holandské kráľovstvo"
+#~ msgid "Democratic People's Republic of Korea"
+#~ msgstr "Kórejská ľudovodemokratická republika"
-#, fuzzy
-#~ msgid "Federal Democratic Republic of Nepal"
-#~ msgstr "Etiópska federatívna demokratická republika"
+#~ msgid "Korea, Republic of"
+#~ msgstr "Kórejská republika"
-#~ msgid "Nepal"
-#~ msgstr "Nepál"
+#~ msgid "State of Kuwait"
+#~ msgstr "Kuvajtský štát"
-#~ msgid "Republic of Nauru"
-#~ msgstr "Nauruská republika"
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Kirgizsko"
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
+#~ msgid "Kyrgyz Republic"
+#~ msgstr "Kirgizská republika"
-#~ msgid "Republic of Namibia"
-#~ msgstr "Namíbijská republika"
+#~ msgid "Lao People's Democratic Republic"
+#~ msgstr "Laoská ľudovodemokratická republika"
-#~ msgid "Namibia"
-#~ msgstr "Namíbia"
+#~ msgid "Republic of Latvia"
+#~ msgstr "Lotyšská republika"
-#~ msgid "Union of Myanmar"
-#~ msgstr "Mjanmarský zväz"
+#~ msgid "Lebanon"
+#~ msgstr "Libanon"
-#~ msgid "Myanmar"
-#~ msgstr "Mjanmarsko"
+#~ msgid "Lebanese Republic"
+#~ msgstr "Libanonská republika"
-#~ msgid "Republic of Mozambique"
-#~ msgstr "Mozambická republika"
+#~ msgid "Lesotho"
+#~ msgstr "Lesotho"
-#~ msgid "Mozambique"
-#~ msgstr "Mozambik"
+#~ msgid "Kingdom of Lesotho"
+#~ msgstr "Lesothské kráľovstvo"
-#~ msgid "Kingdom of Morocco"
-#~ msgstr "Marocké kráľovstvo"
+#~ msgid "Liberia"
+#~ msgstr "Libéria"
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
+#~ msgid "Republic of Liberia"
+#~ msgstr "Libérijská republika"
-#~ msgid "Principality of Monaco"
-#~ msgstr "Monacké kniežatstvo"
+#~ msgid "Libyan Arab Jamahiriya"
+#~ msgstr "Líbya"
-#~ msgid "Monaco"
-#~ msgstr "Monako"
+#~ msgid "Socialist People's Libyan Arab Jamahiriya"
+#~ msgstr "Líbyjská arabská ľudová socialistická džamahírija"
-#~ msgid "Republic of Moldova"
-#~ msgstr "Moldavská republika"
+#~ msgid "Liechtenstein"
+#~ msgstr "Lichtenštajnsko"
-#~ msgid "Federated States of Micronesia"
-#~ msgstr "Mikronézske federatívne štáty"
+#~ msgid "Principality of Liechtenstein"
+#~ msgstr "Lichtenštajnské kniežatstvo"
-#~ msgid "Micronesia, Federated States of"
-#~ msgstr "Mikronézske federatívne štáty"
+#~ msgid "Republic of Lithuania"
+#~ msgstr "Litovská republika"
-#~ msgid "United Mexican States"
-#~ msgstr "Spojené štáty mexické"
+#~ msgid "Grand Duchy of Luxembourg"
+#~ msgstr "Luxemburské veľkovojvodstvo"
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
+#~ msgid "Macao"
+#~ msgstr "Macao"
-#~ msgid "Republic of Mauritius"
-#~ msgstr "Maurícijská republika"
+#~ msgid "Macao Special Administrative Region of China"
+#~ msgstr "Osobitná administratívna oblasť Číny Macao"
-#~ msgid "Mauritius"
-#~ msgstr "Maurícius"
+#~ msgid "The Former Yugoslav Republic of Macedonia"
+#~ msgstr "Bývalá juhoslovanská republika Macedónsko"
-#~ msgid "Islamic Republic of Mauritania"
-#~ msgstr "Mauritánska islamská republika"
+#~ msgid "Republic of Madagascar"
+#~ msgstr "Madagaskarská republika"
-#~ msgid "Mauritania"
-#~ msgstr "Mauritánia"
+#~ msgid "Malawi"
+#~ msgstr "Malawi"
-#~ msgid "Martinique"
-#~ msgstr "Martinik"
+#~ msgid "Republic of Malawi"
+#~ msgstr "Malawijská republika"
-#~ msgid "Republic of the Marshall Islands"
-#~ msgstr "Republika Marshallových ostrovov"
+#~ msgid "Maldives"
+#~ msgstr "Maldivy"
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshallove ostrovy"
+#~ msgid "Republic of Maldives"
+#~ msgstr "Maldivská republika"
-#~ msgid "Republic of Malta"
-#~ msgstr "Maltská republika"
+#~ msgid "Mali"
+#~ msgstr "Mali"
#~ msgid "Republic of Mali"
#~ msgstr "Malijská republika"
-#~ msgid "Mali"
-#~ msgstr "Mali"
+#~ msgid "Republic of Malta"
+#~ msgstr "Maltská republika"
-#~ msgid "Republic of Maldives"
-#~ msgstr "Maldivská republika"
+#~ msgid "Marshall Islands"
+#~ msgstr "Marshallove ostrovy"
-#~ msgid "Maldives"
-#~ msgstr "Maldivy"
+#~ msgid "Republic of the Marshall Islands"
+#~ msgstr "Republika Marshallových ostrovov"
-#~ msgid "Republic of Malawi"
-#~ msgstr "Malawijská republika"
+#~ msgid "Martinique"
+#~ msgstr "Martinik"
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
+#~ msgid "Mauritania"
+#~ msgstr "Mauritánia"
-#~ msgid "Republic of Madagascar"
-#~ msgstr "Madagaskarská republika"
+#~ msgid "Islamic Republic of Mauritania"
+#~ msgstr "Mauritánska islamská republika"
-#~ msgid "The Former Yugoslav Republic of Macedonia"
-#~ msgstr "Bývalá juhoslovanská republika Macedónsko"
+#~ msgid "Mauritius"
+#~ msgstr "Maurícius"
-#~ msgid "Macao Special Administrative Region of China"
-#~ msgstr "Osobitná administratívna oblasť Číny Macao"
+#~ msgid "Republic of Mauritius"
+#~ msgstr "Maurícijská republika"
-#~ msgid "Macao"
-#~ msgstr "Macao"
+#~ msgid "Mayotte"
+#~ msgstr "Mayotte"
-#~ msgid "Grand Duchy of Luxembourg"
-#~ msgstr "Luxemburské veľkovojvodstvo"
+#~ msgid "United Mexican States"
+#~ msgstr "Spojené štáty mexické"
-#~ msgid "Republic of Lithuania"
-#~ msgstr "Litovská republika"
+#~ msgid "Micronesia, Federated States of"
+#~ msgstr "Mikronézske federatívne štáty"
-#~ msgid "Principality of Liechtenstein"
-#~ msgstr "Lichtenštajnské kniežatstvo"
+#~ msgid "Federated States of Micronesia"
+#~ msgstr "Mikronézske federatívne štáty"
-#~ msgid "Liechtenstein"
-#~ msgstr "Lichtenštajnsko"
+#~ msgid "Republic of Moldova"
+#~ msgstr "Moldavská republika"
-#~ msgid "Socialist People's Libyan Arab Jamahiriya"
-#~ msgstr "Líbyjská arabská ľudová socialistická džamahírija"
+#~ msgid "Monaco"
+#~ msgstr "Monako"
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Líbya"
+#~ msgid "Principality of Monaco"
+#~ msgstr "Monacké kniežatstvo"
-#~ msgid "Republic of Liberia"
-#~ msgstr "Libérijská republika"
+#~ msgid "Montserrat"
+#~ msgstr "Montserrat"
-#~ msgid "Liberia"
-#~ msgstr "Libéria"
+#~ msgid "Kingdom of Morocco"
+#~ msgstr "Marocké kráľovstvo"
-#~ msgid "Kingdom of Lesotho"
-#~ msgstr "Lesothské kráľovstvo"
+#~ msgid "Mozambique"
+#~ msgstr "Mozambik"
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
+#~ msgid "Republic of Mozambique"
+#~ msgstr "Mozambická republika"
-#~ msgid "Lebanese Republic"
-#~ msgstr "Libanonská republika"
+#~ msgid "Myanmar"
+#~ msgstr "Mjanmarsko"
-#~ msgid "Lebanon"
-#~ msgstr "Libanon"
+#~ msgid "Union of Myanmar"
+#~ msgstr "Mjanmarský zväz"
-#~ msgid "Republic of Latvia"
-#~ msgstr "Lotyšská republika"
+#~ msgid "Namibia"
+#~ msgstr "Namíbia"
-#~ msgid "Lao People's Democratic Republic"
-#~ msgstr "Laoská ľudovodemokratická republika"
+#~ msgid "Republic of Namibia"
+#~ msgstr "Namíbijská republika"
-#~ msgid "Kyrgyz Republic"
-#~ msgstr "Kirgizská republika"
+#~ msgid "Nauru"
+#~ msgstr "Nauru"
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgizsko"
+#~ msgid "Republic of Nauru"
+#~ msgstr "Nauruská republika"
-#~ msgid "State of Kuwait"
-#~ msgstr "Kuvajtský štát"
+#~ msgid "Nepal"
+#~ msgstr "Nepál"
-#~ msgid "Korea, Republic of"
-#~ msgstr "Kórejská republika"
+#, fuzzy
+#~ msgid "Federal Democratic Republic of Nepal"
+#~ msgstr "Etiópska federatívna demokratická republika"
-#~ msgid "Democratic People's Republic of Korea"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Kingdom of the Netherlands"
+#~ msgstr "Holandské kráľovstvo"
-#~ msgid "Korea, Democratic People's Republic of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Netherlands Antilles"
+#~ msgstr "Holandské Antily"
-#~ msgid "Republic of Kiribati"
-#~ msgstr "Kiribatská republika"
+#~ msgid "Republic of Nicaragua"
+#~ msgstr "Nikaragujská republika"
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
+#~ msgid "Niger"
+#~ msgstr "Niger"
-#~ msgid "Republic of Kenya"
-#~ msgstr "Kenská republika"
+#~ msgid "Republic of the Niger"
+#~ msgstr "Nigerská republika"
-#~ msgid "Republic of Kazakhstan"
-#~ msgstr "Kazašská republika"
+#~ msgid "Nigeria"
+#~ msgstr "Nigéria"
-#~ msgid "Hashemite Kingdom of Jordan"
-#~ msgstr "Jordánske hášimovské kráľovstvo"
+#~ msgid "Federal Republic of Nigeria"
+#~ msgstr "Nigérijská federatívna republika"
-#~ msgid "Jersey"
-#~ msgstr "Jersey"
+#~ msgid "Niue"
+#~ msgstr "Niue"
-#~ msgid "Jamaica"
-#~ msgstr "Jamajka"
+#~ msgid "Republic of Niue"
+#~ msgstr "Republika Niue"
-#~ msgid "Italian Republic"
-#~ msgstr "Talianska republika"
+#~ msgid "Norfolk Island"
+#~ msgstr "Norfolk"
-#~ msgid "State of Israel"
-#~ msgstr "Izraelský štát"
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Severné Mariány"
-#~ msgid "Isle of Man"
-#~ msgstr "Man"
+#~ msgid "Commonwealth of the Northern Mariana Islands"
+#~ msgstr "Spoločenstvo Severných Marián"
-#~ msgid "Republic of Iraq"
-#~ msgstr "Iracká republika"
+#~ msgid "Kingdom of Norway"
+#~ msgstr "Nórske kráľovstvo"
-#~ msgid "Islamic Republic of Iran"
-#~ msgstr "Iránska islamská republika"
+#~ msgid "Oman"
+#~ msgstr "Omán"
-#~ msgid "Iran, Islamic Republic of"
-#~ msgstr "Iránska islamská republika"
+#~ msgid "Sultanate of Oman"
+#~ msgstr "Ománsky sultanát"
-#~ msgid "Republic of Indonesia"
-#~ msgstr "Indonézska republika"
+#~ msgid "Islamic Republic of Pakistan"
+#~ msgstr "Pakistanská islamská republika"
-#~ msgid "Republic of India"
-#~ msgstr "Indická republika"
+#~ msgid "Palau"
+#~ msgstr "Palau"
-#~ msgid "Republic of Iceland"
-#~ msgstr "Islandská republika"
+#~ msgid "Republic of Palau"
+#~ msgstr "Palauská republika"
-#~ msgid "Republic of Hungary"
-#~ msgstr "Maďarská republika"
+#~ msgid "Palestinian Territory, Occupied"
+#~ msgstr "palestínske územie, Okupované"
-#~ msgid "Hong Kong Special Administrative Region of China"
-#~ msgstr "Osobitná administratívna oblasť Číny Hongkong"
+#~ msgid "Occupied Palestinian Territory"
+#~ msgstr "Okupované palestínske územie"
-#~ msgid "Republic of Honduras"
-#~ msgstr "Honduraská republika"
+#~ msgid "Republic of Panama"
+#~ msgstr "Panamská republika"
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
+#~ msgid "Papua New Guinea"
+#~ msgstr "Papua - Nová Guinea"
-#~ msgid "Heard Island and McDonald Islands"
-#~ msgstr "Heardov ostrov"
+#~ msgid "Paraguay"
+#~ msgstr "Paraguaj"
-#~ msgid "Republic of Haiti"
-#~ msgstr "Haitská republika"
+#~ msgid "Republic of Paraguay"
+#~ msgstr "Paraguajská republika"
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
+#~ msgid "Republic of Peru"
+#~ msgstr "Peruánska republika"
-#~ msgid "Republic of Guyana"
-#~ msgstr "Guyanská kooperatívna republika"
+#~ msgid "Republic of the Philippines"
+#~ msgstr "Filipínska republika"
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
+#~ msgid "Pitcairn"
+#~ msgstr "Pitcairnove ostrovy"
-#~ msgid "Republic of Guinea-Bissau"
-#~ msgstr "Guinejsko-bissauská republika"
+#~ msgid "Republic of Poland"
+#~ msgstr "Poľská republika"
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea-Bissau"
+#~ msgid "Portuguese Republic"
+#~ msgstr "Portugalská republika"
-#~ msgid "Republic of Guinea"
-#~ msgstr "Guinejská republika"
+#~ msgid "Puerto Rico"
+#~ msgstr "Portoriko"
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
+#~ msgid "Qatar"
+#~ msgstr "Katar"
-#~ msgid "Guernsey"
-#~ msgstr "Guernsey"
+#~ msgid "State of Qatar"
+#~ msgstr "Katarský štát"
-#~ msgid "Republic of Guatemala"
-#~ msgstr "Guatemalská republika"
+#~ msgid "Reunion"
+#~ msgstr "Réunion"
-#~ msgid "Guam"
-#~ msgstr "Guam"
+#~ msgid "Russian Federation"
+#~ msgstr "Ruská federácia"
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
+#~ msgid "Rwanda"
+#~ msgstr "Rwanda"
-# pozn.: Na výslovnú žiadosť gréckej strany sa v medzinárodných dohodách, zmluvách a podobných dokumentoch medzi Gréckou republikou a Slovenskou republikou používa podoba Helénska republika, v ostatných prípadoch podoba Grécka republika.
-#~ msgid "Hellenic Republic"
-#~ msgstr "Grécka republika"
+#~ msgid "Rwandese Republic"
+#~ msgstr "Rwandská republika"
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltár"
+#~ msgid "Saint Helena"
+#~ msgstr "Svätá Helena"
-#~ msgid "Republic of Ghana"
-#~ msgstr "Ghanská republika"
+#~ msgid "Saint Kitts and Nevis"
+#~ msgstr "Svätý Krištof a Nevis"
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
+#~ msgid "Saint Lucia"
+#~ msgstr "Svätá Lucia"
-#~ msgid "Federal Republic of Germany"
-#~ msgstr "Nemecká spolková republika"
+#~ msgid "Saint Pierre and Miquelon"
+#~ msgstr "Saint Pierre a Miquelon"
-#~ msgid "Republic of the Gambia"
-#~ msgstr "Gambijská republika"
+#~ msgid "Saint Vincent and the Grenadines"
+#~ msgstr "Svätý Vincent a Grenadíny"
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
+#~ msgid "Samoa"
+#~ msgstr "Samoa"
-#~ msgid "Gabonese Republic"
-#~ msgstr "Gabonská republika"
+#~ msgid "Independent State of Samoa"
+#~ msgstr "Samojský nezávislý štát"
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
+#~ msgid "San Marino"
+#~ msgstr "San Maríno"
-#~ msgid "French Southern Territories"
-#~ msgstr "Francúzske južné a antarktické územia"
+#~ msgid "Republic of San Marino"
+#~ msgstr "Sanmarínska republika"
-#~ msgid "French Guiana"
-#~ msgstr "Francúzska Guyana"
+#~ msgid "Sao Tome and Principe"
+#~ msgstr "Svätý Tomáš a Princov ostrov"
-#~ msgid "French Republic"
-#~ msgstr "Francúzska republika"
+#~ msgid "Democratic Republic of Sao Tome and Principe"
+#~ msgstr "Demokratická republika Svätého Tomáša a Princovho ostrova"
-#~ msgid "Republic of Finland"
-#~ msgstr "Fínska republika"
+#~ msgid "Kingdom of Saudi Arabia"
+#~ msgstr "Saudskoarabské kráľovstvo"
-#~ msgid "Republic of the Fiji Islands"
-#~ msgstr "Republika Fidžijských ostrovov"
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
-#~ msgid "Fiji"
-#~ msgstr "Fidži"
+#~ msgid "Republic of Senegal"
+#~ msgstr "Senegalská republika"
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Falklandy (Malvíny)"
+#~ msgid "Republic of Serbia"
+#~ msgstr "Srbská republika"
-#~ msgid "Federal Democratic Republic of Ethiopia"
-#~ msgstr "Etiópska federatívna demokratická republika"
+#~ msgid "Seychelles"
+#~ msgstr "Seychely"
-#~ msgid "Republic of Estonia"
-#~ msgstr "Estónska republika"
+#~ msgid "Republic of Seychelles"
+#~ msgstr "Seychelská republika"
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
+#~ msgid "Sierra Leone"
+#~ msgstr "Sierra Leone"
-#~ msgid "Republic of Equatorial Guinea"
-#~ msgstr "Republika Rovníkovej Guiney"
+#~ msgid "Republic of Sierra Leone"
+#~ msgstr "Sierraleonská republika"
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Rovníková Guinea"
+#~ msgid "Republic of Singapore"
+#~ msgstr "Singapurská republika"
-#~ msgid "Republic of El Salvador"
-#~ msgstr "Salvádorská republika"
+#~ msgid "Slovak Republic"
+#~ msgstr "Slovenská republika"
-#~ msgid "Arab Republic of Egypt"
-#~ msgstr "Egyptská arabská republika"
+#~ msgid "Republic of Slovenia"
+#~ msgstr "Slovinská republika"
-#~ msgid "Republic of Ecuador"
-#~ msgstr "Ekvádorská republika"
+#~ msgid "Solomon Islands"
+#~ msgstr "Šalamúnove ostrovy"
-#~ msgid "Commonwealth of Dominica"
-#~ msgstr "Dominické spoločenstvo"
+#~ msgid "Somalia"
+#~ msgstr "Somálsko"
-#~ msgid "Dominica"
-#~ msgstr "Dominika"
+#~ msgid "Somali Republic"
+#~ msgstr "Somálska republika"
-#~ msgid "Republic of Djibouti"
-#~ msgstr "Džibutská republika"
+#~ msgid "Republic of South Africa"
+#~ msgstr "Juhoafrická republika"
-#~ msgid "Djibouti"
-#~ msgstr "Džibutsko"
+#~ msgid "South Georgia and the South Sandwich Islands"
+#~ msgstr "Južná Georgia a Južné Sandwichove ostrovy"
-#~ msgid "Kingdom of Denmark"
-#~ msgstr "Dánske kráľovstvo"
+#~ msgid "Kingdom of Spain"
+#~ msgstr "Španielske kráľovstvo"
-#~ msgid "Republic of Cyprus"
-#~ msgstr "Cyperská republika"
+#~ msgid "Democratic Socialist Republic of Sri Lanka"
+#~ msgstr "Srílanská demokratická socialistická republika"
-#~ msgid "Cyprus"
-#~ msgstr "Cyprus"
+#~ msgid "Sudan"
+#~ msgstr "Sudán"
-#~ msgid "Republic of Cuba"
-#~ msgstr "Kubánska republika"
+#~ msgid "Republic of the Sudan"
+#~ msgstr "Sudánska republika"
-#~ msgid "Cuba"
-#~ msgstr "Kuba"
+#~ msgid "Suriname"
+#~ msgstr "Surinam"
-#~ msgid "Republic of Croatia"
-#~ msgstr "Chorvátska republika"
+#~ msgid "Republic of Suriname"
+#~ msgstr "Surinamská republika"
-#, fuzzy
-#~ msgid "Republic of Côte d'Ivoire"
-#~ msgstr "Republika Pobrežia Slonoviny"
+#~ msgid "Svalbard and Jan Mayen"
+#~ msgstr "Svalbard a Jan Mayen"
-#~ msgid "Côte d'Ivoire"
-#~ msgstr "Pobrežie Slonoviny"
+#~ msgid "Swaziland"
+#~ msgstr "Svazijsko"
-#~ msgid "Republic of Costa Rica"
-#~ msgstr "Kostarická republika"
+#~ msgid "Kingdom of Swaziland"
+#~ msgstr "Svazijské kráľovstvo"
-#~ msgid "Cook Islands"
-#~ msgstr "Cookove ostrovy"
+#~ msgid "Kingdom of Sweden"
+#~ msgstr "Švédske kráľovstvo"
-#~ msgid "Congo, The Democratic Republic of the"
-#~ msgstr "Konžská demokratická republika"
+#~ msgid "Swiss Confederation"
+#~ msgstr "Švajčiarska konfederácia"
-#~ msgid "Republic of the Congo"
-#~ msgstr "Konžská republika"
+#~ msgid "Syrian Arab Republic"
+#~ msgstr "Sýrska arabská republika"
-#~ msgid "Congo"
-#~ msgstr "Kongo"
+#~ msgid "Taiwan, Province of China"
+#~ msgstr "Taiwan, provincia Číny"
-#~ msgid "Union of the Comoros"
-#~ msgstr "Komorský zväz"
+#~ msgid "Republic of Tajikistan"
+#~ msgstr "Tadžická republika"
-#~ msgid "Comoros"
-#~ msgstr "Komory"
+#~ msgid "Tanzania, United Republic of"
+#~ msgstr "Tanzánijská zjednotená republika"
-#~ msgid "Republic of Colombia"
-#~ msgstr "Kolumbijská republika"
+#~ msgid "United Republic of Tanzania"
+#~ msgstr "Tanzánijská zjednotená republika"
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokosové ostrovy"
+#~ msgid "Kingdom of Thailand"
+#~ msgstr "Thajské kráľovstvo"
-#~ msgid "Christmas Island"
-#~ msgstr "Vianočný ostrov"
+#~ msgid "Timor-Leste"
+#~ msgstr "Východný Timor"
-#~ msgid "People's Republic of China"
-#~ msgstr "Čínska ľudová republika"
+#~ msgid "Democratic Republic of Timor-Leste"
+#~ msgstr "Východotimorská demokratická republika"
-#~ msgid "Republic of Chile"
-#~ msgstr "Čilská republika"
+#~ msgid "Togo"
+#~ msgstr "Togo"
-#~ msgid "Republic of Chad"
-#~ msgstr "Čadská republika"
+#~ msgid "Togolese Republic"
+#~ msgstr "Togská republika"
-#~ msgid "Chad"
-#~ msgstr "Čad"
+#~ msgid "Tokelau"
+#~ msgstr "Tokelau"
-#~ msgid "Central African Republic"
-#~ msgstr "Stredoafrická republika"
+#~ msgid "Tonga"
+#~ msgstr "Tonga"
-#~ msgid "Cayman Islands"
-#~ msgstr "Kajmanie ostrovy"
+#~ msgid "Kingdom of Tonga"
+#~ msgstr "Tongské kráľovstvo"
-#~ msgid "Republic of Cape Verde"
-#~ msgstr "Kapverdská republika"
+#~ msgid "Trinidad and Tobago"
+#~ msgstr "Trinidad a Tobago"
-#~ msgid "Cape Verde"
-#~ msgstr "Kapverdy"
+#~ msgid "Republic of Trinidad and Tobago"
+#~ msgstr "Republika Trinidadu a Tobaga"
-#~ msgid "Republic of Cameroon"
-#~ msgstr "Kamerunská republika"
+#~ msgid "Republic of Tunisia"
+#~ msgstr "Tuniská republika"
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
+#~ msgid "Republic of Turkey"
+#~ msgstr "Turecká republika"
-#~ msgid "Kingdom of Cambodia"
-#~ msgstr "Kambodžské kráľovstvo"
+#~ msgid "Turkmenistan"
+#~ msgstr "Turkménsko"
-#~ msgid "Cambodia"
-#~ msgstr "Kambodža"
+#~ msgid "Turks and Caicos Islands"
+#~ msgstr "Ostrovy Turks a Caicos"
-#~ msgid "Republic of Burundi"
-#~ msgstr "Burundská republika"
+#~ msgid "Tuvalu"
+#~ msgstr "Tuvalu"
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
+#~ msgid "Uganda"
+#~ msgstr "Uganda"
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
+#~ msgid "Republic of Uganda"
+#~ msgstr "Ugandská republika"
-#~ msgid "Republic of Bulgaria"
-#~ msgstr "Bulharská republika"
+#~ msgid "United Kingdom of Great Britain and Northern Ireland"
+#~ msgstr "Spojené kráľovstvo Veľkej Británie a Severného Írska"
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunejsko-darussalamský štát"
+#~ msgid "United States of America"
+#~ msgstr "Spojené štáty americké"
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britské indickooceánske územie"
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "Menšie odľahlé ostrovy Spojených štátov"
-#~ msgid "Federative Republic of Brazil"
-#~ msgstr "Brazílska federatívna republika"
+#~ msgid "Eastern Republic of Uruguay"
+#~ msgstr "Uruguajská východná republika"
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvetov ostrov"
+#~ msgid "Republic of Uzbekistan"
+#~ msgstr "Uzbecká republika"
-#~ msgid "Republic of Botswana"
-#~ msgstr "Botswanská republika"
+#~ msgid "Republic of Vanuatu"
+#~ msgstr "Vanuatská republika"
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
+#~ msgid "Bolivarian Republic of Venezuela"
+#~ msgstr "Venezuelská bolívarovská republika"
-#~ msgid "Republic of Bosnia and Herzegovina"
-#~ msgstr "Republika Bosny a Hercegoviny"
+#~ msgid "Socialist Republic of Viet Nam"
+#~ msgstr "Vietnamská socialistická republika"
-#~ msgid "Republic of Bolivia"
-#~ msgstr "Bolívijská republika"
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Panenské ostrovy, Britské"
-#~ msgid "Bolivia"
-#~ msgstr "Bolívia"
+#~ msgid "British Virgin Islands"
+#~ msgstr "Britské Panenské ostrovy"
-#~ msgid "Kingdom of Bhutan"
-#~ msgstr "Bhutánske kráľovstvo"
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Panenské ostrovy, Americké"
-#~ msgid "Bhutan"
-#~ msgstr "Bhután"
+#~ msgid "Virgin Islands of the United States"
+#~ msgstr "Panenské ostrovy Spojených štátov"
-#~ msgid "Bermuda"
-#~ msgstr "Bermudy"
+#~ msgid "Wallis and Futuna"
+#~ msgstr "Wallis a Futuna"
-#~ msgid "Republic of Benin"
-#~ msgstr "Beninská republika"
+#~ msgid "Western Sahara"
+#~ msgstr "Západná Sahara"
-#~ msgid "Benin"
-#~ msgstr "Benin"
+#~ msgid "Yemen"
+#~ msgstr "Jemen"
-#~ msgid "Belize"
-#~ msgstr "Belize"
+#~ msgid "Republic of Yemen"
+#~ msgstr "Jemenská republika"
-#~ msgid "Kingdom of Belgium"
-#~ msgstr "Belgické kráľovstvo"
+#~ msgid "Zambia"
+#~ msgstr "Zambia"
-#~ msgid "Republic of Belarus"
-#~ msgstr "Bieloruská republika"
+#~ msgid "Republic of Zambia"
+#~ msgstr "Zambijská republika"
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
+#~ msgid "Republic of Zimbabwe"
+#~ msgstr "Zimbabwianska republika"
-#~ msgid "People's Republic of Bangladesh"
-#~ msgstr "Bangladéšska ľudová republika"
+#, fuzzy
+#~ msgid "British Antarctic Territory"
+#~ msgstr "Britské indickooceánske územie"
#, fuzzy
-#~ msgid "Kingdom of Bahrain"
-#~ msgstr "Bhutánske kráľovstvo"
+#~ msgid "Burma, Socialist Republic of the Union of"
+#~ msgstr "Vietnamská socialistická republika"
-#~ msgid "Bahrain"
-#~ msgstr "Bahrajn"
+#, fuzzy
+#~ msgid "French Southern and Antarctic Territories"
+#~ msgstr "Francúzske južné a antarktické územia"
-#~ msgid "Commonwealth of the Bahamas"
-#~ msgstr "Bahamské spoločenstvo"
+#, fuzzy
+#~ msgid "German Democratic Republic"
+#~ msgstr "Laoská ľudovodemokratická republika"
-#~ msgid "Republic of Azerbaijan"
-#~ msgstr "Azerbajdžanská republika"
+#, fuzzy
+#~ msgid "Germany, Federal Republic of"
+#~ msgstr "Nemecká spolková republika"
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbajdžan"
+#, fuzzy
+#~ msgid "Gilbert and Ellice Islands"
+#~ msgstr "Ostrovy Turks a Caicos"
-#~ msgid "Republic of Austria"
-#~ msgstr "Rakúska republika"
+#, fuzzy
+#~ msgid "Johnston Island"
+#~ msgstr "Cookove ostrovy"
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
+#, fuzzy
+#~ msgid "Midway Islands"
+#~ msgstr "Kajmanie ostrovy"
-#~ msgid "Republic of Armenia"
-#~ msgstr "Arménska republika"
+#, fuzzy
+#~ msgid "Panama, Republic of"
+#~ msgstr "Macedónska republika"
-#~ msgid "Argentine Republic"
-#~ msgstr "Argentínska republika"
+#, fuzzy
+#~ msgid "Romania, Socialist Republic of"
+#~ msgstr "Vietnamská socialistická republika"
-#~ msgid "Antigua and Barbuda"
-#~ msgstr "Antigua a Barbuda"
+#, fuzzy
+#~ msgid "Serbia and Montenegro"
+#~ msgstr "Čiernohorská republika"
-#~ msgid "Antarctica"
-#~ msgstr "Antarktída"
+#, fuzzy
+#~ msgid "Upper Volta, Republic of"
+#~ msgstr "Moldavská republika"
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
+#, fuzzy
+#~ msgid "Vatican City State (Holy See)"
+#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
-#~ msgid "Republic of Angola"
-#~ msgstr "Angolská republika"
+#, fuzzy
+#~ msgid "Viet-Nam, Democratic Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
-#~ msgid "Angola"
-#~ msgstr "Angola"
+#, fuzzy
+#~ msgid "Wake Island"
+#~ msgstr "Faerské ostrovy"
-#~ msgid "Principality of Andorra"
-#~ msgstr "Andorrské kniežatstvo"
+#, fuzzy
+#~ msgid "Yemen, Democratic, People's Democratic Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
+#, fuzzy
+#~ msgid "Yemen, Yemen Arab Republic"
+#~ msgstr "Sýrska arabská republika"
-#~ msgid "American Samoa"
-#~ msgstr "Americká Samoa"
+#, fuzzy
+#~ msgid "Yugoslavia, Socialist Federal Republic of"
+#~ msgstr "Tanzánijská zjednotená republika"
-#~ msgid "People's Democratic Republic of Algeria"
-#~ msgstr "Alžírska demokratická ľudová republika"
+#, fuzzy
+#~ msgid "Zaire, Republic of"
+#~ msgstr "Kórejská republika"
-#~ msgid "Republic of Albania"
-#~ msgstr "Albánska republika"
+#~ msgid "The Transitional Islamic State of Afghanistan"
+#~ msgstr "Dočasný afganský islamský štát"
-#~ msgid "Åland Islands"
-#~ msgstr "Ålandy"
+#~ msgid "State of Bahrain"
+#~ msgstr "Bahrajnské kráľovstvo"
-#, fuzzy
-#~ msgid "Islamic Republic of Afghanistan"
-#~ msgstr "Pakistanská islamská republika"
+#~ msgid "Kingdom of Nepal"
+#~ msgstr "Nepálske kráľovstvo"
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
+#~ msgid "Great Britain"
+#~ msgstr "Spojené kráľovstvo"
diff --git a/slovak/po/distrib.sk.po b/slovak/po/distrib.sk.po
index b290dcaaafa..67ae3aeaeb5 100644
--- a/slovak/po/distrib.sk.po
+++ b/slovak/po/distrib.sk.po
@@ -134,82 +134,92 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
+#, fuzzy
+#| msgid "64-bit PC (amd64)"
+msgid "64-bit ARM (AArch64)"
+msgstr "64-bitové 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 "ABI ARM s hw FPU"
-#: ../../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-bitové PC (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr "32-bitové 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-bitové PC (i386)"
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr "kFreeBSD 64-bitové 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 "IBM System z"
-#: ../../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 "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 "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
diff --git a/slovak/po/doc.sk.po b/slovak/po/doc.sk.po
index 8f5be133b7e..b0d5c48c1fc 100644
--- a/slovak/po/doc.sk.po
+++ b/slovak/po/doc.sk.po
@@ -14,7 +14,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"
@@ -39,7 +56,7 @@ msgstr ""
"SELinux na zabezpečenie služieb, automatizované inštalácie alebo "
"virtualizácia pomocou Xen, KVM alebo LXC."
-#: ../../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"
@@ -48,15 +65,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"
@@ -65,13 +82,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"
@@ -86,7 +103,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 -- "
@@ -96,11 +113,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, "
@@ -120,7 +137,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"
@@ -128,11 +145,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"
@@ -140,11 +157,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"
@@ -156,24 +173,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 "
@@ -182,13 +202,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"
@@ -204,24 +224,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"
@@ -232,11 +252,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"
@@ -246,11 +266,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 "
@@ -261,11 +281,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"
@@ -275,11 +295,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"
@@ -287,7 +307,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 "
@@ -303,7 +323,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 "
@@ -333,49 +353,73 @@ msgstr "Obsahuje CD:"
msgid "Publisher:"
msgstr "Vydavateľ:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Autori:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Redaktori:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Správca:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "Stav:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "Dostupnosť:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "Najnovšia verzia:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(verzia <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 "čistý text"
-#. 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 ""
-"Pomocou <a href=\"cvs\">SVN</a> si môžete stiahnuť zdrojový text <get-var "
-"ddp_pkg_loc /> v SGML."
-#: ../../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"
@@ -385,25 +429,32 @@ msgstr ""
" na <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" a vykonajte checkout modulu <kbd>boot-floppies/documentation</kbd>."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "Webové rozhranie k CVS"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Balík Debianu"
-#: ../../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 "Balík Debianu (archivovaný)"
-#: ../../english/releases/arches.data:32
+#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
msgid "PDF"
msgstr "PDF"
#~ msgid "Language:"
#~ msgstr "Jazyk:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Pomocou <a href=\"cvs\">SVN</a> si môžete stiahnuť zdrojový text <get-var "
+#~ "ddp_pkg_loc /> v SGML."
diff --git a/slovak/po/mailinglists.sk.po b/slovak/po/mailinglists.sk.po
index b8b47c2f9c2..1501166b1e5 100644
--- a/slovak/po/mailinglists.sk.po
+++ b/slovak/po/mailinglists.sk.po
@@ -131,8 +131,8 @@ msgstr "otvorené"
msgid "closed"
msgstr "zatvorené"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Prosím vyberte, z ktorých konferencií sa chcete odhlásiť:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Prosím vyberte, do ktorých konferencií sa chcete prihlásiť:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Prosím vyberte, z ktorých konferencií sa chcete odhlásiť:"
diff --git a/slovak/po/newsevents.sk.po b/slovak/po/newsevents.sk.po
index 3709e1fbfda..14215ad381d 100644
--- a/slovak/po/newsevents.sk.po
+++ b/slovak/po/newsevents.sk.po
@@ -31,27 +31,27 @@ msgstr "p<get-var page />"
msgid "The newsletter for the Debian community"
msgstr "Newsletter pre komunitu Debianu"
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr "Meno:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "Email:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Predošlé prednášky:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Jazyky:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Lokalita:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Témy:"
@@ -406,13 +406,17 @@ msgstr ""
"rôzne novinky pre vývojárov</a> a obsahuje nasledujúce témy:"
#: ../../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 ""
-"Ak chcete tento newsletter dostávať každý druhý týždeň emailom, <a href="
-"\"https://lists.debian.org/debian-news/\">prihláste sa do konferencie debian-"
-"news</a>."
+"Ak chcete tento newsletter dostávať každý týždeň emailom, <a href=\"https://"
+"lists.debian.org/debian-news/\">prihláste sa do konferencie debian-news</a>."
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
@@ -534,3 +538,12 @@ msgid ""
msgstr ""
"<void id=\"plural\" />Redaktormi tohto vydania Týždenníka Debianu sú <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 ""
+#~ "Ak chcete tento newsletter dostávať každý druhý týždeň emailom, <a href="
+#~ "\"https://lists.debian.org/debian-news/\">prihláste sa do konferencie "
+#~ "debian-news</a>."
diff --git a/slovak/po/organization.sk.po b/slovak/po/organization.sk.po
index 024706641a6..3cafae4e69c 100644
--- a/slovak/po/organization.sk.po
+++ b/slovak/po/organization.sk.po
@@ -77,7 +77,7 @@ msgid "Officers"
msgstr "Predstavenstvo"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribúcia"
@@ -87,11 +87,11 @@ msgid "Publicity"
msgstr "Publicita"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Podpora a infraštruktúra"
-#. 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 "Debian Pure Blends"
@@ -104,99 +104,99 @@ msgstr "Vedúci"
msgid "Technical Committee"
msgstr "Technická komisia"
-#: ../../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 "Vývojové projekty"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP archívy"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "FTP Masters"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "FTP asistenti"
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "FTP Wizards"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Spätné porty"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Tím spätných portov"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Jednotlivé balíky"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Správa vydaní"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Tím vydania"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Zabezpečenie kvality"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Tím inštalátora"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Poznámky k vydaniu"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Obrazy CD"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Produkcia"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Testovanie"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Infraštruktúra automatického zostavovania"
-#: ../../english/intro/organization.data:140
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Tím wanna-build"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Správa buildd"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Dokumentácia"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Balíky, ktoré potrebujú pomoc a perspektívne balíky"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Tím Live systému"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Porty"
@@ -224,80 +224,71 @@ msgstr "Tlačový kontakt"
msgid "Partner Program"
msgstr "Partnerský program"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Udalosti"
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Čriepky z Debianu"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Používateľská podpora"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Systém sledovania chýb"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Správa konferencií a archívov konferencií"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Recepcia nových členov"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Správcovia účtov Debianu"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Správcovia kľúčov (PGP a GPG)"
-#: ../../english/intro/organization.data:341
-#| msgid "Debian Maintainer Keyring Team"
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Tím správcov zväzku kľúčov správcov Debianu (DM)"
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Bezpečnostný tím"
-#: ../../english/intro/organization.data:360
-msgid "Testing Security Team"
-msgstr "Bezpečnostný tím pre „testing“"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Projekt Bezpečnostný audit"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Webstránky"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Stránka konzultantov"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Stránka dodávateľov CD"
-#: ../../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 "Politika"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Správa systému"
-#: ../../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."
@@ -306,133 +297,145 @@ msgstr ""
"Debianu, aj v prípade že na nich potrebujete nainštalovať balík alebo máte "
"problém s heslom."
-#: ../../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 ""
"Ak máte hardvérový problém so strojom Debianu, pozrite stránku <a href="
-"\"https://db.debian.org/machines.cgi\">Strojov Debianu</a>, mala by obsahovať "
-"informácie o správcovi každého zo strojov."
+"\"https://db.debian.org/machines.cgi\">Strojov Debianu</a>, mala by "
+"obsahovať informácie o správcovi každého zo strojov."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Správca LDAP adresára vývojárov"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Zrkadlá"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Správca DNS"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Systém sledovania balíkov"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Koordinácia darov hardvéru"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Auditor"
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+#: ../../english/intro/organization.data:413
+#, fuzzy
+#| msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Žiadosti o použitie <a href=\"m4_HOME/trademark\">ochranných známok</a>"
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
-msgstr "súčasný líder projektu Debian"
-
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Správcovia Alioth"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Projekt Ženy Debianu"
-#: ../../english/intro/organization.data:443
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "Predsedovia DebConf"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Boj proti obťažovaniu"
-#: ../../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 pre deti od 1 do 99"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian pre medicínsku prax a výskum"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian pre vzdelávanie"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian v právnických kanceláriách"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian pre ľudí s postihnutiami"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian pre vedu a súvisiaci výskum"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Mená správcov jednotlivých buildd nájdete tiež na <a href=\"http://www."
-#~ "buildd.net\">http://www.buildd.net</a>. Vyberte si architektúru a "
-#~ "distribúciu pre ktorú chcete zobraziť správcov buildd."
+#~ msgid "Volatile Team"
+#~ msgstr "Tím volatile"
-#~ 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 ""
-#~ "Správcov zodpovedajúcich za buildd konkrétnej architekúry môžete "
-#~ "zastihnúť na <genericemail arch@buildd.debian.org>, napr. <genericemail "
-#~ "i386@buildd.debian.org>."
+#~ msgid "Vendors"
+#~ msgstr "Dodávatelia"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian pre neziskové organizácie"
+#~ msgid "Handhelds"
+#~ msgstr "Handheldy"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Univerzálny operačný systém pre pracovnú stanicu"
+#~ msgid "Marketing Team"
+#~ msgstr "Marketingový tím"
-#~ msgid "Accountant"
-#~ msgstr "Účtovník"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinácia podpisovania kľúčov"
+
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Prispôsobené distribúcie Debianu"
#~ msgid "Release Team for ``stable''"
#~ msgstr "Tím vydania „stable“"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Prispôsobené distribúcie Debianu"
+#~ msgid "Accountant"
+#~ msgstr "Účtovník"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinácia podpisovania kľúčov"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Univerzálny operačný systém pre pracovnú stanicu"
-#~ msgid "Marketing Team"
-#~ msgstr "Marketingový tím"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian pre neziskové organizácie"
-#~ msgid "Handhelds"
-#~ msgstr "Handheldy"
+#~ 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 ""
+#~ "Správcov zodpovedajúcich za buildd konkrétnej architekúry môžete "
+#~ "zastihnúť na <genericemail arch@buildd.debian.org>, napr. <genericemail "
+#~ "i386@buildd.debian.org>."
-#~ msgid "Vendors"
-#~ msgstr "Dodávatelia"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Mená správcov jednotlivých buildd nájdete tiež na <a href=\"http://www."
+#~ "buildd.net\">http://www.buildd.net</a>. Vyberte si architektúru a "
+#~ "distribúciu pre ktorú chcete zobraziť správcov buildd."
-#~ msgid "Volatile Team"
-#~ msgstr "Tím volatile"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "súčasný líder projektu Debian"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "Projekt Bezpečnostný audit"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "Bezpečnostný tím pre „testing“"
diff --git a/slovak/po/others.sk.po b/slovak/po/others.sk.po
index 38bd88016ef..01f0677793a 100644
--- a/slovak/po/others.sk.po
+++ b/slovak/po/others.sk.po
@@ -166,26 +166,6 @@ msgstr "[Debian] (minitlačidlo)"
msgid "same as the above"
msgstr "rovnako ako vyššie"
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Hľadá sa:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Kto:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Architektúra:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Špecifikácie:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Kde:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Produkty"
@@ -230,22 +210,34 @@ msgstr "odznaky"
msgid "basketball goals"
msgstr "basketbalové koše"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "náušnice"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "kufre"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr "dáždniky"
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
msgstr "obliečky na vankúše"
+#: ../../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 "Ako dlho už používate Debian?"
@@ -322,3 +314,18 @@ msgstr "Verzia"
#: ../../english/y2k/l10n.data:36
msgid "URL"
msgstr "URL"
+
+#~ msgid "Where:"
+#~ msgstr "Kde:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Špecifikácie:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Architektúra:"
+
+#~ msgid "Who:"
+#~ msgstr "Kto:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Hľadá sa:"
diff --git a/slovak/po/ports.sk.po b/slovak/po/ports.sk.po
index f56de985a9c..30451e57948 100644
--- a/slovak/po/ports.sk.po
+++ b/slovak/po/ports.sk.po
@@ -119,32 +119,32 @@ msgstr "Debian pre PowerPC"
msgid "Debian for Sparc"
msgstr "Debian pre Sparc"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian pre Sparc64"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian pre S/390"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian pre notebooky"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian pre MIPS"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian pre AMD64"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian pre Motorola 680x0"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian pre ARM"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian pre Beowulf"
#~ msgid "Main"
#~ msgstr "Hlavné"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian pre Beowulf"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian pre ARM"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian pre Motorola 680x0"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian pre AMD64"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian pre MIPS"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian pre notebooky"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian pre S/390"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian pre Sparc64"
diff --git a/slovak/po/stats.sk.po b/slovak/po/stats.sk.po
index 983bed3b522..7f7b35b3f39 100644
--- a/slovak/po/stats.sk.po
+++ b/slovak/po/stats.sk.po
@@ -31,75 +31,75 @@ msgstr "%d bajtov na preloženie."
msgid "There are %d strings to translate."
msgstr "%d reťazcov na preloženie."
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Tento preklad je príliš zastaraný"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Nesprávna verzia prekladu"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "Originál je novší ako tento preklad"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "Originál už neexistuje"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "počet zásahov nedostupný"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "zásahov"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Kliknutím stiahnete údaje diffstat"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "Zjednotený diff"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "Zafarbený diff"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Zhrnutie pamäte prekladov pre"
-#: ../../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 "Nepreložené"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Zastarané"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Preložené"
-#: ../../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 "Aktuálne"
-#: ../../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 "súborov"
-#: ../../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 "bajtov"
-#: ../../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."
@@ -107,134 +107,134 @@ msgstr ""
"Pozn.: zoznamy stránok sú zoradené podľa popularity. Ak podržíte myš nad "
"názvom stránky, uvidíte počet zásahov."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Zastarané preklady"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "Súbor"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Diff"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Komentár"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Záznam"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Preklad"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Správca"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Stav"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Prekladateľ"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Dátum"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Všeobecné stránky nepreložené"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Nepreložené všeobecné stránky"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Novinky nepreložené"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Nepreložené novinky"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Stránky konzultantov používateľov nepreložené"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Nepreložené stránky konzultantov používateľov"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Medzinárodné stránky nepreložené"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Nepreložené medzinárodné stránky"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Preložené stránky (aktuálne)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Preložené šablóny (súbory .po)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Štatistika prekladov .po"
-#: ../../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 "Nepreložené"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Celkom"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Celkom:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Vytvorené pomocou"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Preložené webstránky"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Štatistika prekladov podľa počtu stránok"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Jazyk"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Preklady"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Preložené webstránky (podľa veľkosti)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Štatistika prekladov podľa veľkosti stránky"
diff --git a/slovak/po/templates.sk.po b/slovak/po/templates.sk.po
index e56412dcfec..bc1bd25eaa5 100644
--- a/slovak/po/templates.sk.po
+++ b/slovak/po/templates.sk.po
@@ -64,7 +64,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Späť na <a href=\"m4_HOME/\">úvodnú stránku projektu Debian</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 "Domovská stránka"
@@ -105,7 +105,7 @@ msgid "Support"
msgstr "Podpora"
#: ../../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 "Pre vývojárov"
@@ -142,7 +142,7 @@ msgid "Miscellaneous"
msgstr "Ostatné"
#: ../../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 "Ako&nbsp;získať&nbsp;Debian"
@@ -196,7 +196,7 @@ msgstr "vo vydaní 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 "
@@ -210,25 +210,25 @@ msgstr ""
"\">kontaktov</a> Debianu. Je k dispozícii aj <a href=\"m4_HOME/devel/website/"
"using_cvs\">zdrojový kód webu Debianu</a>."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Posledná zmena"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Autorské práva"
-#: ../../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> a iné;"
-#: ../../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 ""
"Prečítajte si <a href=\"m4_HOME/license\" rel=\"copyright\">licenčné "
"podmienky</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."
@@ -290,138 +290,148 @@ msgid "Debian Books"
msgstr "Knihy o Debiane"
#: ../../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 "Archívy konferencií"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Konferencie"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Spoločenská zmluva"
-#: ../../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 "Navštívte sponzora"
-#: ../../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 - Univerzálny operačný systém"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Mapa webstránok Debianu"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Databáza vývojárov"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr "Často kladené otázky o Debiane"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Príručka politiky Debianu"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Príručkka vývojárov"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Príručka nových správcov balíkov"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Chyby kandidátskych vydaní (RC)"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Správy Lintian"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Archívy používateľských konferencií"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Archívy vývojárskych konferencií"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Archívy 118n/l10n konferencií"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Archívy konferencií portov"
-#: ../../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 "Archívy konferencií Systému sledovania chýb (BTS)"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Archívy ostatných konferencií"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Free software"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Vývoj"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Pomôžte Debianu"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Hlásenie&nbsp;chýb"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Porty/architektúry"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Inštalačná príručka"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Predajcovia&nbsp;CD"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "Obrazy CD/USB"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Sieťová inštalácia"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Predinštalované"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Projekt Debian-Edu"
-#: ../../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 "Zaistenie kvality"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Systém sledovania balíkov"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Prehľad balíkov Vývojárov Debianu"
@@ -504,197 +514,180 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Späť na stránku <a href=\"../\">Kto používa Debian?</a>."
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Ak nás chcete kontaktovať, pozrite se najskôr na <a href=\"m4_HOME/contact"
-#~ "\">kontaktnú stránku</a>."
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Narazili ste na problém so vzhľadom stránky?"
-#~ msgid "package info"
-#~ msgstr "info o balíku"
+#~ msgid "Report it!"
+#~ msgstr "Nahláste ho!"
-#~ msgid "requested %s days ago."
-#~ msgstr "vyžiadaný pred %s dňami."
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Zvoľte si najbližší server: &nbsp;"
-#~ msgid "requested yesterday."
-#~ msgstr "vyžiadaný včera."
+#~ msgid "More information:"
+#~ msgstr "Ďalšie informácie:"
-#~ msgid "requested today."
-#~ msgstr "vyžiadaný dnes."
+#~ msgid "Taken by:"
+#~ msgstr "Rezervoval si:"
-#~ msgid "%s days in preparation."
-#~ msgstr "v príprave %s dní."
+#~ msgid "Nobody"
+#~ msgstr "Nikto"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "v príprave od včera."
+#~ msgid "Rating:"
+#~ msgstr "Hodnotenie:"
-#~ msgid "in preparation since today."
-#~ msgstr "v príprave od dnes."
+#~ msgid "More information"
+#~ msgstr "Ďalšie informácie"
-#~ msgid "%s days in adoption."
-#~ msgstr "adoptovaný pre %s dňami."
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "adoptovaný od včera"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Stiahnuť pomocou Jigdo"
-#~ msgid "in adoption since today."
-#~ msgstr "adoptovaný od dnes."
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Stiahnuť pomocou HTTP/FTP"
-#~ msgid "No help requested"
-#~ msgstr "Nevyžaduje sa žiadna pomoc"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Kúpiť CD alebo DVD"
-#~ msgid "No Requested packages"
-#~ msgstr "Žiadne Žiadané balíky"
+#~ msgid "Network Install"
+#~ msgstr "Sieťová inštalácia"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Žiadne balíky čakajúce na zabalenie"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Stiahnuť"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Žiadne balíky čakajúce na adopciu"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Rôzne"
-#~ msgid "No orphaned packages"
-#~ msgstr "Žiadne osirotené balíky"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Umenie"
-#~ msgid "No requests for adoption"
-#~ msgstr "Žiadne žiadosti o adopciu"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Zrkadlá"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Preložili ho %s."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Zrkadlá rsync"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Preložila ho %s."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Stiahnuť pomocou torrent"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Preložili ho %s."
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Sada pseudo obrazov"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Preložil ho %s."
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Info o vydaniach obrazov"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Toto vydanie Týždenníka Debianu (DWN) vydal <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD tím"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Toto vydanie Týždenníka Debianu (DWN) vydal <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_on_cd"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Týždenník Debianu (DWN) vydávajú <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Týždenník Debianu (DWN) vydáva <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "Sú dostupné <a href=\"../../\">staršie vydania</a> tohto týždenníka."
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "buy"
+#~ msgstr "kúpiť"
+
+#~ msgid "net_install"
+#~ msgstr "sieťová_inštalácia"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />rozličné"
#~ 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>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "Ak chcete dostávať tento týždenník emailom, <a href=\"http://lists.debian."
-#~ "org/debian-news/\">prihláste sa do konferencie debian-news</a>."
+#~ "Anglická <a href=\"/MailingLists/disclaimer\">verejná konferencia</a> o "
+#~ "CD/DVD:"
-#~ msgid "Other"
-#~ msgstr "Iné"
+#~ msgid "List of Consultants"
+#~ msgstr "Zoznam konzultantov"
-#~ msgid "Withdrawn"
-#~ msgstr "Stiahnuté"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Späť na stránku <a href=\"./\">Konzultantov Debianu</a>."
-#~ msgid "Decided"
-#~ msgstr "Rozhodnuté"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Najbližšie zaujímavosti"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Hlasovanie&nbsp;prebieha"
+#~ msgid "link may no longer be valid"
+#~ msgstr "odkaz už nemusí byť platný"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Diskutuje&nbsp;sa"
+#~ msgid "When"
+#~ msgstr "Kedy"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Čaká&nbsp;sa&nbsp;na&nbsp;sponzorov"
+#~ msgid "Where"
+#~ msgstr "Kde"
-#~ msgid "Outcome"
-#~ msgstr "Výsledok"
+#~ msgid "More Info"
+#~ msgstr "Ďalšie informácie"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Minimálna diskusia"
+#~ msgid "Debian Involvement"
+#~ msgstr "Zapojenie sa do Debianu"
-#~ msgid "Platforms"
-#~ msgstr "Platformy"
+#~ msgid "Main Coordinator"
+#~ msgstr "Hlavný koordinátor"
-#~ msgid "Debate"
-#~ msgstr "Diskusia"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Koordinátor</th><th>Projektu</th>"
-#~ msgid "Nominations"
-#~ msgstr "Nominácie"
+#~ msgid "Related Links"
+#~ msgstr "Súvisiace odkazy"
-#~ msgid "Date"
-#~ msgstr "Dátum"
+#~ msgid "Latest News"
+#~ msgstr "Posledné novinky"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Späť na stránku <a href=\"./\">Zoznam prednášajúcich o Debiane</a>."
+#~ msgid "Download calendar entry"
+#~ msgstr "Stiahnuť záznam kalendára"
-#~ msgid "List of Speakers"
-#~ msgstr "Zoznam prednášajúcich"
+#~ msgid "License Information"
+#~ msgstr "Licenčné informácie"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (nefunkčný odkaz)"
+#~ msgid "DLS Index"
+#~ msgstr "Index DLS"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Späť na: ďalšie <a href=\"./\">novinky Debianu</a> || <a href=\"m4_HOME/"
-#~ "\">úvodnú stránku projektu Debian</a>."
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Prehľad Zhrnutí licencií Debianu (DLS - Debian License Summaries) nájdete "
-#~ "na stránke <a href=\"./\">license information</a>."
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG FAQ"
-#~ msgid "Not Redistributable"
-#~ msgstr "Nešíriteľný"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Archív Debian-Legal"
-#~ msgid "Non-Free"
-#~ msgstr "Neslobodný"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Free"
-#~ msgstr "Slobodný"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Verzia %s: %s"
-#~ msgid "not redistributable"
-#~ msgstr "nešíriteľný"
+#~ msgid "Date published"
+#~ msgstr "Dátum zverejnenia"
-#~ msgid "non-free"
-#~ msgstr "neslobodný"
+#~ msgid "License"
+#~ msgstr "Licencia"
-#~ msgid "free"
-#~ msgstr "slobodný"
+#~ msgid "Version"
+#~ msgstr "Verzia"
-#~ msgid "License text"
-#~ msgstr "License text"
+#~ msgid "Summary"
+#~ msgstr "Zhrnutie"
-#~ msgid "License text (translated)"
-#~ msgstr "Text licencie (preložený)"
+#~ msgid "Justification"
+#~ msgstr "Zdôvodnenie"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Toto zhrnutie pripravil <summary-author/>."
+#~ msgid "Discussion"
+#~ msgstr "Diskusia"
+
+#~ msgid "Original Summary"
+#~ msgstr "Pôvodné zhrnutie"
#~ msgid ""
#~ "The original summary by <summary-author/> can be found in the <a href="
@@ -703,177 +696,194 @@ msgstr "Späť na stránku <a href=\"../\">Kto používa Debian?</a>."
#~ "Pôvodné zhrnutie od <summary-author/> nájdete v <a href=\"<summary-url/>"
#~ "\">archívoch konferencie</a>."
-#~ msgid "Original Summary"
-#~ msgstr "Pôvodné zhrnutie"
-
-#~ msgid "Discussion"
-#~ msgstr "Diskusia"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Toto zhrnutie pripravil <summary-author/>."
-#~ msgid "Justification"
-#~ msgstr "Zdôvodnenie"
+#~ msgid "License text (translated)"
+#~ msgstr "Text licencie (preložený)"
-#~ msgid "Summary"
-#~ msgstr "Zhrnutie"
+#~ msgid "License text"
+#~ msgstr "License text"
-#~ msgid "Version"
-#~ msgstr "Verzia"
+#~ msgid "free"
+#~ msgstr "slobodný"
-#~ msgid "License"
-#~ msgstr "Licencia"
+#~ msgid "non-free"
+#~ msgstr "neslobodný"
-#~ msgid "Date published"
-#~ msgstr "Dátum zverejnenia"
+#~ msgid "not redistributable"
+#~ msgstr "nešíriteľný"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Verzia %s: %s"
+#~ msgid "Free"
+#~ msgstr "Slobodný"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Non-Free"
+#~ msgstr "Neslobodný"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Archív Debian-Legal"
+#~ msgid "Not Redistributable"
+#~ msgstr "Nešíriteľný"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG FAQ"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Prehľad Zhrnutí licencií Debianu (DLS - Debian License Summaries) nájdete "
+#~ "na stránke <a href=\"./\">license information</a>."
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Späť na: ďalšie <a href=\"./\">novinky Debianu</a> || <a href=\"m4_HOME/"
+#~ "\">úvodnú stránku projektu Debian</a>."
-#~ msgid "DLS Index"
-#~ msgstr "Index DLS"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (nefunkčný odkaz)"
-#~ msgid "License Information"
-#~ msgstr "Licenčné informácie"
+#~ msgid "List of Speakers"
+#~ msgstr "Zoznam prednášajúcich"
-#~ msgid "Download calendar entry"
-#~ msgstr "Stiahnuť záznam kalendára"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Späť na stránku <a href=\"./\">Zoznam prednášajúcich o Debiane</a>."
-#~ msgid "Latest News"
-#~ msgstr "Posledné novinky"
+#~ msgid "Date"
+#~ msgstr "Dátum"
-#~ msgid "Related Links"
-#~ msgstr "Súvisiace odkazy"
+#~ msgid "Nominations"
+#~ msgstr "Nominácie"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Koordinátor</th><th>Projektu</th>"
+#~ msgid "Debate"
+#~ msgstr "Diskusia"
-#~ msgid "Main Coordinator"
-#~ msgstr "Hlavný koordinátor"
+#~ msgid "Platforms"
+#~ msgstr "Platformy"
-#~ msgid "Debian Involvement"
-#~ msgstr "Zapojenie sa do Debianu"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Minimálna diskusia"
-#~ msgid "More Info"
-#~ msgstr "Ďalšie informácie"
+#~ msgid "Outcome"
+#~ msgstr "Výsledok"
-#~ msgid "Where"
-#~ msgstr "Kde"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Čaká&nbsp;sa&nbsp;na&nbsp;sponzorov"
-#~ msgid "When"
-#~ msgstr "Kedy"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Diskutuje&nbsp;sa"
-#~ msgid "link may no longer be valid"
-#~ msgstr "odkaz už nemusí byť platný"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Hlasovanie&nbsp;prebieha"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Najbližšie zaujímavosti"
+#~ msgid "Decided"
+#~ msgstr "Rozhodnuté"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Späť na stránku <a href=\"./\">Konzultantov Debianu</a>."
+#~ msgid "Withdrawn"
+#~ msgstr "Stiahnuté"
-#~ msgid "List of Consultants"
-#~ msgstr "Zoznam konzultantov"
+#~ msgid "Other"
+#~ msgstr "Iné"
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "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 ""
-#~ "Anglická <a href=\"/MailingLists/disclaimer\">verejná konferencia</a> o "
-#~ "CD/DVD:"
-
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />rozličné"
-
-#~ msgid "net_install"
-#~ msgstr "sieťová_inštalácia"
-
-#~ msgid "buy"
-#~ msgstr "kúpiť"
+#~ "Ak chcete dostávať tento týždenník emailom, <a href=\"http://lists.debian."
+#~ "org/debian-news/\">prihláste sa do konferencie debian-news</a>."
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "Sú dostupné <a href=\"../../\">staršie vydania</a> tohto týždenníka."
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Týždenník Debianu (DWN) vydáva <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Týždenník Debianu (DWN) vydávajú <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_on_cd"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Toto vydanie Týždenníka Debianu (DWN) vydal <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD tím"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Toto vydanie Týždenníka Debianu (DWN) vydal <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Info o vydaniach obrazov"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Preložil ho %s."
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Sada pseudo obrazov"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Preložili ho %s."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Stiahnuť pomocou torrent"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Preložila ho %s."
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Zrkadlá rsync"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Preložili ho %s."
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Zrkadlá"
+#~ msgid "No requests for adoption"
+#~ msgstr "Žiadne žiadosti o adopciu"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Umenie"
+#~ msgid "No orphaned packages"
+#~ msgstr "Žiadne osirotené balíky"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Rôzne"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Žiadne balíky čakajúce na adopciu"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Stiahnuť"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Žiadne balíky čakajúce na zabalenie"
-#~ msgid "Network Install"
-#~ msgstr "Sieťová inštalácia"
+#~ msgid "No Requested packages"
+#~ msgstr "Žiadne Žiadané balíky"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Kúpiť CD alebo DVD"
+#~ msgid "No help requested"
+#~ msgstr "Nevyžaduje sa žiadna pomoc"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Stiahnuť pomocou HTTP/FTP"
+#~ msgid "in adoption since today."
+#~ msgstr "adoptovaný od dnes."
-#~ msgid "Download with Jigdo"
-#~ msgstr "Stiahnuť pomocou Jigdo"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "adoptovaný od včera"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "%s days in adoption."
+#~ msgstr "adoptovaný pre %s dňami."
-#~ msgid "More information"
-#~ msgstr "Ďalšie informácie"
+#~ msgid "in preparation since today."
+#~ msgstr "v príprave od dnes."
-#~ msgid "Rating:"
-#~ msgstr "Hodnotenie:"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "v príprave od včera."
-#~ msgid "Nobody"
-#~ msgstr "Nikto"
+#~ msgid "%s days in preparation."
+#~ msgstr "v príprave %s dní."
-#~ msgid "Taken by:"
-#~ msgstr "Rezervoval si:"
+#~ msgid "requested today."
+#~ msgstr "vyžiadaný dnes."
-#~ msgid "More information:"
-#~ msgstr "Ďalšie informácie:"
+#~ msgid "requested yesterday."
+#~ msgstr "vyžiadaný včera."
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Zvoľte si najbližší server: &nbsp;"
+#~ msgid "requested %s days ago."
+#~ msgstr "vyžiadaný pred %s dňami."
-#~ msgid "Report it!"
-#~ msgstr "Nahláste ho!"
+#~ msgid "package info"
+#~ msgstr "info o balíku"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "Narazili ste na problém so vzhľadom stránky?"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Ak nás chcete kontaktovať, pozrite se najskôr na <a href=\"m4_HOME/contact"
+#~ "\">kontaktnú stránku</a>."
diff --git a/slovak/po/vendors.sk.po b/slovak/po/vendors.sk.po
index 6327fd952e0..331f440c871 100644
--- a/slovak/po/vendors.sk.po
+++ b/slovak/po/vendors.sk.po
@@ -16,92 +16,85 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Dodávateľ:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL stránky Debianu:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Umožňuje príspevky do Debianu:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Krajina:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Medzinárodné dodanie:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "email:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Typ CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Typ DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Architektúry:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Dodávateľ"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Umožňuje príspevky"
-#: ../../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 "Architektúry"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Medzinárodné dodanie"
-#: ../../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 "Domovská stránka dodávateľa"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "stránka"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "email"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "v rámci Európy"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "Do niektorých oblastí"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "zdroj"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "a"
+
+#~ msgid "Architectures:"
+#~ msgstr "Architektúry:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Typ DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Typ CD:"
+
+#~ msgid "email:"
+#~ msgstr "email:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Medzinárodné dodanie:"
+
+#~ msgid "Country:"
+#~ msgstr "Krajina:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Umožňuje príspevky do Debianu:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL stránky Debianu:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Dodávateľ:"
diff --git a/slovak/po/vote.sk.po b/slovak/po/vote.sk.po
index 34d43e3f4ec..84c50b98ca7 100644
--- a/slovak/po/vote.sk.po
+++ b/slovak/po/vote.sk.po
@@ -25,229 +25,251 @@ msgid "Time Line"
msgstr "Časový rozvrh"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Nominácie"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Debata"
-#: ../../english/template/debian/votebar.wml:25
+#: ../../english/template/debian/votebar.wml:28
msgid "Platforms"
msgstr "Platformy"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Proposer"
msgstr "Navrhovateľ"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "Návrh A navrhuje"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "Návrh B navrhuje"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "Návrh C navrhuje"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "Návrh D navrhuje"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "Návrh E navrhuje"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "Návrh F navrhuje"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Seconds"
msgstr "Sekunduje"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
msgid "Proposal A Seconds"
msgstr "Návrh A sekunduje"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "Návrh B sekunduje"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "Návrh C sekunduje"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "Návrh D sekunduje"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "Návrh E sekunduje"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "Návrh F sekunduje"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
msgid "Opposition"
msgstr "Opozícia"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
msgid "Text"
msgstr "Text"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal A"
msgstr "Návrh A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "Návrh B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "Návrh C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "Návrh D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "Návrh E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "Návrh F"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
msgid "Choices"
msgstr "Možnosti"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
msgid "Amendment Proposer"
msgstr "Dodatok navrhuje"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
msgid "Amendment Seconds"
msgstr "Dodatok sekunduje"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
msgid "Amendment Text"
msgstr "Text dodatku"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
msgid "Amendment Proposer A"
msgstr "Dodatok navrhuje A"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "Dodatok sekunduje A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "Text dodatku A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "Dodatok navrhuje B"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "Dodatok sekunduje B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "Text dodatku B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "Dodatok navrhuje A"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "Dodatok sekunduje A"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "Text dodatku A"
+
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendments"
msgstr "Dodatky"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:139
msgid "Proceedings"
msgstr "Jednanie"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:142
msgid "Majority Requirement"
msgstr "Požiadavka väčšiny"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:145
msgid "Data and Statistics"
msgstr "Údaje a štatistika"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:148
msgid "Quorum"
msgstr "Kvórum"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:151
msgid "Minimum Discussion"
msgstr "Minimálna diskusia"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:154
msgid "Ballot"
msgstr "Počet hlasov"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:157
msgid "Forum"
msgstr "Fórum"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:160
msgid "Outcome"
msgstr "Výsledok"
-#: ../../english/template/debian/votebar.wml:152
+#: ../../english/template/debian/votebar.wml:164
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Čaká&nbsp;sa&nbsp;na&nbsp;sponzorov"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Diskutuje&nbsp;sa"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Hlasovanie&nbsp;otvorené"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Rozhodnuté"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Stiahnuté"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Iné"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Domov&nbsp;Stránka&nbsp;Hlasovania"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Ako&nbsp;na&nbsp;to"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Poslať&nbsp;návrh"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Doplniť&nbsp;návrh"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Sledovať&nbsp;návrh"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Prečítať&nbsp;výsledok"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Hlasovať"
diff --git a/slovene/po/bugs.sl.po b/slovene/po/bugs.sl.po
index 0ad1dbd90ae..a951bff6649 100644
--- a/slovene/po/bugs.sl.po
+++ b/slovene/po/bugs.sl.po
@@ -164,79 +164,79 @@ msgstr "arhivirane napake"
msgid "Archived and Unarchived"
msgstr ""
-#, fuzzy
-#~ msgid "Exclude tag:"
-#~ msgstr "Izključi stanje"
+#~ msgid "Flags:"
+#~ msgstr "Zastavice"
-#, fuzzy
-#~ msgid "Include tag:"
-#~ msgstr "Vključi stanje"
+#~ msgid "active bugs"
+#~ msgstr "aktivne napake"
-#, fuzzy
-#~ msgid "moreinfo"
-#~ msgstr "manj pomembno"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "brez razvrščanja po stanju in resnosti"
-#, fuzzy
-#~ msgid "potato"
-#~ msgstr "pomembno"
+#~ msgid "bugs"
+#~ msgstr "napake"
-#, fuzzy
-#~ msgid "Exclude severity:"
-#~ msgstr "Izključi stanje"
+#~ msgid "open"
+#~ msgstr "odprto"
-#, fuzzy
-#~ msgid "Include severity:"
-#~ msgstr "Vključi resnost"
+#~ msgid "forwarded"
+#~ msgstr "posredovano"
-#~ msgid "wishlist"
-#~ msgstr "želja"
+#~ msgid "pending"
+#~ msgstr "v čakanju"
-#~ msgid "minor"
-#~ msgstr "manj pomembno"
+#~ msgid "fixed"
+#~ msgstr "popravljeno"
-#~ msgid "important"
-#~ msgstr "pomembno"
+#~ msgid "done"
+#~ msgstr "končano"
-#~ msgid "serious"
-#~ msgstr "resno"
+#, fuzzy
+#~ msgid "Include status:"
+#~ msgstr "Vključi stanje"
-#~ msgid "grave"
-#~ msgstr "težko"
+#, fuzzy
+#~ msgid "Exclude status:"
+#~ msgstr "Izključi stanje"
#~ msgid "critical"
#~ msgstr "kritično"
-#, fuzzy
-#~ msgid "Exclude status:"
-#~ msgstr "Izključi stanje"
+#~ msgid "grave"
+#~ msgstr "težko"
-#, fuzzy
-#~ msgid "Include status:"
-#~ msgstr "Vključi stanje"
+#~ msgid "serious"
+#~ msgstr "resno"
-#~ msgid "done"
-#~ msgstr "končano"
+#~ msgid "important"
+#~ msgstr "pomembno"
-#~ msgid "fixed"
-#~ msgstr "popravljeno"
+#~ msgid "minor"
+#~ msgstr "manj pomembno"
-#~ msgid "pending"
-#~ msgstr "v čakanju"
+#~ msgid "wishlist"
+#~ msgstr "želja"
-#~ msgid "forwarded"
-#~ msgstr "posredovano"
+#, fuzzy
+#~ msgid "Include severity:"
+#~ msgstr "Vključi resnost"
-#~ msgid "open"
-#~ msgstr "odprto"
+#, fuzzy
+#~ msgid "Exclude severity:"
+#~ msgstr "Izključi stanje"
-#~ msgid "bugs"
-#~ msgstr "napake"
+#, fuzzy
+#~ msgid "potato"
+#~ msgstr "pomembno"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "brez razvrščanja po stanju in resnosti"
+#, fuzzy
+#~ msgid "moreinfo"
+#~ msgstr "manj pomembno"
-#~ msgid "active bugs"
-#~ msgstr "aktivne napake"
+#, fuzzy
+#~ msgid "Include tag:"
+#~ msgstr "Vključi stanje"
-#~ msgid "Flags:"
-#~ msgstr "Zastavice"
+#, fuzzy
+#~ msgid "Exclude tag:"
+#~ msgstr "Izključi stanje"
diff --git a/slovene/po/cdimage.sl.po b/slovene/po/cdimage.sl.po
index 2aefab70570..78d598f534d 100644
--- a/slovene/po/cdimage.sl.po
+++ b/slovene/po/cdimage.sl.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 " Key fingerprint"
-#: ../../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/slovene/po/countries.sl.po b/slovene/po/countries.sl.po
index 224ddb8842e..dd62e89e1e3 100644
--- a/slovene/po/countries.sl.po
+++ b/slovene/po/countries.sl.po
@@ -431,8 +431,8 @@ msgstr "Južna Afrika"
msgid "Zimbabwe"
msgstr "Zimbabve"
-#~ msgid "Great Britain"
-#~ msgstr "Velika Britanija"
-
#~ msgid "Yugoslavia"
#~ msgstr "Jugoslavija"
+
+#~ msgid "Great Britain"
+#~ msgstr "Velika Britanija"
diff --git a/slovene/po/distrib.sl.po b/slovene/po/distrib.sl.po
index bc9fbcb8c44..efca5a15c85 100644
--- a/slovene/po/distrib.sl.po
+++ b/slovene/po/distrib.sl.po
@@ -129,61 +129,69 @@ msgid "ARM"
msgstr ""
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
-msgid "HP PA-RISC"
+msgid "Hard Float ABI ARM"
msgstr ""
#: ../../english/releases/arches.data:14
-msgid "Hurd 32-bit PC (i386)"
+msgid "HP PA-RISC"
msgstr ""
#: ../../english/releases/arches.data:15
-msgid "32-bit PC (i386)"
+msgid "Hurd 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:16
-msgid "Intel Itanium IA-64"
+msgid "32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:17
-msgid "kFreeBSD 32-bit PC (i386)"
+msgid "Intel Itanium IA-64"
msgstr ""
#: ../../english/releases/arches.data:18
-msgid "kFreeBSD 64-bit PC (amd64)"
+msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
#: ../../english/releases/arches.data:19
-msgid "Motorola 680x0"
+msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
#: ../../english/releases/arches.data:20
-msgid "MIPS (big endian)"
+msgid "Motorola 680x0"
msgstr ""
#: ../../english/releases/arches.data:21
-msgid "MIPS (little endian)"
+msgid "MIPS (big endian)"
msgstr ""
#: ../../english/releases/arches.data:22
-msgid "PowerPC"
+msgid "MIPS (little endian)"
msgstr ""
#: ../../english/releases/arches.data:23
-msgid "IBM S/390"
+msgid "PowerPC"
msgstr ""
#: ../../english/releases/arches.data:24
-msgid "IBM System z"
+msgid "POWER Processors"
msgstr ""
#: ../../english/releases/arches.data:25
+msgid "IBM S/390"
+msgstr ""
+
+#: ../../english/releases/arches.data:26
+msgid "IBM System z"
+msgstr ""
+
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr ""
diff --git a/slovene/po/doc.sl.po b/slovene/po/doc.sl.po
index dab314d7b24..de0d8961c39 100644
--- a/slovene/po/doc.sl.po
+++ b/slovene/po/doc.sl.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,74 @@ msgstr "CD prilozxen:"
msgid "Publisher:"
msgstr "Zalozxba:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Avtorji:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Uredniki:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Vzdrzxevalec:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "Stanje:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "Dostopnost:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
#, fuzzy
msgid "Latest version:"
msgstr "Izdana razlicxica"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(razlicxica <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 "navadno besedilo"
-#. 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
-#, fuzzy
+#: ../../english/doc/manuals.defs:154
+msgid ""
+"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 ""
+
+#: ../../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 ""
-"Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-"ddp_pkg_loc />."
-msgstr "Uporabite <a href=\"cvs\">CVS</a> za prenos izvornega besedila v SGML."
+"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:158
+#: ../../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,30 +415,30 @@ msgstr ""
" na <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" in prevzemite modul <kbd>boot-floppies/documentation</kbd>."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Debianov paket"
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
#, fuzzy
#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Debianov paket"
-#: ../../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 "Latest version in development:"
-#~ msgstr "Najnovejsxa razlicxica v razvoju:"
+#~ msgid "Language:"
+#~ msgstr "Jezik:"
#~ msgid ""
#~ "CVS sources working copy: <p>Login to the CVS server using the command:"
@@ -413,5 +458,12 @@ msgstr ""
#~ "<pre>cvs -d:pserver:anonymous@cvs.debian.org:/cvs/debian-policy co <get-"
#~ "var doc /></pre>"
-#~ msgid "Language:"
-#~ msgstr "Jezik:"
+#~ msgid "Latest version in development:"
+#~ msgstr "Najnovejsxa razlicxica v razvoju:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Uporabite <a href=\"cvs\">CVS</a> za prenos izvornega besedila v SGML."
diff --git a/slovene/po/l10n.sl.po b/slovene/po/l10n.sl.po
index 05a7b0a40cb..b623e95bb33 100644
--- a/slovene/po/l10n.sl.po
+++ b/slovene/po/l10n.sl.po
@@ -94,8 +94,8 @@ msgstr "POT datoteke"
msgid "Hints for translators"
msgstr "Namigi za prevajalce"
-#~ msgid "Original templates"
-#~ msgstr "Izvirne predloge"
-
#~ msgid "Translated templates"
#~ msgstr "Prevedene predloge"
+
+#~ msgid "Original templates"
+#~ msgstr "Izvirne predloge"
diff --git a/slovene/po/newsevents.sl.po b/slovene/po/newsevents.sl.po
index bfc620d5e6e..8dbad66cbf5 100644
--- a/slovene/po/newsevents.sl.po
+++ b/slovene/po/newsevents.sl.po
@@ -27,27 +27,27 @@ msgstr "str. <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 ""
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr ""
@@ -336,8 +336,8 @@ msgstr ""
#: ../../english/template/debian/projectnews/footer.wml:6
#, fuzzy
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 ""
"Če želite prejemati ta dopis vsak teden v poštni nabiralnik, se <a href="
"\"m4_HOME/MailingLists/subscribe#debian-news\">prijavite</a> na poštni "
@@ -476,3 +476,13 @@ msgid ""
msgstr ""
"<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian.org"
"\">%s</a>."
+
+#, fuzzy
+#~ 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 ""
+#~ "Če želite prejemati ta dopis vsak teden v poštni nabiralnik, se <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">prijavite</a> na poštni "
+#~ "seznam debian-news."
diff --git a/slovene/po/organization.sl.po b/slovene/po/organization.sl.po
index 19348713450..ee09d528228 100644
--- a/slovene/po/organization.sl.po
+++ b/slovene/po/organization.sl.po
@@ -74,7 +74,7 @@ msgid "Officers"
msgstr "Funkcionarji"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribucija"
@@ -84,11 +84,11 @@ msgid "Publicity"
msgstr "Odnosi z javnostjo"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Podpora in infrastruktura"
-#. 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 ""
@@ -101,108 +101,108 @@ msgstr "Vodja"
msgid "Technical Committee"
msgstr "Tehnicxna komisija"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Tajnik"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Razvojni projekti"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Arhive FTP"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr ""
-#: ../../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 "Posamezni paketi"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Upravljanje izdaje"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
#, fuzzy
msgid "Release Team"
msgstr "Upravitelj izdaje"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Zagotavljanje kakovosti"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Skupina za namestitveni sistem"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
#, fuzzy
msgid "Release Notes"
msgstr "Upravitelj izdaje"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD Images"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Produkcija"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Testiranje"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Podpora in infrastruktura"
-#: ../../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
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Sistemska administracija"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Dokumentacija"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
#, fuzzy
msgid "Work-Needing and Prospective Packages list"
msgstr "Seznam nadebudnih in dela potrebnih paketov"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
#, fuzzy
#| msgid "Installation System Team"
msgid "Live System Team"
msgstr "Skupina za namestitveni sistem"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Druge platforme"
@@ -230,87 +230,77 @@ msgstr "Predstavnik za tisk"
msgid "Partner Program"
msgstr "Partnerski program"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Dogodki"
-#: ../../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 "Podpora uporabnikov"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Sledilnik napak"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
#, fuzzy
#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administracija posxtnih seznamov"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Sprejemnica za nove vzdrzxevalce"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
#, fuzzy
msgid "Debian Account Managers"
msgstr "Upravitelji uporabnisxkih imen razvijalcev"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Vzdrzxevalci kljucxev (PGP in GPG)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Skupina za varnost"
-#: ../../english/intro/organization.data:360
-#, fuzzy
-#| msgid "Security Team"
-msgid "Testing Security Team"
-msgstr "Skupina za varnost"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr ""
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Spletne strani"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Svetovalska stran"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
#, fuzzy
msgid "CD Vendors Page"
msgstr "Prodajalci"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Pravilnik"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Sistemska administracija"
-#: ../../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."
@@ -319,120 +309,126 @@ msgstr ""
"od Debianovih racxunalnikov, vkljucxno s tezxavami z gesli in paketi, ki jih "
"potrebujete."
-#: ../../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 ""
"Cxe imate strojne tezxave z Debianovimi racxunalniki, glejte stran <a href="
-"\"https://db.debian.org/machines.cgi\">Debianovi racxunalniki</a>, kjer boste "
-"nasxli podatke o administratorjih posameznih racxunalnikov."
+"\"https://db.debian.org/machines.cgi\">Debianovi racxunalniki</a>, kjer "
+"boste nasxli podatke o administratorjih posameznih racxunalnikov."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Skrbnik imenika razvijalcev LDAP"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Zrcalni strezxniki"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Vzdrzxevalec DNSa"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Sledilnikov paketov"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
#, fuzzy
msgid "Alioth administrators"
msgstr "Sistemska administracija"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
#, fuzzy
#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Razvojni projekti"
-#: ../../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 ""
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr ""
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr ""
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr ""
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr ""
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr ""
#, fuzzy
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Skupina za namestitveni sistem"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Distribucija"
-#~ msgid "Delegates"
-#~ msgstr "Delegati"
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "Upravitelj izdaje ''stable''"
-#~ msgid "Installation"
-#~ msgstr "Namestitev"
+#~ msgid "Vendors"
+#~ msgstr "Prodajalci"
-#~ msgid "Mailing list"
-#~ msgstr "Posxtni seznam"
+#~ msgid "APT Team"
+#~ msgstr "Skupina za APT"
+
+#~ msgid "Mailing List Archives"
+#~ msgstr "Arhive posxtnih seznamov"
#, fuzzy
#~ msgid "Security Testing Team"
#~ msgstr "Skupina za varnost"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Arhive posxtnih seznamov"
+#~ msgid "Mailing list"
+#~ msgstr "Posxtni seznam"
-#~ msgid "APT Team"
-#~ msgstr "Skupina za APT"
+#~ msgid "Installation"
+#~ msgstr "Namestitev"
-#~ msgid "Vendors"
-#~ msgstr "Prodajalci"
+#~ msgid "Delegates"
+#~ msgstr "Delegati"
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "Upravitelj izdaje ''stable''"
+#, fuzzy
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Skupina za namestitveni sistem"
#, fuzzy
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Distribucija"
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Skupina za varnost"
diff --git a/slovene/po/others.sl.po b/slovene/po/others.sl.po
index d3f84be0e79..81c4b2f6255 100644
--- a/slovene/po/others.sl.po
+++ b/slovene/po/others.sl.po
@@ -156,26 +156,6 @@ msgstr ""
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr ""
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr ""
@@ -220,22 +200,34 @@ msgstr ""
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr ""
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
msgid "pillowcases"
msgstr ""
+#: ../../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 ""
@@ -311,8 +303,23 @@ msgstr ""
msgid "URL"
msgstr ""
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Prijava na posxtni seznam"
+#~ msgid "p<get-var page />"
+#~ msgstr "str. <get-var page />"
+
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "je "
+
+#~ msgid "Subscription:"
+#~ msgstr "Prijava:"
+
+#~ msgid "Moderated:"
+#~ msgstr "Moderiran:"
+
+#~ msgid "No description given"
+#~ msgstr "Ni opisa"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Izberite poxtne sezname, na katere se zxelite prijaviti"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
@@ -323,20 +330,5 @@ msgstr ""
#~ "#subunsub\">posxtni seznami</a>. Na voljo je tudi <a href=\"unsubscribe"
#~ "\">spletni obrazec za odjavljanje</a> s posxtnih seznamov."
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Izberite poxtne sezname, na katere se zxelite prijaviti"
-
-#~ msgid "No description given"
-#~ msgstr "Ni opisa"
-
-#~ msgid "Moderated:"
-#~ msgstr "Moderiran:"
-
-#~ msgid "Subscription:"
-#~ msgstr "Prijava:"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "je "
-
-#~ msgid "p<get-var page />"
-#~ msgstr "str. <get-var page />"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Prijava na posxtni seznam"
diff --git a/slovene/po/templates.sl.po b/slovene/po/templates.sl.po
index b51c1ee2f84..467c70f5b28 100644
--- a/slovene/po/templates.sl.po
+++ b/slovene/po/templates.sl.po
@@ -67,7 +67,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</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 "Domov"
@@ -108,7 +108,7 @@ msgid "Support"
msgstr "Podpora"
#: ../../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 "Kotiček za razvijalce"
@@ -145,7 +145,7 @@ msgid "Miscellaneous"
msgstr "Razno"
#: ../../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 "Kako do Debiana"
@@ -201,7 +201,7 @@ msgstr "v izdaji 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 "
@@ -210,23 +210,23 @@ msgid ""
"\">available</a>."
msgstr ""
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Nazadnje spremenjeno"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Avtorske pravice"
-#: ../../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 ""
-#: ../../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 "Glej <a href=\"m4_HOME/license\" rel=\"copyright\">licenčne pogoje</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."
@@ -291,144 +291,154 @@ msgid "Debian Books"
msgstr "Knjige o Debianu"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "Pomagaj Debianu"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Poštni seznami in arhiv"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Poštni seznami"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Družbeni dogovor"
-#: ../../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 "Obišcite&nbsp;pokrovitelja&nbsp;spletnega&nbsp;mesta"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Zemljevid Debianovih spletnih strani "
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Podatkovna zbirka razvijalcev"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Knjige o Debianu"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Debianov pravilnik"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Pregledni priročnik za razvijalce"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Vodič za nove vzdrževalce"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Kritične napake"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Poročila iz Lintiana"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Arhiv uporabniških poštnih seznamov"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Arhiv razvijalskih poštnih seznamov"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Arhiv poštnih seznamov za internacionalizacijo in lokalizacijo"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Arhiv poštnih seznamov za nove strojne arhitekture"
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:98
#, fuzzy
msgid "Archives for mailing lists of the Bug tracking system"
msgstr "Arhiv poštnih seznamov za nove strojne arhitekture"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Arhiv raznih poštnih seznamov"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Prosto programje"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Razvoj"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Pomagaj Debianu"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Poročila o napakah"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Platforme/Arhitekture"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Navodila za namestitev"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
#, fuzzy
msgid "Network install"
msgstr "namestitev z omrežja"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
#, fuzzy
msgid "Pre-installed"
msgstr "net_install"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
#, fuzzy
msgid "Debian-Edu project"
msgstr "Projekt Debian"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr ""
@@ -517,359 +527,359 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Nazaj na ostale <a href=\"./\">novice o Debian</a>."
-#~ msgid "More information"
-#~ msgstr "Več podatkov"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Kmalu"
-
-#~ msgid "link may no longer be valid"
-#~ msgstr "povezava je verjetno zastarela"
-
-#~ msgid "When"
-#~ msgstr "Kdaj"
-
-#~ msgid "Where"
-#~ msgstr "Kje"
+#~ msgid "Select a server near you"
+#~ msgstr "Izberite strežnik v svoji bližini"
-#~ msgid "More Info"
+#~ msgid "More information:"
#~ msgstr "Več podatkov"
-#~ msgid "Debian Involvement"
-#~ msgstr "Sodelovanje z Debianom"
-
-#~ msgid "Main Coordinator"
-#~ msgstr "Glavni koordinator"
+#~ msgid "Taken by:"
+#~ msgstr "Prevzel"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Koordinator</th><th>projekta</th>"
+#~ msgid "Nobody"
+#~ msgstr "Nihče"
-#~ msgid "Related Links"
-#~ msgstr "Sorodne povezave"
+#~ msgid "Rating:"
+#~ msgstr "Ocena"
-#~ msgid "Latest News"
-#~ msgstr "Najnovejše novice"
+#~ msgid "List of Consultants"
+#~ msgstr "Seznam svetovalcev"
-#, fuzzy
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
#~ msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (mrtva povezava)"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
#, fuzzy
-#~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~ "list</a>."
-#~ msgstr ""
-#~ "Če želite prejemati ta dopis vsak teden v poštni nabiralnik, se <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">prijavite</a> na poštni "
-#~ "seznam debian-news."
+#~ msgid "Download with Jigdo"
+#~ msgstr "prenesi z jigdom"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "prenesi s http/ftp"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "Network Install"
+#~ msgstr "namestitev z omrežja"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_faq\" />faq"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />razno"
#, fuzzy
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_faq\" />faq"
#, 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>."
-#~ msgstr ""
-#~ "Če želite prejemati ta dopis vsak teden v poštni nabiralnik, se <a href="
-#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">prijavite</a> na poštni "
-#~ "seznam debian-news."
-
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_misc\" />razno"
#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_misc\" />razno"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD team"
-#, fuzzy
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
-#~ "org\">%s</a>."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_on_cd"
-#, fuzzy
-#~ msgid "No requests for adoption"
-#~ msgstr "Več podatkov"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />pogosta vprašanja"
+
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
+
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
+
+#~ msgid "buy"
+#~ msgstr "buy"
+
+#~ msgid "net_install"
+#~ msgstr "net_install"
+
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />razno"
#, fuzzy
-#~ msgid "No Requested packages"
-#~ msgstr "Prizadeti paketi"
+#~ msgid "Nominations"
+#~ msgstr "Donacije"
#, fuzzy
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_misc\" />razno"
+#~ msgid "Debate"
+#~ msgstr "Debian CD team"
#, fuzzy
-#~ msgid "License Information"
-#~ msgstr "Več podatkov"
+#~ msgid "Proposer"
+#~ msgstr "predlagano"
#, fuzzy
-#~ msgid "Discussion"
+#~ msgid "Minimum Discussion"
#~ msgstr "V&nbsp;diskusiji"
-#, fuzzy
-#~ msgid "non-free"
-#~ msgstr "nič"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Čakamo&nbsp;na&nbsp;pokrovitelje"
-#~ msgid "pik"
-#~ msgstr "pik"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "V&nbsp;diskusiji"
-#~ msgid "download with pik"
-#~ msgstr "prenesi s pikom"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "V&nbsp;glasovanju"
-#~ msgid "buy pre-made images"
-#~ msgstr "kupi ???"
+#~ msgid "Decided"
+#~ msgstr "Odločeno"
-#~ msgid "network install"
-#~ msgstr "namestitev z omrežja"
+#~ msgid "Withdrawn"
+#~ msgstr "Umaknjeno"
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Če se želite obrniti na nas, pojdite na <a href=\"m4_HOME/contact"
-#~ "\">kontaktno stran</a> za Debian."
+#~ msgid "Other"
+#~ msgstr "Drugo"
-#~ msgid "discussed"
-#~ msgstr "v diskusiji"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Domača&nbsp;glasovalna&nbsp;stran"
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Debianovo varnostno opozorilo"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Kako..."
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Debianova varnostna opozorila"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "podati&nbsp;predlog"
-#~ msgid "Date Reported"
-#~ msgstr "Dan prijave"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "podati&nbsp;amandma&nbsp;k&nbsp;predlogu"
-#~ msgid "Vulnerable"
-#~ msgstr "Ranljivo"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "spremljati&nbsp;predlog"
-#~ msgid "Fixed in"
-#~ msgstr "Popravljeno v"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "prebrati&nbsp;izide"
-#~ msgid "Source:"
-#~ msgstr "Izvor:"
+#~ msgid "Vote"
+#~ msgstr "glasovati"
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Arhitekturno neodvisna komponenta"
+#~ msgid "Security database references"
+#~ msgstr "Sklici iz varnostnih podatkovnih zbirk"
-#~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
-#~ msgstr ""
-#~ "MD5 kontrolne vsote naštetih datotek so na voljo v <a href=\"<get-var "
-#~ "url />\">prvotnem opozorilu</a>."
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "V slovarju Mitre's CVE "
-#~ msgid "No other external database security references currently available."
-#~ msgstr ""
-#~ "Trenutno ni na voljo drugih sklicev iz zunanjih varnostnih podatkovnih "
-#~ "zbirk."
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "V podatkovni zbirki Bugtraq (na SecurityFocusu)"
#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
#~ msgstr "CERTova poročila o ranljivosti, opozorila in poročila o incidentih"
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "V podatkovni zbirki Bugtraq (na SecurityFocusu)"
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "Trenutno ni na voljo drugih sklicev iz zunanjih varnostnih podatkovnih "
+#~ "zbirk."
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "V slovarju Mitre's CVE "
+#~ msgid ""
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
+#~ msgstr ""
+#~ "MD5 kontrolne vsote naštetih datotek so na voljo v <a href=\"<get-var "
+#~ "url />\">prvotnem opozorilu</a>."
-#~ msgid "Security database references"
-#~ msgstr "Sklici iz varnostnih podatkovnih zbirk"
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Arhitekturno neodvisna komponenta"
-#~ msgid "Vote"
-#~ msgstr "glasovati"
+#~ msgid "Source:"
+#~ msgstr "Izvor:"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "prebrati&nbsp;izide"
+#~ msgid "Fixed in"
+#~ msgstr "Popravljeno v"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "spremljati&nbsp;predlog"
+#~ msgid "Vulnerable"
+#~ msgstr "Ranljivo"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "podati&nbsp;amandma&nbsp;k&nbsp;predlogu"
+#~ msgid "Date Reported"
+#~ msgstr "Dan prijave"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "podati&nbsp;predlog"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Debianova varnostna opozorila"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Kako..."
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Debianovo varnostno opozorilo"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Domača&nbsp;glasovalna&nbsp;stran"
+#~ msgid "discussed"
+#~ msgstr "v diskusiji"
-#~ msgid "Other"
-#~ msgstr "Drugo"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Če se želite obrniti na nas, pojdite na <a href=\"m4_HOME/contact"
+#~ "\">kontaktno stran</a> za Debian."
-#~ msgid "Withdrawn"
-#~ msgstr "Umaknjeno"
+#~ msgid "network install"
+#~ msgstr "namestitev z omrežja"
-#~ msgid "Decided"
-#~ msgstr "Odločeno"
+#~ msgid "buy pre-made images"
+#~ msgstr "kupi ???"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "V&nbsp;glasovanju"
+#~ msgid "download with pik"
+#~ msgstr "prenesi s pikom"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "V&nbsp;diskusiji"
+#~ msgid "pik"
+#~ msgstr "pik"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Čakamo&nbsp;na&nbsp;pokrovitelje"
+#, fuzzy
+#~ msgid "non-free"
+#~ msgstr "nič"
#, fuzzy
-#~ msgid "Minimum Discussion"
+#~ msgid "Discussion"
#~ msgstr "V&nbsp;diskusiji"
#, fuzzy
-#~ msgid "Proposer"
-#~ msgstr "predlagano"
+#~ msgid "License Information"
+#~ msgstr "Več podatkov"
#, fuzzy
-#~ msgid "Debate"
-#~ msgstr "Debian CD team"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_misc\" />razno"
#, fuzzy
-#~ msgid "Nominations"
-#~ msgstr "Donacije"
-
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />razno"
-
-#~ msgid "net_install"
-#~ msgstr "net_install"
-
-#~ msgid "buy"
-#~ msgstr "buy"
-
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
-
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "No Requested packages"
+#~ msgstr "Prizadeti paketi"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />pogosta vprašanja"
+#, fuzzy
+#~ msgid "No requests for adoption"
+#~ msgstr "Več podatkov"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_on_cd"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD team"
+#, fuzzy
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_misc\" />razno"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <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>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_misc\" />razno"
+#~ 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 ""
+#~ "Če želite prejemati ta dopis vsak teden v poštni nabiralnik, se <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">prijavite</a> na poštni "
+#~ "seznam debian-news."
#, fuzzy
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_faq\" />faq"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />razno"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_faq\" />faq"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "Network Install"
-#~ msgstr "namestitev z omrežja"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "prenesi s http/ftp"
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian."
+#~ "org\">%s</a>."
#, fuzzy
-#~ msgid "Download with Jigdo"
-#~ msgstr "prenesi z jigdom"
+#~ msgid ""
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~ "list</a>."
+#~ msgstr ""
+#~ "Če želite prejemati ta dopis vsak teden v poštni nabiralnik, se <a href="
+#~ "\"m4_HOME/MailingLists/subscribe#debian-news\">prijavite</a> na poštni "
+#~ "seznam debian-news."
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (mrtva povezava)"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#, fuzzy
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
#~ msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "Seznam svetovalcev"
+#~ msgid "Latest News"
+#~ msgstr "Najnovejše novice"
-#~ msgid "Rating:"
-#~ msgstr "Ocena"
+#~ msgid "Related Links"
+#~ msgstr "Sorodne povezave"
-#~ msgid "Nobody"
-#~ msgstr "Nihče"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Koordinator</th><th>projekta</th>"
-#~ msgid "Taken by:"
-#~ msgstr "Prevzel"
+#~ msgid "Main Coordinator"
+#~ msgstr "Glavni koordinator"
-#~ msgid "More information:"
+#~ msgid "Debian Involvement"
+#~ msgstr "Sodelovanje z Debianom"
+
+#~ msgid "More Info"
#~ msgstr "Več podatkov"
-#~ msgid "Select a server near you"
-#~ msgstr "Izberite strežnik v svoji bližini"
+#~ msgid "Where"
+#~ msgstr "Kje"
+
+#~ msgid "When"
+#~ msgstr "Kdaj"
+
+#~ msgid "link may no longer be valid"
+#~ msgstr "povezava je verjetno zastarela"
+
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Kmalu"
+
+#~ msgid "More information"
+#~ msgstr "Več podatkov"
diff --git a/slovene/po/vendors.sl.po b/slovene/po/vendors.sl.po
index f78308fee73..79e9ddf9ed1 100644
--- a/slovene/po/vendors.sl.po
+++ b/slovene/po/vendors.sl.po
@@ -9,92 +9,56 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr ""
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr ""
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr ""
#. ###################
#. 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 ""
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr ""
diff --git a/slovene/po/vote.sl.po b/slovene/po/vote.sl.po
index 8fa0ddbe6aa..052f978979f 100644
--- a/slovene/po/vote.sl.po
+++ b/slovene/po/vote.sl.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 "Donacije"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
#, fuzzy
msgid "Debate"
msgstr "Debian CD team"
-#: ../../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 "predlagano"
-#: ../../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 "V&nbsp;diskusiji"
-#: ../../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 "Čakamo&nbsp;na&nbsp;pokrovitelje"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "V&nbsp;diskusiji"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "V&nbsp;glasovanju"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Odločeno"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Umaknjeno"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Drugo"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Domača&nbsp;glasovalna&nbsp;stran"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Kako..."
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "podati&nbsp;predlog"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "podati&nbsp;amandma&nbsp;k&nbsp;predlogu"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "spremljati&nbsp;predlog"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "prebrati&nbsp;izide"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "glasovati"
diff --git a/spanish/po/bugs.es.po b/spanish/po/bugs.es.po
index f42f4af6761..85dbf372778 100644
--- a/spanish/po/bugs.es.po
+++ b/spanish/po/bugs.es.po
@@ -160,152 +160,152 @@ msgstr "Archivados"
msgid "Archived and Unarchived"
msgstr "Archivados y desarchivados"
-#~ msgid "Flags:"
-#~ msgstr "Opciones:"
-
-#~ msgid "active bugs"
-#~ msgstr "fallos activos"
+#~ msgid "Exclude tag:"
+#~ msgstr "Excluir etiqueta:"
-#~ msgid "display merged bugs only once"
-#~ msgstr "mostrar fallos fusionados sólo una vez"
+#~ msgid "Include tag:"
+#~ msgstr "Incluir etiqueta:"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "no ordenar por estado o gravedad"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "no mostrar la tabla de contenidos en la cabecera"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "no mostrar las estadísticas en el pie de página"
+#~ msgid "wontfix"
+#~ msgstr "wontfix (no se arreglará)"
-#~ msgid "proposed-updates"
-#~ msgstr "actualizaciones_propuestas"
+#~ msgid "upstream"
+#~ msgstr "upstream (responsable autor original)"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "actualizaciones_propuestas_para_pruebas"
+#~ msgid "unreproducible"
+#~ msgstr "unreproducible (no reproducible)"
-#~ msgid "Package version:"
-#~ msgstr "Versión de paquete:"
+#~ msgid "security"
+#~ msgstr "security (seguridad)"
-#~ msgid "Distribution:"
-#~ msgstr "Distribución:"
+#~ msgid "patch"
+#~ msgstr "patch (parche)"
-#~ msgid "bugs"
-#~ msgstr "fallos"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo (más información)"
-#~ msgid "open"
-#~ msgstr "abierto"
+#~ msgid "l10n"
+#~ msgstr "l10n (internacionalización)"
-#~ msgid "forwarded"
-#~ msgstr "reenviado"
+#~ msgid "help"
+#~ msgstr "help (ayuda)"
-#~ msgid "pending"
-#~ msgstr "pendiente"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream (arreglado por el autor original)"
-#~ msgid "fixed"
-#~ msgstr "arreglado"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixed-in-experimental (arreglado en la distribución experimental)"
-#~ msgid "done"
-#~ msgstr "cerrado"
+#~ msgid "d-i"
+#~ msgstr "d-i (instalador)"
-#~ msgid "Include status:"
-#~ msgstr "Estados a incluir:"
+#~ msgid "confirmed"
+#~ msgstr "confirmado"
-#~ msgid "Exclude status:"
-#~ msgstr "Estados a excluir:"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "critical"
-#~ msgstr "crítico"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignore (omitido para la publicación de lenny)"
-#~ msgid "grave"
-#~ msgstr "grave"
+#~ msgid "lenny"
+#~ msgstr "lenny"
-#~ msgid "serious"
-#~ msgstr "serio"
+#~ msgid "etch-ignore"
+#~ msgstr "ecth-ignore (omitido para la publicación de etch)"
-#~ msgid "important"
-#~ msgstr "importante"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "minor"
-#~ msgstr "menor"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore (omitido para la publicación de sarge)"
-#~ msgid "wishlist"
-#~ msgstr "deseo"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "Include severity:"
-#~ msgstr "Gravedades a incluir:"
+#~ msgid "potato"
+#~ msgstr "potato"
#~ msgid "Exclude severity:"
#~ msgstr "Gravedades a excluir:"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "Include severity:"
+#~ msgstr "Gravedades a incluir:"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "wishlist"
+#~ msgstr "deseo"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore (omitido para la publicación de sarge)"
+#~ msgid "minor"
+#~ msgstr "menor"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "important"
+#~ msgstr "importante"
-#~ msgid "etch-ignore"
-#~ msgstr "ecth-ignore (omitido para la publicación de etch)"
+#~ msgid "serious"
+#~ msgstr "serio"
-#~ msgid "lenny"
-#~ msgstr "lenny"
+#~ msgid "grave"
+#~ msgstr "grave"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignore (omitido para la publicación de lenny)"
+#~ msgid "critical"
+#~ msgstr "crítico"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "Exclude status:"
+#~ msgstr "Estados a excluir:"
-#~ msgid "confirmed"
-#~ msgstr "confirmado"
+#~ msgid "Include status:"
+#~ msgstr "Estados a incluir:"
-#~ msgid "d-i"
-#~ msgstr "d-i (instalador)"
+#~ msgid "done"
+#~ msgstr "cerrado"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixed-in-experimental (arreglado en la distribución experimental)"
+#~ msgid "fixed"
+#~ msgstr "arreglado"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream (arreglado por el autor original)"
+#~ msgid "pending"
+#~ msgstr "pendiente"
-#~ msgid "help"
-#~ msgstr "help (ayuda)"
+#~ msgid "forwarded"
+#~ msgstr "reenviado"
-#~ msgid "l10n"
-#~ msgstr "l10n (internacionalización)"
+#~ msgid "open"
+#~ msgstr "abierto"
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo (más información)"
+#~ msgid "bugs"
+#~ msgstr "fallos"
-#~ msgid "patch"
-#~ msgstr "patch (parche)"
+#~ msgid "Distribution:"
+#~ msgstr "Distribución:"
-#~ msgid "security"
-#~ msgstr "security (seguridad)"
+#~ msgid "Package version:"
+#~ msgstr "Versión de paquete:"
-#~ msgid "unreproducible"
-#~ msgstr "unreproducible (no reproducible)"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "actualizaciones_propuestas_para_pruebas"
-#~ msgid "upstream"
-#~ msgstr "upstream (responsable autor original)"
+#~ msgid "proposed-updates"
+#~ msgstr "actualizaciones_propuestas"
-#~ msgid "wontfix"
-#~ msgstr "wontfix (no se arreglará)"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "no mostrar las estadísticas en el pie de página"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "no mostrar la tabla de contenidos en la cabecera"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "no ordenar por estado o gravedad"
-#~ msgid "Include tag:"
-#~ msgstr "Incluir etiqueta:"
+#~ msgid "display merged bugs only once"
+#~ msgstr "mostrar fallos fusionados sólo una vez"
-#~ msgid "Exclude tag:"
-#~ msgstr "Excluir etiqueta:"
+#~ msgid "active bugs"
+#~ msgstr "fallos activos"
+
+#~ msgid "Flags:"
+#~ msgstr "Opciones:"
diff --git a/spanish/po/cdimage.es.po b/spanish/po/cdimage.es.po
index ae08d64ab61..e9f14a1e2fc 100644
--- a/spanish/po/cdimage.es.po
+++ b/spanish/po/cdimage.es.po
@@ -16,16 +16,16 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../english/CD/CD-keys.data:5 ../../english/CD/CD-keys.data:9
-#: ../../english/CD/CD-keys.data:14
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
msgid " Key fingerprint"
msgstr " Huella de clave"
-#: ../../english/devel/debian-installer/images.data:92
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "imágenes ISO"
-#: ../../english/devel/debian-installer/images.data:93
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "archivos Jigdo"
diff --git a/spanish/po/countries.es.po b/spanish/po/countries.es.po
index 66092a8531d..2ba40468fee 100644
--- a/spanish/po/countries.es.po
+++ b/spanish/po/countries.es.po
@@ -428,8 +428,8 @@ msgstr "Sudáfrica"
msgid "Zimbabwe"
msgstr "Zimbabue"
-#~ msgid "Yugoslavia"
-#~ msgstr "Yugoslavia"
-
#~ msgid "Great Britain"
#~ msgstr "Reino Unido"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Yugoslavia"
diff --git a/spanish/po/distrib.es.po b/spanish/po/distrib.es.po
index bbda64a81dd..4c075f74858 100644
--- a/spanish/po/distrib.es.po
+++ b/spanish/po/distrib.es.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Distrib webwml\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2015-07-02 00:53+0100\n"
"Last-Translator: Laura Arjona Reina <larjona@larjona.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -12,7 +13,6 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: \n"
"X-Generator: Poedit 1.6.10\n"
#: ../../english/distrib/search_contents-form.inc:9
@@ -203,53 +203,53 @@ msgstr "IBM System z"
msgid "SPARC"
msgstr "SPARC"
-#~ msgid "non-US"
-#~ msgstr "non-US"
+#~ msgid "Intel x86"
+#~ msgstr "Intel x86"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "HP PA/RISC"
+#~ msgstr "HP PA/RISC"
-#~ msgid "Search case sensitive"
-#~ msgstr "Distinguir mayúsculas de minúsculas"
+#~ msgid "Intel IA-64"
+#~ msgstr "Intel IA-64"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Permitir búsquedas dentro de palabras"
+#~ msgid "kFreeBSD (AMD64)"
+#~ msgstr "kFreeBSD (AMD64)"
-#~ msgid "yes"
-#~ msgstr "sí"
+#~ msgid "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "no"
-#~ msgstr "no"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
-#~ msgid "Case sensitive"
-#~ msgstr "Distinguir mayúsculas de minúsculas"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "paquetes que contienen ficheros o directorios con ese nombre"
#~ msgid "all files in this package"
#~ msgstr "todos los ficheros en este paquete"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "paquetes que contienen ficheros o directorios con ese nombre"
+#~ msgid "Case sensitive"
+#~ msgstr "Distinguir mayúsculas de minúsculas"
-#~ msgid "Hurd (i386)"
-#~ msgstr "Hurd (i386)"
+#~ msgid "no"
+#~ msgstr "no"
-#~ msgid "kFreeBSD (Intel x86)"
-#~ msgstr "kFreeBSD (Intel x86)"
+#~ msgid "yes"
+#~ msgstr "sí"
-#~ msgid "kFreeBSD (AMD64)"
-#~ msgstr "kFreeBSD (AMD64)"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Permitir búsquedas dentro de palabras"
-#~ msgid "Intel IA-64"
-#~ msgstr "Intel IA-64"
+#~ msgid "Search case sensitive"
+#~ msgstr "Distinguir mayúsculas de minúsculas"
-#~ msgid "HP PA/RISC"
-#~ msgstr "HP PA/RISC"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "non-US"
+#~ msgstr "non-US"
diff --git a/spanish/po/doc.es.po b/spanish/po/doc.es.po
index fd6edf10dd7..f8fae67226f 100644
--- a/spanish/po/doc.es.po
+++ b/spanish/po/doc.es.po
@@ -17,7 +17,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\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"
@@ -45,7 +62,7 @@ msgstr ""
"automatizadas, o\n"
"la virtualización con Xen, KVM o LXC."
-#: ../../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"
@@ -61,15 +78,15 @@ msgstr ""
" un soporte básico para el usuario que instala y mantiene un sistema por\n"
" sí mismo (en casa, la oficina, un club o el colegio)."
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "CD Sarge con instalador y una selección de paquetes"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "CD «Live» con Knoppix"
-#: ../../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"
@@ -83,13 +100,13 @@ msgstr ""
"información de contexto sobre el proyecto y una cobertura extensiva\n"
"del sistema de gestión de paquetes único de Debian."
-#: ../../english/doc/books.data:77 ../../english/doc/books.data:180
-#: ../../english/doc/books.data:224 ../../english/doc/books.data:269
+#: ../../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 "Debian GNU/Linux 3.1r0a \"sarge\" oficial en DVD (i386)"
-#: ../../english/doc/books.data:80 ../../english/doc/books.data:183
-#: ../../english/doc/books.data:227 ../../english/doc/books.data:272
+#: ../../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"
@@ -116,7 +133,7 @@ msgstr ""
"recurso como una referencia estándar sobre Linux para arrancar\n"
"la experiencia Linux en una filosofía de abajo a arriba en Debian."
-#: ../../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 -- "
@@ -134,11 +151,11 @@ msgstr ""
"Como el software que describe el libro, el libro está liberado\n"
"y las fuentes están disponibles."
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
msgid "Debian 2.2 ARM architecture"
msgstr "Debian 2.2 arquitectura ARM "
-#: ../../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, "
@@ -175,7 +192,7 @@ msgstr ""
"se trabajará desde esta distribución y preferiblemente se dispone de una\n"
"máquina anfitriona también con Debian. "
-#: ../../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"
@@ -188,11 +205,11 @@ msgstr ""
"excitante mundo de la computación, guiada por Bill McCarty en <q>Aprendiendo "
"Debian GNU/Linux</q>."
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
msgid "Debian 2.1"
msgstr "Debian 2.1"
-#: ../../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"
@@ -207,11 +224,11 @@ msgstr ""
"soporte de correo\n"
"electrónico gratuito incluidos."
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "DVD Debian Squeeze i386/amd64"
-#: ../../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"
@@ -233,15 +250,27 @@ msgstr ""
"consejos para mejorar su dominio de las herramientas de Debian, y el\n"
"administrador que quiere construir una red confiable con Debian."
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "dos ediciones: una sin DVD, la otra con 2 DVDs (i386)"
-#: ../../english/doc/books.data:213
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr "Debian Squeeze, 6.0.1a, Multi arquitectura (i386 y amd64) en DVD"
-#: ../../english/doc/books.data:216
+#: ../../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 "
@@ -255,7 +284,7 @@ msgstr ""
"para todos los usuarios que quieren aprender más sobre Debian y su gama de "
"servicios."
-#: ../../english/doc/books.data:244
+#: ../../english/doc/books.data:287
msgid ""
"2 editions: One with no CD, the other with Official CD (i386, contrib and "
"sources)"
@@ -263,7 +292,7 @@ msgstr ""
"dos ediciones: una sin CD, la otra con el CD oficial (i386, contrib y "
"fuentes)"
-#: ../../english/doc/books.data:247
+#: ../../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"
@@ -295,11 +324,11 @@ msgstr ""
"como planificación y construcción de un enrutador de llamadas o\n"
"un servidor para clientes basados en Windows (Samba)."
-#: ../../english/doc/books.data:290
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "instalador Debian GNU/Linux 3.1 Sarge (CD de una sola cara)"
-#: ../../english/doc/books.data:293
+#: ../../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"
@@ -311,7 +340,7 @@ msgstr ""
"personalización del escritorio, resolución de problemas, conocimiento "
"aprovechable y más."
-#: ../../english/doc/books.data:306
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
@@ -319,7 +348,7 @@ msgstr ""
"Debian GNU/Linux 3.1r0 i386, edición del autor (DVD +\n"
" CD)"
-#: ../../english/doc/books.data:310
+#: ../../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"
@@ -340,11 +369,11 @@ msgstr ""
"para todos los usuarios de Debian, desde principiantes hasta usuarios "
"avanzados."
-#: ../../english/doc/books.data:325
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr "Debian 2.2r0 i386 edición del autor (3 CDs)"
-#: ../../english/doc/books.data:328
+#: ../../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"
@@ -362,11 +391,11 @@ msgstr ""
"Podrá instalar y comenzar a usar Debian GNU/Linux en un entorno en japonés\n"
"de manera muy sencilla con los CDs personalizados."
-#: ../../english/doc/books.data:344
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "1 Woody no oficial, 3 Potato rev0"
-#: ../../english/doc/books.data:347
+#: ../../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 "
@@ -385,11 +414,11 @@ msgstr ""
"Este libro también incluye una guía para mantenedores, que motiva\n"
"a la gente en Corea a ser mantenedores de Debian."
-#: ../../english/doc/books.data:361
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr "Tres CDs oficiales de potato r3 y un CD no oficial de woody"
-#: ../../english/doc/books.data:364
+#: ../../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"
@@ -408,11 +437,11 @@ msgstr ""
"instalar Debian para un entorno de trabajo en idioma coreano, y es bueno "
"también para los principiantes."
-#: ../../english/doc/books.data:386
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "Debian GNU/Linux 3.1r0 CD1"
-#: ../../english/doc/books.data:389
+#: ../../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"
@@ -425,7 +454,7 @@ msgstr ""
"empezar\n"
"a usar GNU/Linux y el potente sistema de gestión de paquetes de Debian."
-#: ../../english/doc/books.data:405
+#: ../../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 "
@@ -457,7 +486,7 @@ msgstr ""
"y cualquiera que quiera aprender GNU/Linux en profundidad. Este libro cubre\n"
"Debian Sarge."
-#: ../../english/doc/books.data:428
+#: ../../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 "
@@ -597,6 +626,19 @@ msgstr "HTML"
msgid "PDF"
msgstr "PDF"
+#~ msgid "Latest version in development:"
+#~ msgstr "Última versión de desarrollo:"
+
+#~ msgid "Language:"
+#~ msgstr "Idioma:"
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Use <a href=\"cvs\">SVN</a> para descargar el texto de las fuentes SGML "
+#~ "de <get-var ddp_pkg_loc />."
+
#~ msgid ""
#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
#~ "mode=viewone&amp;titnr=254925022\">\n"
@@ -609,16 +651,3 @@ msgstr "PDF"
#~ " publicación</a> alternativa está disponible en Lehmanns "
#~ "Fachbuchhandlung y cuesta 29.95\n"
#~ " euros (en 2008)."
-
-#~ msgid ""
-#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
-#~ "ddp_pkg_loc />."
-#~ msgstr ""
-#~ "Use <a href=\"cvs\">SVN</a> para descargar el texto de las fuentes SGML "
-#~ "de <get-var ddp_pkg_loc />."
-
-#~ msgid "Language:"
-#~ msgstr "Idioma:"
-
-#~ msgid "Latest version in development:"
-#~ msgstr "Última versión de desarrollo:"
diff --git a/spanish/po/organization.es.po b/spanish/po/organization.es.po
index 96864c36f81..641834906ba 100644
--- a/spanish/po/organization.es.po
+++ b/spanish/po/organization.es.po
@@ -79,17 +79,17 @@ msgid "Officers"
msgstr "Directores"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:79
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distribución"
#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:221
+#: ../../english/intro/organization.data:220
msgid "Publicity"
msgstr "Publicidad"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Apoyo e infrastructura"
@@ -106,191 +106,191 @@ msgstr "Líder"
msgid "Technical Committee"
msgstr "Comité técnico"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Secretario"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Proyectos de desarrollo"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Archivo FTP"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "Responsables del FTP"
-#: ../../english/intro/organization.data:89
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Ayudantes de FTP"
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "Magos del FTP"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Grupo de Backports"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Paquetes individuales"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Gestión de la publicación versiones"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Equipo responsable de la publicación"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Garantía de calidad"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Equipo del sistema de instalación"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Notas de la publicación"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Imágenes de CD"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Producción"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Pruebas"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Infrastructura de autocompiladores"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Equipo de wanna-build"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Administración de buildd"
-#: ../../english/intro/organization.data:167
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Documentación"
-#: ../../english/intro/organization.data:172
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Lista de paquetes en perspectiva o en los que se necesita ayuda"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Equipo del sistema de instalación «live»"
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Adaptaciones"
-#: ../../english/intro/organization.data:211
+#: ../../english/intro/organization.data:210
msgid "Special Configurations"
msgstr "Configuraciones Especiales"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:213
msgid "Laptops"
msgstr "Portátiles"
-#: ../../english/intro/organization.data:215
+#: ../../english/intro/organization.data:214
msgid "Firewalls"
msgstr "Cortafuegos"
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:215
msgid "Embedded systems"
msgstr "Sistemas embebidos"
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:223
msgid "Press Contact"
msgstr "Contacto de Prensa"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:229
msgid "Partner Program"
msgstr "Programa de Socios"
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Eventos"
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Bits de Debian"
-#: ../../english/intro/organization.data:248
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Soporte a usuarios"
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Sistema de seguimiento de errores"
-#: ../../english/intro/organization.data:320
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administración de las listas de correo y de los archivos de las listas"
-#: ../../english/intro/organization.data:328
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Recepción de nuevos miembros"
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Gestores de cuentas de Debian"
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Responsable del anillo de claves (PGP y GPG)"
-#: ../../english/intro/organization.data:343
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Grupo de gestión del anillo de claves de los desarrolladores Debian"
-#: ../../english/intro/organization.data:347
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Equipo de seguridad"
-#: ../../english/intro/organization.data:362
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Páginas web"
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Página de consultores"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Página de vendedores de CDs"
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Planeta Debian"
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Normativa"
-#: ../../english/intro/organization.data:386
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Administración del sistema"
-#: ../../english/intro/organization.data:387
+#: ../../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."
@@ -299,7 +299,7 @@ msgstr ""
"máquinas de Debian, incluyendo problemas con las claves o si usted necesita "
"que se instale algun paquete."
-#: ../../english/intro/organization.data:397
+#: ../../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 "
@@ -309,180 +309,179 @@ msgstr ""
"<a href=\"https://db.debian.org/machines.cgi\">Máquinas de Debian</a>, que "
"debería contener información del administrador de cada máquina."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Administrador del directorio LDAP de desarrolladores"
-#: ../../english/intro/organization.data:399
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Réplicas"
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Responsable del DNS"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Sistema de seguimiento de paquetes"
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Coordinación de donaciones de hardware"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Auditor"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:413
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Solicitudes de uso de la <a name=\"trademark\" href=\"m4_HOME/trademark"
"\">Marca Registrada</a>"
-#: ../../english/intro/organization.data:417
-msgid "current Debian Project Leader"
-msgstr "Líder del Proyecto Debian actual"
-
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Administradores de Alioth"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Proyectos Mujeres Debian"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "organizadores de Debconf"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Anti acoso"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:436
msgid "Outreach"
msgstr "Extensión"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:446
msgid "Debian for children from 1 to 99"
msgstr "Debian para niños de 1 a 99"
-#: ../../english/intro/organization.data:452
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian para investigación y práctica médica"
-#: ../../english/intro/organization.data:455
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian para la educación"
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian en oficinas de abogados"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian para personas con discapacidades"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian para la ciencia e investigación relacionada"
-#~ msgid "Testing Security Team"
-#~ msgstr "Equipo de seguridad de la distribución «en pruebas»"
-
-#~ msgid "Security Audit Project"
-#~ msgstr "Proyecto de auditoría de seguridad"
-
-#~ msgid "Handhelds"
-#~ msgstr "Agendas electrónicas y similares"
-
-#~ msgid "Marketing Team"
-#~ msgstr "Equipo de marketing"
-
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Coordinación de firma de claves"
+#~ msgid "Volatile Team"
+#~ msgstr "Equipo responsable de «volatile»"
-#~ msgid "Release Assistants"
-#~ msgstr "Asistentes a la publicación de versiones"
+#~ msgid "Vendors"
+#~ msgstr "Vendedores"
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "Asistentes a la publicación de «estable»"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Distribuciones Debian Derivadas"
-# JFS: Seguramente haya una mejor traducción...
-#~ msgid "Release Wizard"
-#~ msgstr "Mago de la publicación"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Equipo responsable de la publicación de «estable»"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Distribución multimedia Debian"
+#~ msgid "APT Team"
+#~ msgstr "Equipo de APT"
#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
+#~ "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 ""
-#~ "Éste no es aún un proyecto interno oficial de Debian pero ha anunciado su "
-#~ "intención de integrarse."
+#~ "Puede contactar con los administadores responsables para los buildd de "
+#~ "una arquitectura específica en la dirección <genericemail arch@buildd."
+#~ "debian.org>. Por ejemplo: <genericemail i386@buildd.debian.org>."
-#~ msgid "Mailing List Archives"
-#~ msgstr "Archivos de las listas de correo"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Puede encontrar los nombres de los administradores de un buildd "
+#~ "particular en <a href=\"http://www.buildd.net\">http://www.buildd.net</"
+#~ "a>. Escoja una arquitectura y distribución para ver la lista de máquinas "
+#~ "buildd disponibles y sus administradores."
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian GNU/Linux para el cómputo empresarial"
+#~ msgid "Accountant"
+#~ msgstr "Contabilidad"
-#~ msgid "Delegates"
-#~ msgstr "Delegados"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "El sistema operativo universal como su escritorio"
-#~ msgid "Installation"
-#~ msgstr "Instalación"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian para asociaciones sin ánimo de lucro"
-#~ msgid "Mailing list"
-#~ msgstr "Lista de correo"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "Sistema de instalación de la versión «estable»"
#~ msgid "Internal Projects"
#~ msgstr "Proyectos internos"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "Sistema de instalación de la versión «estable»"
+#~ msgid "Mailing list"
+#~ msgstr "Lista de correo"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian para asociaciones sin ánimo de lucro"
+#~ msgid "Installation"
+#~ msgstr "Instalación"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "El sistema operativo universal como su escritorio"
+#~ msgid "Delegates"
+#~ msgstr "Delegados"
-#~ msgid "Accountant"
-#~ msgstr "Contabilidad"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian GNU/Linux para el cómputo empresarial"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Puede encontrar los nombres de los administradores de un buildd "
-#~ "particular en <a href=\"http://www.buildd.net\">http://www.buildd.net</"
-#~ "a>. Escoja una arquitectura y distribución para ver la lista de máquinas "
-#~ "buildd disponibles y sus administradores."
+#~ msgid "Mailing List Archives"
+#~ msgstr "Archivos de las listas de correo"
#~ 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>."
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
#~ msgstr ""
-#~ "Puede contactar con los administadores responsables para los buildd de "
-#~ "una arquitectura específica en la dirección <genericemail arch@buildd."
-#~ "debian.org>. Por ejemplo: <genericemail i386@buildd.debian.org>."
+#~ "Éste no es aún un proyecto interno oficial de Debian pero ha anunciado su "
+#~ "intención de integrarse."
-#~ msgid "APT Team"
-#~ msgstr "Equipo de APT"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Distribución multimedia Debian"
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Equipo responsable de la publicación de «estable»"
+# JFS: Seguramente haya una mejor traducción...
+#~ msgid "Release Wizard"
+#~ msgstr "Mago de la publicación"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Distribuciones Debian Derivadas"
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "Asistentes a la publicación de «estable»"
-#~ msgid "Vendors"
-#~ msgstr "Vendedores"
+#~ msgid "Release Assistants"
+#~ msgstr "Asistentes a la publicación de versiones"
-#~ msgid "Volatile Team"
-#~ msgstr "Equipo responsable de «volatile»"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Coordinación de firma de claves"
+
+#~ msgid "Marketing Team"
+#~ msgstr "Equipo de marketing"
+
+#~ msgid "Handhelds"
+#~ msgstr "Agendas electrónicas y similares"
+
+#~ msgid "Security Audit Project"
+#~ msgstr "Proyecto de auditoría de seguridad"
+
+#~ msgid "Testing Security Team"
+#~ msgstr "Equipo de seguridad de la distribución «en pruebas»"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Líder del Proyecto Debian actual"
diff --git a/spanish/po/others.es.po b/spanish/po/others.es.po
index a75cbac801e..2d9aecb9397 100644
--- a/spanish/po/others.es.po
+++ b/spanish/po/others.es.po
@@ -316,96 +316,116 @@ msgstr "Versión"
msgid "URL"
msgstr "URL"
-#~ msgid "p<get-var page />"
-#~ msgstr "pág.<get-var page />"
+#~ msgid "Wanted:"
+#~ msgstr "Deseado:"
-#~ msgid "Previous Talks:"
-#~ msgstr "Conferencias previas:"
+#~ msgid "Who:"
+#~ msgstr "Quién:"
-#~ msgid "Languages:"
-#~ msgstr "Idiomas:"
+#~ msgid "Architecture:"
+#~ msgstr "Arquitectura"
-#~ msgid "Location:"
-#~ msgstr "Localización:"
+#~ msgid "Specifications:"
+#~ msgstr "Especificaciones:"
-#~ msgid "Topics:"
-#~ msgstr "Temas:"
+#~ msgid "Where:"
+#~ msgstr "Dónde:"
-#~ msgid "rc3 (broken)"
-#~ msgstr "rc3 (roto)"
+#~ msgid "Name:"
+#~ msgstr "Nombre:"
-#~ msgid "rc3"
-#~ msgstr "rc3"
+#~ msgid "Company:"
+#~ msgstr "Compañía:"
-#~ msgid "rc2"
-#~ msgstr "rc2"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "Debian GNU/Linux: Your next Linux distribution."
-#~ msgstr "Debian GNU/Linux: Tu próxima distribución de Linux."
+#~ msgid "or"
+#~ msgstr "o"
-#~ msgid "Debian: The Perfect OS"
-#~ msgstr "Debian: El S.O perfecto."
+#~ msgid "Email:"
+#~ msgstr "Correo electrónico:"
-#~ msgid "Debian: The biggest is still the best."
-#~ msgstr "Debian: Lo más grande aún es lo mejor."
+#~ msgid "Rates:"
+#~ msgstr "Tarifas:"
-#~ msgid "Older Debian banners"
-#~ msgstr "Pancartas de Debian antiguas"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Sin localización definida"
-#~ msgid "Debian: the potato has landed. announcing version 2.2"
-#~ msgstr "Debian: la patata ha aterrizado. Anunciando la versión 2.2"
+#~ msgid ""
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
+#~ msgstr ""
+#~ "<total_consultant> consultores de Debian en total en <total_country> "
+#~ "países por todo el mundo."
-#~ msgid "Debian: apt-get into it."
-#~ msgstr "Debian: apt-get'étate dentro de ella."
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Suscripción a las listas de correo"
-#~ msgid "Newer Debian banners"
-#~ msgstr "Nuevas pancartas de Debian"
+#~ 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. "
+#~ msgstr ""
+#~ "Vea la página de las <a href=\"./#subunsub\">listas de correo</a> para "
+#~ "tener información sobre cómo suscribirse usando el correo electrónico. "
+#~ "También hay disponible un <a href=\"unsubscribe\">formulario web de "
+#~ "desuscripción</a>, para darse de baja de las listas de correo. "
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "cartel&nbsp;GIF&nbsp;animado"
+#~ msgid ""
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
+#~ msgstr ""
+#~ "Tenga en cuenta que la mayoría de las listas de correo de Debian son "
+#~ "foros públicos. Cualquier correo enviado a las listas se publicará en los "
+#~ "archivos de las listas de correo y será indexado por motores de búsqueda. "
+#~ "Sólo debería suscribirse a las listas de correo de Debian con una "
+#~ "dirección de correo que no le importa que se haga pública."
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "cartel&nbsp;horizontal"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Por favor, seleccione a qué listas quiere suscribirse:"
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "cartel&nbsp;vertical"
+#~ msgid "No description given"
+#~ msgstr "Sin descripción."
-#~ msgid "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">more info</a>)"
-#~ msgstr ""
-#~ "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">más información</a>)"
+#~ msgid "Moderated:"
+#~ msgstr "Moderada:"
+
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "El envío de mensajes sólo está permitido a los suscritos."
#~ msgid ""
-#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.php\">more info</a>)"
+#~ "Only messages signed by a Debian developer will be accepted by this list."
#~ msgstr ""
-#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.php\">más "
-#~ "información</a>)"
-
-#~ msgid "Q"
-#~ msgstr "P"
-
-#~ msgid "developers only"
-#~ msgstr "sólo desarrolladores"
+#~ "Sólo se aceptarán mensajes a esta lista si están firmados por un "
+#~ "desarrollador de Debian."
-#~ msgid "deity developers only"
-#~ msgstr "sólo desarrolladores de deity"
+#~ msgid "Subscription:"
+#~ msgstr "Suscripción:"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "sólo Comité Técnico de Debian"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "es una versión resumida, de sólo lectura."
-#~ msgid "beta 4"
-#~ msgstr "beta 4"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Su dirección de correo:"
-#~ msgid "closed"
-#~ msgstr "cerrada"
+#~ msgid "Subscribe"
+#~ msgstr "Enviar suscripción"
-#~ msgid "open"
-#~ msgstr "abierta"
+#~ msgid "Clear"
+#~ msgstr "Borrar selección"
-#~ msgid "Unsubscribe"
-#~ msgstr "Enviar desuscripción"
+#~ msgid ""
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
+#~ msgstr ""
+#~ " Por favor, respete la <a href=\"./#ads\">política de publicidad en las "
+#~ "listas de correo de Debian</a>. "
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Por favor, seleccione las listas de las que quiere darse de baja:"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Desuscripción de las listas de correo"
#~ msgid ""
#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
@@ -417,113 +437,93 @@ msgstr "URL"
#~ "También hay disponible un <a href=\"subscribe\">formulario web de "
#~ "suscripción</a>, para suscribirse a las listas de correo. "
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Desuscripción de las listas de correo"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Por favor, seleccione las listas de las que quiere darse de baja:"
-#~ msgid ""
-#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
-#~ "policy</a>."
-#~ msgstr ""
-#~ " Por favor, respete la <a href=\"./#ads\">política de publicidad en las "
-#~ "listas de correo de Debian</a>. "
+#~ msgid "Unsubscribe"
+#~ msgstr "Enviar desuscripción"
-#~ msgid "Clear"
-#~ msgstr "Borrar selección"
+#~ msgid "open"
+#~ msgstr "abierta"
-#~ msgid "Subscribe"
-#~ msgstr "Enviar suscripción"
+#~ msgid "closed"
+#~ msgstr "cerrada"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Su dirección de correo:"
+#~ msgid "beta 4"
+#~ msgstr "beta 4"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "es una versión resumida, de sólo lectura."
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "sólo Comité Técnico de Debian"
-#~ msgid "Subscription:"
-#~ msgstr "Suscripción:"
+#~ msgid "deity developers only"
+#~ msgstr "sólo desarrolladores de deity"
+
+#~ msgid "developers only"
+#~ msgstr "sólo desarrolladores"
+
+#~ msgid "Q"
+#~ msgstr "P"
#~ msgid ""
-#~ "Only messages signed by a Debian developer will be accepted by this list."
+#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.php\">more info</a>)"
#~ msgstr ""
-#~ "Sólo se aceptarán mensajes a esta lista si están firmados por un "
-#~ "desarrollador de Debian."
-
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "El envío de mensajes sólo está permitido a los suscritos."
+#~ "(<a href=\"http://www.debian-br.org/projetos/webwml.php\">más "
+#~ "información</a>)"
-#~ msgid "Moderated:"
-#~ msgstr "Moderada:"
+#~ msgid "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">more info</a>)"
+#~ msgstr ""
+#~ "(<a href=\"m4_HOME/intl/Swedish/bidragslamnare#web\">más información</a>)"
-#~ msgid "No description given"
-#~ msgstr "Sin descripción."
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "cartel&nbsp;vertical"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Por favor, seleccione a qué listas quiere suscribirse:"
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "cartel&nbsp;horizontal"
-#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
-#~ msgstr ""
-#~ "Tenga en cuenta que la mayoría de las listas de correo de Debian son "
-#~ "foros públicos. Cualquier correo enviado a las listas se publicará en los "
-#~ "archivos de las listas de correo y será indexado por motores de búsqueda. "
-#~ "Sólo debería suscribirse a las listas de correo de Debian con una "
-#~ "dirección de correo que no le importa que se haga pública."
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "cartel&nbsp;GIF&nbsp;animado"
-#~ 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. "
-#~ msgstr ""
-#~ "Vea la página de las <a href=\"./#subunsub\">listas de correo</a> para "
-#~ "tener información sobre cómo suscribirse usando el correo electrónico. "
-#~ "También hay disponible un <a href=\"unsubscribe\">formulario web de "
-#~ "desuscripción</a>, para darse de baja de las listas de correo. "
+#~ msgid "Newer Debian banners"
+#~ msgstr "Nuevas pancartas de Debian"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Suscripción a las listas de correo"
+#~ msgid "Debian: apt-get into it."
+#~ msgstr "Debian: apt-get'étate dentro de ella."
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "<total_consultant> consultores de Debian en total en <total_country> "
-#~ "países por todo el mundo."
+#~ msgid "Debian: the potato has landed. announcing version 2.2"
+#~ msgstr "Debian: la patata ha aterrizado. Anunciando la versión 2.2"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Sin localización definida"
+#~ msgid "Older Debian banners"
+#~ msgstr "Pancartas de Debian antiguas"
-#~ msgid "Rates:"
-#~ msgstr "Tarifas:"
+#~ msgid "Debian: The biggest is still the best."
+#~ msgstr "Debian: Lo más grande aún es lo mejor."
-#~ msgid "Email:"
-#~ msgstr "Correo electrónico:"
+#~ msgid "Debian: The Perfect OS"
+#~ msgstr "Debian: El S.O perfecto."
-#~ msgid "or"
-#~ msgstr "o"
+#~ msgid "Debian GNU/Linux: Your next Linux distribution."
+#~ msgstr "Debian GNU/Linux: Tu próxima distribución de Linux."
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "rc2"
+#~ msgstr "rc2"
-#~ msgid "Company:"
-#~ msgstr "Compañía:"
+#~ msgid "rc3"
+#~ msgstr "rc3"
-#~ msgid "Name:"
-#~ msgstr "Nombre:"
+#~ msgid "rc3 (broken)"
+#~ msgstr "rc3 (roto)"
-#~ msgid "Where:"
-#~ msgstr "Dónde:"
+#~ msgid "Topics:"
+#~ msgstr "Temas:"
-#~ msgid "Specifications:"
-#~ msgstr "Especificaciones:"
+#~ msgid "Location:"
+#~ msgstr "Localización:"
-#~ msgid "Architecture:"
-#~ msgstr "Arquitectura"
+#~ msgid "Languages:"
+#~ msgstr "Idiomas:"
-#~ msgid "Who:"
-#~ msgstr "Quién:"
+#~ msgid "Previous Talks:"
+#~ msgstr "Conferencias previas:"
-#~ msgid "Wanted:"
-#~ msgstr "Deseado:"
+#~ msgid "p<get-var page />"
+#~ msgstr "pág.<get-var page />"
diff --git a/spanish/po/stats.es.po b/spanish/po/stats.es.po
index d840218ba36..0853697f3cc 100644
--- a/spanish/po/stats.es.po
+++ b/spanish/po/stats.es.po
@@ -56,75 +56,75 @@ msgstr "Hay %d bytes por traducir."
msgid "There are %d strings to translate."
msgstr "Hay %d cadenas de caracteres por traducir."
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Esta traducción está muy desactualizada"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Versión incorrecta de traducción"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "La original es más nueva que esta traducción"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "La original ya no existe"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "contador de visitas N/A"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "visitas"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Haga clic para obtener la información de diffstat"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "Diff unificado"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "Diff coloreado"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Resumen de traducción para"
-#: ../../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 "Sin traducir"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Desactualizado"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Traducido"
-#: ../../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 "Actualizado"
-#: ../../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 "ficheros"
-#: ../../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 "bytes"
-#: ../../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."
@@ -132,134 +132,134 @@ msgstr ""
"Nota: el listado de páginas está ordenado por popularidad. Coloque el ratón "
"sobre el nombre de la página para ver el número de visitas."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Traducciones desactualizadas"
-#: ../../stattrans.pl:606 ../../stattrans.pl:662
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
msgid "File"
msgstr "Fichero"
-#: ../../stattrans.pl:608 ../../stattrans.pl:614
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
msgid "Diff"
msgstr "Diferencias"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Comentarios"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Registro"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Traducción"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Encargado"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Estado"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Traductor"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Fecha"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Páginas generales no traducidas"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Páginas generales sin traducir"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Elementos de noticias no traducidos"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Elementos de noticias sin traducir"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Páginas de consultores/usuarios no traducidas"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Páginas de consultores/usuarios sin traducir"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Páginas internacionales no traducidas"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Páginas internacionales sin traducir"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Páginas traducidas (actualizadas)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Plantillas traducidas (ficheros PO)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Estadísticas de traducción de ficheros PO"
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr "Impreciso"
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr "Sin traducir"
-#: ../../stattrans.pl:666
+#: ../../stattrans.pl:629
msgid "Total"
msgstr "Total"
-#: ../../stattrans.pl:683
+#: ../../stattrans.pl:646
msgid "Total:"
msgstr "Total:"
-#: ../../stattrans.pl:696 ../../stattrans.pl:850
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
msgid "Created with"
msgstr "Creado por"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Páginas web traducidas"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Estadísticas de traducción por número de páginas"
-#: ../../stattrans.pl:733 ../../stattrans.pl:779 ../../stattrans.pl:823
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
msgid "Language"
msgstr "Idioma"
-#: ../../stattrans.pl:734 ../../stattrans.pl:780
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
msgid "Translations"
msgstr "Traducciones"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Páginas web traducidas (por tamaño)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Estadísticas de traducción por tamaño de las páginas"
diff --git a/spanish/po/templates.es.po b/spanish/po/templates.es.po
index 48b9c3b3c35..a691f03526b 100644
--- a/spanish/po/templates.es.po
+++ b/spanish/po/templates.es.po
@@ -515,291 +515,359 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Volver a la <a href=\"./\">página \"¿Quién usa Debian?\"</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "Lista de consultores"
-
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Volver a la <a href=\"./\">página de consultores de Debian</a>."
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "¿Ha encontrado un problema con el diseño del sitio?"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Report it!"
+#~ msgstr "¡Repórtelo!"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Descargar con jigdo"
+#~ msgid "Select a server near you: &nbsp;"
+#~ msgstr "Seleccione un servidor cerca de usted: &nbsp;"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Descargar mediante HTTP/FTP"
+#~ msgid "More information:"
+#~ msgstr "Más información:"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Comprar CDs o DVDs"
+#~ msgid "Taken by:"
+#~ msgstr "Responsable:"
-#~ msgid "Network Install"
-#~ msgstr "Instalación via red"
+#~ msgid "Nobody"
+#~ msgstr "Nadie"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Descargar"
+#~ msgid "Rating:"
+#~ msgstr "Puntuación:"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />miscelánea"
+#~ msgid "More information"
+#~ msgstr "Información adicional"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_artwork\" />Arte"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Próximas atracciones"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Réplicas"
+#~ msgid "link may no longer be valid"
+#~ msgstr "puede que el enlace ya no sea válido"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Réplicas rsync"
+#~ msgid "When"
+#~ msgstr "Cuándo"
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Descargar con Torrent"
+#~ msgid "Where"
+#~ msgstr "Dónde"
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />Información de imágenes de distribución"
+#~ msgid "More Info"
+#~ msgstr "Información adicional"
-#~ msgid "Debian CD team"
-#~ msgstr "Equipo de CDs de Debian"
+#~ msgid "Debian Involvement"
+#~ msgstr "Implicación de Debian"
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_en_cd"
+#~ msgid "Main Coordinator"
+#~ msgstr "Coordinador principal"
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />faq"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Coordinador del</th><th>Proyecto</th>"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "Related Links"
+#~ msgstr "Enlaces relacionados"
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "Latest News"
+#~ msgstr "Últimas noticias"
-#~ msgid "buy"
-#~ msgstr "comprar"
+#~ msgid "Download calendar entry"
+#~ msgstr "Descargar entrada del calendario"
-#~ msgid "net_install"
-#~ msgstr "instalación_por_red"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Volver a las <a href=\"m4_HOME/\">noticias Debian</a> || <a href="
+#~ "\"m4_HOME/\">página principal del proyecto Debian</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />misc"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (enlace no válido)"
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "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 ""
-#~ "<a href=\"/MailingLists/disclaimer\">Lista pública de correo</a> en "
-#~ "inglés para CDs/DVDs:"
+#~ "Para recibir este boletín cada dos semanas en su buzón, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">suscríbase a la lista de correo debian-"
+#~ "news</a>."
-#~ msgid "Date"
-#~ msgstr "Fecha"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr ""
+#~ "Puede conseguir <a href=\"../../\">ejemplares anteriores</a> de este "
+#~ "boletín."
-#~ msgid "Time Line"
-#~ msgstr "Línea temporal"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Los editores de las Noticias del Proyecto Debian "
+#~ "son <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Nominations"
-#~ msgstr "Nominaciones"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Las Noticias del Proyecto Debian las editan <a href="
+#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Debate"
-#~ msgstr "Debate"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Esta edición de las Noticias del Proyecto Debian "
+#~ "la editó <a href=\"mailto:debian-publicity@debian.org\">%s</a>."
-#~ msgid "Platforms"
-#~ msgstr "Plataformas"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Esta edición de las Noticias del Proyecto Debian "
+#~ "las editó <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgid "Proposer"
-#~ msgstr "Proponente"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />La tradujo %s."
-#~ msgid "Proposal A Proposer"
-#~ msgstr "Proponente propuesta A"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" /> La tradujo %s."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "Proponente propuesta B"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />La tradujo %s."
-#~ msgid "Proposal C Proposer"
-#~ msgstr "Proponente propuesta C"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Las tradujo %s."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "Proponente propuesta D"
+#~ msgid "List of Speakers"
+#~ msgstr "Lista de oradores"
-#~ msgid "Proposal E Proposer"
-#~ msgstr "Proponente propuesta E"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Volver a la <a href=\"./\">página de oradores de Debian</a>."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "Proponente propuesta F"
+#~ 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 ""
+#~ "Para recibir este boletín semanalmente en su buzón, <a href=\"http://"
+#~ "lists.debian.org/debian-news/\">suscríbase</a> a la lista de correo "
+#~ "debian-news."
-#~ msgid "Seconds"
-#~ msgstr "Apoyos"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Las Noticias Semanales de Debian son editadas por "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal A Seconds"
-#~ msgstr "Apoyos a la propuesta A"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Las Noticias Semanales de Debian son editadas por "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal B Seconds"
-#~ msgstr "Apoyos a la propuesta B"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Esta edición de las Noticias Semanales de Debian "
+#~ "fue realizada por <a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal C Seconds"
-#~ msgstr "Apoyos a la propuesta C"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Las Noticias Semanales de Debian son editadas por "
+#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Proposal D Seconds"
-#~ msgstr "Apoyos a la propuesta D"
+#~ msgid "No requests for adoption"
+#~ msgstr "No hay solicitudes de adopción"
-#~ msgid "Proposal E Seconds"
-#~ msgstr "Apoyos a la propuesta E"
+#~ msgid "No orphaned packages"
+#~ msgstr "No hay paquetes huérfanos"
-#~ msgid "Proposal F Seconds"
-#~ msgstr "Apoyos a la propuesta F"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "No hay paquetes en espera de ser adoptados"
-#~ msgid "Opposition"
-#~ msgstr "Oposiciones"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "No hay paquetes en espera de ser empaquetados"
-#~ msgid "Text"
-#~ msgstr "Texto"
+#~ msgid "No Requested packages"
+#~ msgstr "No se han solicitado paquetes"
-#~ msgid "Proposal A"
-#~ msgstr "Propuesta A"
+#~ msgid "No help requested"
+#~ msgstr "No se ha solicitado ayuda"
-#~ msgid "Proposal B"
-#~ msgstr "Propuesta B"
+#~ msgid "in adoption since today."
+#~ msgstr "en adopción desde hoy."
-#~ msgid "Proposal C"
-#~ msgstr "Propuesta C"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "en adopción desde ayer."
-#~ msgid "Proposal D"
-#~ msgstr "Propuesta D"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s días en adopción."
-#~ msgid "Proposal E"
-#~ msgstr "Propuesta E"
+#~ msgid "in preparation since today."
+#~ msgstr "en preparación desde hoy."
-#~ msgid "Proposal F"
-#~ msgstr "Propuesta F"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "en preparación desde ayer."
-#~ msgid "Choices"
-#~ msgstr "Opciones"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s días en preparación."
-#~ msgid "Amendment Proposer"
-#~ msgstr "Proponente de la enmienda"
+#~ msgid "requested today."
+#~ msgstr "solicitados hoy."
-#~ msgid "Amendment Seconds"
-#~ msgstr "Apoyos a la enmienda"
+#~ msgid "requested yesterday."
+#~ msgstr "solicitados ayer."
-#~ msgid "Amendment Text"
-#~ msgstr "Texto de la enmienda"
+#~ msgid "requested %s days ago."
+#~ msgstr "solicitados hace %s días."
-#~ msgid "Amendment Proposer A"
-#~ msgstr "Proponente de la enmienda A"
+#~ msgid "package info"
+#~ msgstr "información del paquete"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "Apoyos a la enmienda A"
+#~ msgid "License Information"
+#~ msgstr "Información sobre licencias"
-#~ msgid "Amendment Text A"
-#~ msgstr "Texto de la enmienda A"
+#~ msgid "DLS Index"
+#~ msgstr "Índice RLD"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "Proponente de la enmienda B"
+#~ msgid "DFSG"
+#~ msgstr "DSLD"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "Apoyos a la enmienda B"
+#~ msgid "DFSG FAQ"
+#~ msgstr "PUF DSLD"
-#~ msgid "Amendment Text B"
-#~ msgstr "Texto de la enmienda B"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Archivo de Debian-legal"
-#~ msgid "Amendments"
-#~ msgstr "Enmiendas"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Proceedings"
-#~ msgstr "Procedimientos"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Versión %s: %s"
-#~ msgid "Majority Requirement"
-#~ msgstr "Mayoría necesaria"
+#~ msgid "Date published"
+#~ msgstr "Fecha de publicación"
-#~ msgid "Data and Statistics"
-#~ msgstr "Datos y estadísticas"
+#~ msgid "License"
+#~ msgstr "Licencia"
-#~ msgid "Quorum"
-#~ msgstr "Quórum"
+#~ msgid "Version"
+#~ msgstr "Versión"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Mínima discusión"
+#~ msgid "Summary"
+#~ msgstr "Resumen"
-#~ msgid "Ballot"
-#~ msgstr "Voto"
+#~ msgid "Justification"
+#~ msgstr "Justificación"
-#~ msgid "Forum"
-#~ msgstr "Foro"
+#~ msgid "Discussion"
+#~ msgstr "Discusión"
-#~ msgid "Outcome"
-#~ msgstr "Resultado"
+#~ msgid "Original Summary"
+#~ msgstr "Resumen original"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Esperando&nbsp;Patrocinadores"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "Se puede encontrar el resumen original de <summary-author/> en los <a "
+#~ "href=\"<summary-url/>\">archivos de la lista</a>."
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "En&nbsp;Discusión"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "<summary-author> preparó este resumen."
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Votación&nbsp;en&nbsp;Curso"
+#~ msgid "License text (translated)"
+#~ msgstr "Texto de la licencia (traducido)"
-#~ msgid "Decided"
-#~ msgstr "Decidido"
+#~ msgid "License text"
+#~ msgstr "Texto de la licencia"
-#~ msgid "Withdrawn"
-#~ msgstr "Retirado"
+#~ msgid "free"
+#~ msgstr "libre"
-#~ msgid "Other"
-#~ msgstr "Otro"
+#~ msgid "non-free"
+#~ msgstr "no-libre"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Página&nbsp;Principal&nbsp;de&nbsp;Votaciones"
+#~ msgid "not redistributable"
+#~ msgstr "no redistribuible"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Cómo"
+#~ msgid "Free"
+#~ msgstr "Libre"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Enviar&nbsp;Propuesta"
+#~ msgid "Non-Free"
+#~ msgstr "No-libre"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Enmendar&nbsp;una&nbsp;Propuesta"
+#~ msgid "Not Redistributable"
+#~ msgstr "No redistribuible"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Apoyar&nbsp;una&nbsp;Propuesta"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Consulte la página con la <a href=\"./\">información de licencias</a> "
+#~ "para tener una visión general de los resúmenes de licencias de Debian "
+#~ "(RLD)."
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Leer&nbsp;un&nbsp;Resultado"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />Kit pseudo-imagen"
-#~ msgid "Vote"
-#~ msgstr "Votar"
+#~ msgid "discussed"
+#~ msgstr "discutido"
-#~ msgid "network install"
-#~ msgstr "instalación en red"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
+#~ "'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Las Noticias Semanales de Debian son editadas por <a href=\"mailto:"
+#~ "dwn@debian.org\">Martin 'Joey' Schulze</a>."
-#~ msgid "buy pre-made images"
-#~ msgstr "compre imágenes prefabricadas"
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
+#~ "dwn@debian.org\">Yooseong Yang y Martin 'Joey' Schulze</a>."
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Volver a otras <a href=\"./\">noticias de Debian</a>."
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
+#~ "dwn@debian.org\">Joe 'Zonker' Brockmeier y Martin 'Joey' Schulze</a>."
#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
+#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
#~ msgstr ""
-#~ "Vea la <a href=\"m4_HOME/contact\">página de contactos</a> de Debian para "
-#~ "más información sobre cómo contactar con nosotros."
+#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
+#~ "dwn@debian.org\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary y Tollef "
+#~ "Fog Heen</a>."
-#~ msgid "Please use English when sending mail."
-#~ msgstr "Por favor, utilice el inglés cuando envíe correos."
+#~ msgid "download with pik"
+#~ msgstr "descargar con pik"
-#~ msgid "Security database references"
-#~ msgstr "Referencias a bases de datos de seguridad"
+#~ msgid "%0 (dead link)"
+#~ msgstr "%0 (enlace roto)"
-#~ msgid "In Mitre's CVE dictionary:"
-#~ msgstr "En el diccionario CVE de Mitre:"
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Aviso de seguridad de Debian"
-#~ msgid "In the Bugtraq database (at SecurityFocus):"
-#~ msgstr "En la base de datos de Bugtraq (en SecurityFocus):"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Avisos de seguridad de Debian"
-#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
-#~ msgstr "Notas y avisos de incidentes y vulnerabilidades en CERT:"
+#~ msgid "Vulnerable"
+#~ msgstr "Vulnerable"
-#~ msgid "No other external database security references currently available."
-#~ msgstr ""
-#~ "No se dispone, de momento, de referencias a otras bases de datos de "
-#~ "seguridad externas."
+#~ msgid "Fixed in"
+#~ msgstr "Arreglado en"
+
+#~ msgid "Source:"
+#~ msgstr "Fuentes:"
+
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Componentes independientes de la arquitectura:"
#~ msgid ""
#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
@@ -808,356 +876,288 @@ msgstr "Volver a la <a href=\"./\">página \"¿Quién usa Debian?\"</a>."
#~ "Las sumas MD5 de los ficheros que se listan están disponibles en el <a "
#~ "href=\"<get-var url />\">aviso original</a>."
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Componentes independientes de la arquitectura:"
-
-#~ msgid "Source:"
-#~ msgstr "Fuentes:"
-
-#~ msgid "Fixed in"
-#~ msgstr "Arreglado en"
+#~ msgid "No other external database security references currently available."
+#~ msgstr ""
+#~ "No se dispone, de momento, de referencias a otras bases de datos de "
+#~ "seguridad externas."
-#~ msgid "Vulnerable"
-#~ msgstr "Vulnerable"
+#~ msgid "CERT's vulnerabilities, advisories and incident notes:"
+#~ msgstr "Notas y avisos de incidentes y vulnerabilidades en CERT:"
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Avisos de seguridad de Debian"
+#~ msgid "In the Bugtraq database (at SecurityFocus):"
+#~ msgstr "En la base de datos de Bugtraq (en SecurityFocus):"
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Aviso de seguridad de Debian"
+#~ msgid "In Mitre's CVE dictionary:"
+#~ msgstr "En el diccionario CVE de Mitre:"
-#~ msgid "%0 (dead link)"
-#~ msgstr "%0 (enlace roto)"
+#~ msgid "Security database references"
+#~ msgstr "Referencias a bases de datos de seguridad"
-#~ msgid "download with pik"
-#~ msgstr "descargar con pik"
+#~ msgid "Please use English when sending mail."
+#~ msgstr "Por favor, utilice el inglés cuando envíe correos."
#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier, Jean-Christophe Helary and Tollef Fog Heen</a>."
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
#~ msgstr ""
-#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
-#~ "dwn@debian.org\">Joe 'Zonker' Brockmeier, Jean-Christophe Helary y Tollef "
-#~ "Fog Heen</a>."
+#~ "Vea la <a href=\"m4_HOME/contact\">página de contactos</a> de Debian para "
+#~ "más información sobre cómo contactar con nosotros."
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Joe "
-#~ "'Zonker' Brockmeier and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
-#~ "dwn@debian.org\">Joe 'Zonker' Brockmeier y Martin 'Joey' Schulze</a>."
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Volver a otras <a href=\"./\">noticias de Debian</a>."
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Los editores de las Noticias Semanales de Debian son <a href=\"mailto:"
-#~ "dwn@debian.org\">Yooseong Yang y Martin 'Joey' Schulze</a>."
+#~ msgid "buy pre-made images"
+#~ msgstr "compre imágenes prefabricadas"
-#~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">Martin "
-#~ "'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "Las Noticias Semanales de Debian son editadas por <a href=\"mailto:"
-#~ "dwn@debian.org\">Martin 'Joey' Schulze</a>."
+#~ msgid "network install"
+#~ msgstr "instalación en red"
-#~ msgid "discussed"
-#~ msgstr "discutido"
+#~ msgid "Vote"
+#~ msgstr "Votar"
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />Kit pseudo-imagen"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Leer&nbsp;un&nbsp;Resultado"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Consulte la página con la <a href=\"./\">información de licencias</a> "
-#~ "para tener una visión general de los resúmenes de licencias de Debian "
-#~ "(RLD)."
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Apoyar&nbsp;una&nbsp;Propuesta"
-#~ msgid "Not Redistributable"
-#~ msgstr "No redistribuible"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Enmendar&nbsp;una&nbsp;Propuesta"
-#~ msgid "Non-Free"
-#~ msgstr "No-libre"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Enviar&nbsp;Propuesta"
-#~ msgid "Free"
-#~ msgstr "Libre"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Cómo"
-#~ msgid "not redistributable"
-#~ msgstr "no redistribuible"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Página&nbsp;Principal&nbsp;de&nbsp;Votaciones"
-#~ msgid "non-free"
-#~ msgstr "no-libre"
+#~ msgid "Other"
+#~ msgstr "Otro"
-#~ msgid "free"
-#~ msgstr "libre"
+#~ msgid "Withdrawn"
+#~ msgstr "Retirado"
-#~ msgid "License text"
-#~ msgstr "Texto de la licencia"
+#~ msgid "Decided"
+#~ msgstr "Decidido"
-#~ msgid "License text (translated)"
-#~ msgstr "Texto de la licencia (traducido)"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Votación&nbsp;en&nbsp;Curso"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "<summary-author> preparó este resumen."
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "En&nbsp;Discusión"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "Se puede encontrar el resumen original de <summary-author/> en los <a "
-#~ "href=\"<summary-url/>\">archivos de la lista</a>."
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Esperando&nbsp;Patrocinadores"
-#~ msgid "Original Summary"
-#~ msgstr "Resumen original"
+#~ msgid "Outcome"
+#~ msgstr "Resultado"
-#~ msgid "Discussion"
-#~ msgstr "Discusión"
+#~ msgid "Forum"
+#~ msgstr "Foro"
-#~ msgid "Justification"
-#~ msgstr "Justificación"
+#~ msgid "Ballot"
+#~ msgstr "Voto"
-#~ msgid "Summary"
-#~ msgstr "Resumen"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Mínima discusión"
-#~ msgid "Version"
-#~ msgstr "Versión"
+#~ msgid "Quorum"
+#~ msgstr "Quórum"
-#~ msgid "License"
-#~ msgstr "Licencia"
+#~ msgid "Data and Statistics"
+#~ msgstr "Datos y estadísticas"
-#~ msgid "Date published"
-#~ msgstr "Fecha de publicación"
+#~ msgid "Majority Requirement"
+#~ msgstr "Mayoría necesaria"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Versión %s: %s"
+#~ msgid "Proceedings"
+#~ msgstr "Procedimientos"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Amendments"
+#~ msgstr "Enmiendas"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Archivo de Debian-legal"
+#~ msgid "Amendment Text B"
+#~ msgstr "Texto de la enmienda B"
-#~ msgid "DFSG FAQ"
-#~ msgstr "PUF DSLD"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "Apoyos a la enmienda B"
-#~ msgid "DFSG"
-#~ msgstr "DSLD"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "Proponente de la enmienda B"
-#~ msgid "DLS Index"
-#~ msgstr "Índice RLD"
+#~ msgid "Amendment Text A"
+#~ msgstr "Texto de la enmienda A"
-#~ msgid "License Information"
-#~ msgstr "Información sobre licencias"
+#~ msgid "Amendment Seconds A"
+#~ msgstr "Apoyos a la enmienda A"
-#~ msgid "package info"
-#~ msgstr "información del paquete"
+#~ msgid "Amendment Proposer A"
+#~ msgstr "Proponente de la enmienda A"
-#~ msgid "requested %s days ago."
-#~ msgstr "solicitados hace %s días."
+#~ msgid "Amendment Text"
+#~ msgstr "Texto de la enmienda"
-#~ msgid "requested yesterday."
-#~ msgstr "solicitados ayer."
+#~ msgid "Amendment Seconds"
+#~ msgstr "Apoyos a la enmienda"
-#~ msgid "requested today."
-#~ msgstr "solicitados hoy."
+#~ msgid "Amendment Proposer"
+#~ msgstr "Proponente de la enmienda"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s días en preparación."
+#~ msgid "Choices"
+#~ msgstr "Opciones"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "en preparación desde ayer."
+#~ msgid "Proposal F"
+#~ msgstr "Propuesta F"
-#~ msgid "in preparation since today."
-#~ msgstr "en preparación desde hoy."
+#~ msgid "Proposal E"
+#~ msgstr "Propuesta E"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s días en adopción."
+#~ msgid "Proposal D"
+#~ msgstr "Propuesta D"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "en adopción desde ayer."
+#~ msgid "Proposal C"
+#~ msgstr "Propuesta C"
-#~ msgid "in adoption since today."
-#~ msgstr "en adopción desde hoy."
+#~ msgid "Proposal B"
+#~ msgstr "Propuesta B"
-#~ msgid "No help requested"
-#~ msgstr "No se ha solicitado ayuda"
+#~ msgid "Proposal A"
+#~ msgstr "Propuesta A"
-#~ msgid "No Requested packages"
-#~ msgstr "No se han solicitado paquetes"
+#~ msgid "Text"
+#~ msgstr "Texto"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "No hay paquetes en espera de ser empaquetados"
+#~ msgid "Opposition"
+#~ msgstr "Oposiciones"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "No hay paquetes en espera de ser adoptados"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "Apoyos a la propuesta F"
-#~ msgid "No orphaned packages"
-#~ msgstr "No hay paquetes huérfanos"
+#~ msgid "Proposal E Seconds"
+#~ msgstr "Apoyos a la propuesta E"
-#~ msgid "No requests for adoption"
-#~ msgstr "No hay solicitudes de adopción"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "Apoyos a la propuesta D"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Las Noticias Semanales de Debian son editadas por "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal C Seconds"
+#~ msgstr "Apoyos a la propuesta C"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Esta edición de las Noticias Semanales de Debian "
-#~ "fue realizada por <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal B Seconds"
+#~ msgstr "Apoyos a la propuesta B"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Las Noticias Semanales de Debian son editadas por "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Proposal A Seconds"
+#~ msgstr "Apoyos a la propuesta A"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Las Noticias Semanales de Debian son editadas por "
-#~ "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Seconds"
+#~ msgstr "Apoyos"
-#~ 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 ""
-#~ "Para recibir este boletín semanalmente en su buzón, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">suscríbase</a> a la lista de correo "
-#~ "debian-news."
+#~ msgid "Proposal F Proposer"
+#~ msgstr "Proponente propuesta F"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Volver a la <a href=\"./\">página de oradores de Debian</a>."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "Proponente propuesta E"
-#~ msgid "List of Speakers"
-#~ msgstr "Lista de oradores"
+#~ msgid "Proposal D Proposer"
+#~ msgstr "Proponente propuesta D"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Las tradujo %s."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "Proponente propuesta C"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />La tradujo %s."
+#~ msgid "Proposal B Proposer"
+#~ msgstr "Proponente propuesta B"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" /> La tradujo %s."
+#~ msgid "Proposal A Proposer"
+#~ msgstr "Proponente propuesta A"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />La tradujo %s."
+#~ msgid "Proposer"
+#~ msgstr "Proponente"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Esta edición de las Noticias del Proyecto Debian "
-#~ "las editó <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Platforms"
+#~ msgstr "Plataformas"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Esta edición de las Noticias del Proyecto Debian "
-#~ "la editó <a href=\"mailto:debian-publicity@debian.org\">%s</a>."
+#~ msgid "Debate"
+#~ msgstr "Debate"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Las Noticias del Proyecto Debian las editan <a href="
-#~ "\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Nominations"
+#~ msgstr "Nominaciones"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Los editores de las Noticias del Proyecto Debian "
-#~ "son <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgid "Time Line"
+#~ msgstr "Línea temporal"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr ""
-#~ "Puede conseguir <a href=\"../../\">ejemplares anteriores</a> de este "
-#~ "boletín."
+#~ msgid "Date"
+#~ msgstr "Fecha"
#~ 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>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "Para recibir este boletín cada dos semanas en su buzón, <a href=\"http://"
-#~ "lists.debian.org/debian-news/\">suscríbase a la lista de correo debian-"
-#~ "news</a>."
+#~ "<a href=\"/MailingLists/disclaimer\">Lista pública de correo</a> en "
+#~ "inglés para CDs/DVDs:"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (enlace no válido)"
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />misc"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Volver a las <a href=\"m4_HOME/\">noticias Debian</a> || <a href="
-#~ "\"m4_HOME/\">página principal del proyecto Debian</a>."
+#~ msgid "net_install"
+#~ msgstr "instalación_por_red"
-#~ msgid "Download calendar entry"
-#~ msgstr "Descargar entrada del calendario"
+#~ msgid "buy"
+#~ msgstr "comprar"
-#~ msgid "Latest News"
-#~ msgstr "Últimas noticias"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid "Related Links"
-#~ msgstr "Enlaces relacionados"
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Coordinador del</th><th>Proyecto</th>"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />faq"
-#~ msgid "Main Coordinator"
-#~ msgstr "Coordinador principal"
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_en_cd"
-#~ msgid "Debian Involvement"
-#~ msgstr "Implicación de Debian"
+#~ msgid "Debian CD team"
+#~ msgstr "Equipo de CDs de Debian"
-#~ msgid "More Info"
-#~ msgstr "Información adicional"
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />Información de imágenes de distribución"
-#~ msgid "Where"
-#~ msgstr "Dónde"
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Descargar con Torrent"
-#~ msgid "When"
-#~ msgstr "Cuándo"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Réplicas rsync"
-#~ msgid "link may no longer be valid"
-#~ msgstr "puede que el enlace ya no sea válido"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Réplicas"
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Próximas atracciones"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_artwork\" />Arte"
-#~ msgid "More information"
-#~ msgstr "Información adicional"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />miscelánea"
-#~ msgid "Rating:"
-#~ msgstr "Puntuación:"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Descargar"
-#~ msgid "Nobody"
-#~ msgstr "Nadie"
+#~ msgid "Network Install"
+#~ msgstr "Instalación via red"
-#~ msgid "Taken by:"
-#~ msgstr "Responsable:"
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Comprar CDs o DVDs"
-#~ msgid "More information:"
-#~ msgstr "Más información:"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Descargar mediante HTTP/FTP"
-#~ msgid "Select a server near you: &nbsp;"
-#~ msgstr "Seleccione un servidor cerca de usted: &nbsp;"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Descargar con jigdo"
-#~ msgid "Report it!"
-#~ msgstr "¡Repórtelo!"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Have you found a problem with the site layout?"
-#~ msgstr "¿Ha encontrado un problema con el diseño del sitio?"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Volver a la <a href=\"./\">página de consultores de Debian</a>."
+
+#~ msgid "List of Consultants"
+#~ msgstr "Lista de consultores"
diff --git a/spanish/po/vendors.es.po b/spanish/po/vendors.es.po
index 8d53822ca00..56f90d8adc4 100644
--- a/spanish/po/vendors.es.po
+++ b/spanish/po/vendors.es.po
@@ -2,6 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: vendors webwml\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2015-07-02 00:57+0100\n"
"Last-Translator: Laura Arjona Reina <larjona@larjona.net>\n"
"Language-Team: Debian Spanish Translation Team <debian-l10n-spanish@lists."
@@ -12,102 +13,90 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.10\n"
-"POT-Creation-Date: \n"
-
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Vendedor:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL para la página de Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Acepta donaciones para Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "País:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Envíos Internacionales:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "correo electrónico:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Tipo de CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Tipo de DVD:"
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "BD Type:"
-msgstr "Tipo de BD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:15
-msgid "USB Type:"
-msgstr "Tipo de USB:"
-
-#: ../../english/CD/vendors/vendors.CD.def:16
-msgid "Architectures:"
-msgstr "Arquitecturas:"
-
-#: ../../english/CD/vendors/vendors.CD.def:28
msgid "Vendor"
msgstr "Vendedor"
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Acepta donaciones"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:16
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD/BD/USB"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr "Arquitecturas"
-#: ../../english/CD/vendors/vendors.CD.def:32
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Envíos internacionales"
-#: ../../english/CD/vendors/vendors.CD.def:33
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Contacto"
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:58
+#: ../../english/CD/vendors/vendors.CD.def:44
msgid "Vendor Home"
msgstr "Sitio del vendedor"
-#: ../../english/CD/vendors/vendors.CD.def:84
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "página"
-#: ../../english/CD/vendors/vendors.CD.def:85
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "correo electrónico"
-#: ../../english/CD/vendors/vendors.CD.def:128
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "dentro de Europa"
-#: ../../english/CD/vendors/vendors.CD.def:132
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "A algunas áreas"
-#: ../../english/CD/vendors/vendors.CD.def:136
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "fuente"
-#: ../../english/CD/vendors/vendors.CD.def:140
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "y"
+
+#~ msgid "Architectures:"
+#~ msgstr "Arquitecturas:"
+
+#~ msgid "USB Type:"
+#~ msgstr "Tipo de USB:"
+
+#~ msgid "BD Type:"
+#~ msgstr "Tipo de BD:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Tipo de DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Tipo de CD:"
+
+#~ msgid "email:"
+#~ msgstr "correo electrónico:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Envíos Internacionales:"
+
+#~ msgid "Country:"
+#~ msgstr "País:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Acepta donaciones para Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL para la página de Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Vendedor:"
diff --git a/spanish/po/vote.es.po b/spanish/po/vote.es.po
index 179b7cb5c98..38b4680b010 100644
--- a/spanish/po/vote.es.po
+++ b/spanish/po/vote.es.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Templates webwml\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2015-07-02 01:04+0100\n"
"Last-Translator: Laura Arjona Reina <larjona@larjona.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -12,7 +13,6 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: \n"
"X-Generator: Poedit 1.6.10\n"
#: ../../english/template/debian/votebar.wml:13
diff --git a/swedish/po/bugs.sv.po b/swedish/po/bugs.sv.po
index aa1ea853166..d5b65b2e4e1 100644
--- a/swedish/po/bugs.sv.po
+++ b/swedish/po/bugs.sv.po
@@ -158,152 +158,152 @@ msgstr "Arkiverad"
msgid "Archived and Unarchived"
msgstr "Arkiverade och ej arkiverade"
-#~ msgid "Exclude tag:"
-#~ msgstr "Exkludera märke:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Inkludera märke:"
+#~ msgid "Flags:"
+#~ msgstr "Flaggor:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "aktiva fel"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "visa endast hopslagna rapporter en gång"
-#~ msgid "wontfix"
-#~ msgstr "kommer ej rätta"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "ingen sortering på status/allvarlighetsgrad"
-#~ msgid "upstream"
-#~ msgstr "uppströms"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "visa inte innehållsförteckning i sidhuvudet"
-#~ msgid "unreproducible"
-#~ msgstr "oreproducerbar"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "visa inte statistik i sidfoten"
-#~ msgid "security"
-#~ msgstr "säkerhet"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "moreinfo"
-#~ msgstr "mer info"
+#~ msgid "Package version:"
+#~ msgstr "Paketversion:"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "Distribution:"
+#~ msgstr "Distribution:"
-#~ msgid "help"
-#~ msgstr "hjälp"
+#~ msgid "bugs"
+#~ msgstr "fel"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixad-uppströms"
+#~ msgid "open"
+#~ msgstr "öppet"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixad-i-experimentella"
+#~ msgid "forwarded"
+#~ msgstr "vidaresänt"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "på gång"
-#~ msgid "confirmed"
-#~ msgstr "bekräftat"
+#~ msgid "fixed"
+#~ msgstr "rättat"
-#~ msgid "sid"
-#~ msgstr "Sid"
+#~ msgid "done"
+#~ msgstr "klart"
-#~ msgid "lenny-ignore"
-#~ msgstr "lenny-ignorera"
+#~ msgid "Include status:"
+#~ msgstr "Inkludera status:"
-#~ msgid "lenny"
-#~ msgstr "Lenny"
+#~ msgid "Exclude status:"
+#~ msgstr "Exkludera status:"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignorera"
+#~ msgid "critical"
+#~ msgstr "kritiskt"
-#~ msgid "etch"
-#~ msgstr "Etch"
+#~ msgid "grave"
+#~ msgstr "gravt"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignorera"
+#~ msgid "serious"
+#~ msgstr "allvarligt"
-#~ msgid "woody"
-#~ msgstr "Woody"
+#~ msgid "important"
+#~ msgstr "viktigt"
-#~ msgid "potato"
-#~ msgstr "Potato"
+#~ msgid "minor"
+#~ msgstr "mindre"
-#~ msgid "Exclude severity:"
-#~ msgstr "Exkludera allvarlighetsgrader:"
+#~ msgid "wishlist"
+#~ msgstr "önskelista"
#~ msgid "Include severity:"
#~ msgstr "Inkludera allvarlighetsgrader:"
-#~ msgid "wishlist"
-#~ msgstr "önskelista"
+#~ msgid "Exclude severity:"
+#~ msgstr "Exkludera allvarlighetsgrader:"
-#~ msgid "minor"
-#~ msgstr "mindre"
+#~ msgid "potato"
+#~ msgstr "Potato"
-#~ msgid "important"
-#~ msgstr "viktigt"
+#~ msgid "woody"
+#~ msgstr "Woody"
-#~ msgid "serious"
-#~ msgstr "allvarligt"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignorera"
-#~ msgid "grave"
-#~ msgstr "gravt"
+#~ msgid "etch"
+#~ msgstr "Etch"
-#~ msgid "critical"
-#~ msgstr "kritiskt"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignorera"
-#~ msgid "Exclude status:"
-#~ msgstr "Exkludera status:"
+#~ msgid "lenny"
+#~ msgstr "Lenny"
-#~ msgid "Include status:"
-#~ msgstr "Inkludera status:"
+#~ msgid "lenny-ignore"
+#~ msgstr "lenny-ignorera"
-#~ msgid "done"
-#~ msgstr "klart"
+#~ msgid "sid"
+#~ msgstr "Sid"
-#~ msgid "fixed"
-#~ msgstr "rättat"
+#~ msgid "confirmed"
+#~ msgstr "bekräftat"
-#~ msgid "pending"
-#~ msgstr "på gång"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "vidaresänt"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixad-i-experimentella"
-#~ msgid "open"
-#~ msgstr "öppet"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixad-uppströms"
-#~ msgid "bugs"
-#~ msgstr "fel"
+#~ msgid "help"
+#~ msgstr "hjälp"
-#~ msgid "Distribution:"
-#~ msgstr "Distribution:"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "Package version:"
-#~ msgstr "Paketversion:"
+#~ msgid "moreinfo"
+#~ msgstr "mer info"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "security"
+#~ msgstr "säkerhet"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "visa inte statistik i sidfoten"
+#~ msgid "unreproducible"
+#~ msgstr "oreproducerbar"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "visa inte innehållsförteckning i sidhuvudet"
+#~ msgid "upstream"
+#~ msgstr "uppströms"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "ingen sortering på status/allvarlighetsgrad"
+#~ msgid "wontfix"
+#~ msgstr "kommer ej rätta"
-#~ msgid "display merged bugs only once"
-#~ msgstr "visa endast hopslagna rapporter en gång"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "aktiva fel"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Flaggor:"
+#~ msgid "Include tag:"
+#~ msgstr "Inkludera märke:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Exkludera märke:"
diff --git a/swedish/po/cdimage.sv.po b/swedish/po/cdimage.sv.po
index 5fac44041ac..6ddf51ce205 100644
--- a/swedish/po/cdimage.sv.po
+++ b/swedish/po/cdimage.sv.po
@@ -13,22 +13,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 "Nyckelns fingeravtryck"
-#: ../../english/devel/debian-installer/images.data:90
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "ISO-avbildningar"
-#: ../../english/devel/debian-installer/images.data:91
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "Jigdo-filer"
@@ -78,7 +72,6 @@ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
msgstr "Rsync-speglar"
#: ../../english/template/debian/cdimage.wml:43
-#| msgid "<void id=\"dc_misc\" />Misc"
msgid "<void id=\"dc_verify\" />Verify"
msgstr "Verifiera"
@@ -123,6 +116,9 @@ msgid "<void id=\"misc-bottom\" />misc"
msgstr "diverse"
#: ../../english/template/debian/cdimage.wml:76
-msgid "English-language <a href=\"/MailingLists/disclaimer\">public mailing list</a> for CDs/DVDs:"
-msgstr "Engelskspråkig <a href=\"/MailingLists/disclaimer\">öppen sändlista</a> för cd/dvd:"
-
+msgid ""
+"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
+"a> for CDs/DVDs:"
+msgstr ""
+"Engelskspråkig <a href=\"/MailingLists/disclaimer\">öppen sändlista</a> för "
+"cd/dvd:"
diff --git a/swedish/po/consultants.sv.po b/swedish/po/consultants.sv.po
index cb4a1973d73..d33a45a7efb 100644
--- a/swedish/po/consultants.sv.po
+++ b/swedish/po/consultants.sv.po
@@ -61,8 +61,12 @@ msgid "Willing to Relocate"
msgstr "Kan flytta"
#: ../../english/consultants/consultant.defs:61
-msgid "<total_consultant> Debian consultants listed in <total_country> countries worldwide."
-msgstr "<total_consultant> Debiankonsulter i <total_country> länder över hela världen visade."
+msgid ""
+"<total_consultant> Debian consultants listed in <total_country> countries "
+"worldwide."
+msgstr ""
+"<total_consultant> Debiankonsulter i <total_country> länder över hela "
+"världen visade."
#: ../../english/template/debian/consultant.wml:6
msgid "List of Consultants"
@@ -71,4 +75,3 @@ msgstr "Konsultöversikt"
#: ../../english/template/debian/consultant.wml:9
msgid "Back to the <a href=\"./\">Debian consultants page</a>."
msgstr "Åter till <a href=\"./\">Debians konsultöversikt</a>."
-
diff --git a/swedish/po/distrib.sv.po b/swedish/po/distrib.sv.po
index f3ca3283e5d..07c1c5138b9 100644
--- a/swedish/po/distrib.sv.po
+++ b/swedish/po/distrib.sv.po
@@ -134,82 +134,92 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
+#, fuzzy
+#| msgid "64-bit PC (amd64)"
+msgid "64-bit ARM (AArch64)"
+msgstr "64-bitars 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 "Hard Float ABI ARM"
-#: ../../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-bitars PC (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr "32-bitars 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-bitars PC (i386)"
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr "kFreeBSD 64-bitars 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 (stor endian)"
-#: ../../english/releases/arches.data:21
+#: ../../english/releases/arches.data:22
msgid "MIPS (little endian)"
msgstr "MIPS (liten 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 "IBM System z"
-#: ../../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 "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 "kFreeBSD (Intel x86)"
+#~ msgstr "kFreeBSD (Intel x86)"
-#~ msgid "Intel x86"
-#~ msgstr "Intel x86"
+#~ msgid "Hurd (i386)"
+#~ msgstr "Hurd (i386)"
diff --git a/swedish/po/doc.sv.po b/swedish/po/doc.sv.po
index a0c620e7c61..a783253cb8f 100644
--- a/swedish/po/doc.sv.po
+++ b/swedish/po/doc.sv.po
@@ -14,7 +14,24 @@ msgstr ""
"X-Generator: Poedit 1.6.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\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"
@@ -32,13 +49,14 @@ msgstr ""
" bäst-säljare Cahier de l'admin Debian (utgiven av Eyrolles). Den här boken\n"
" lär ut grunden till alla som vill bli en effektiv och oberoende\n"
" Debian GNU/Linux-administratör. Den täcker alla ämnen som en kompetent\n"
-" Linux-administratör bör kunna, från installation och uppdatering av systemet,\n"
+" Linux-administratör bör kunna, från installation och uppdatering av "
+"systemet,\n"
" till skapandet av paket och kompilering av kärnan, men även övervakning, \n"
" backup och migration, utan att glömma avancerade ämnen som inställning\n"
" av SELinux för att säkra tjänster, automatiserade installationer,\n"
" eller virtualisering med Xen, KVM eller LXC."
-#: ../../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"
@@ -53,15 +71,15 @@ msgstr ""
" och underhåller systemet själva (oavsett om det är hemma, på kontoret,\n"
" för en förening eller en skola)."
-#: ../../english/doc/books.data:61
+#: ../../english/doc/books.data:88
msgid "Sarge CD with installer and a selection of packages"
msgstr "Sarge-cd med installationsprogram och ett urval av paket"
-#: ../../english/doc/books.data:62
+#: ../../english/doc/books.data:89
msgid "Live CD with Knoppix"
msgstr "Live-cd med Knoppix"
-#: ../../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"
@@ -75,17 +93,13 @@ msgstr ""
" bakgrundsinformation om projektet och utförlig information om\n"
" Debians unika pakethanteringssystem."
-#: ../../english/doc/books.data:77
-#: ../../english/doc/books.data:180
-#: ../../english/doc/books.data:224
-#: ../../english/doc/books.data:269
+#: ../../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 "official Debian GNU/Linux 3.1r0a Sarge på dvd (i386)"
-#: ../../english/doc/books.data:80
-#: ../../english/doc/books.data:183
-#: ../../english/doc/books.data:227
-#: ../../english/doc/books.data:272
+#: ../../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"
@@ -100,22 +114,27 @@ msgid ""
" Linux experience in Debian's bottom-up philosophy."
msgstr ""
"Boken introducerar de koncept och tekniker som ingår i operativsystemet\n"
-" Debian, förklarar dess användning och fallgropar och illustrerar tänkesättet\n"
+" Debian, förklarar dess användning och fallgropar och illustrerar "
+"tänkesättet\n"
" bakom alla angreppsvinklar.\n"
-" Målet är inte att vara en referensbok utan att ge läsaren tillräcklig insikt i\n"
+" Målet är inte att vara en referensbok utan att ge läsaren tillräcklig "
+"insikt i\n"
" hur projektet och operativsystemet fungerar för att lära sig omfamna de\n"
" sofistikerade och eleganta, ibland vid första anblicken icke-intuitiva\n"
-" lösningar som har växt fram som en del av Debiansystemet under det senaste\n"
+" lösningar som har växt fram som en del av Debiansystemet under det "
+"senaste\n"
" årtiondet.\n"
-" Trots att boken är riktad mot den väl bevandrade UNIX-/Linux-administratören\n"
+" Trots att boken är riktad mot den väl bevandrade UNIX-/Linux-"
+"administratören\n"
" kan den även fungera som en utmärkt referens tillsammans med en vanlig\n"
" Linuxreferens för att sätta fart på ens erfarenheter av Debians\n"
" botten-upp-filosofi."
-#: ../../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 -- from\n"
+" in over 1,500 <q>recipes</q>, how to use it for everyday activities -- "
+"from\n"
" working with text, images, and sound to productivity and networking\n"
" issues. Like the software the book describes, the book is copylefted\n"
" and its source data is available."
@@ -126,21 +145,26 @@ msgstr ""
" produktivitet och nätverksanvändning. Liksom programvaran den\n"
" beskriver är boken copyleftad och källkoden finns tillgänglig."
-#: ../../english/doc/books.data:113
+#: ../../english/doc/books.data:140
msgid "Debian 2.2 ARM architecture"
msgstr "Debian 2.2 för ARM-arkitekturen"
-#: ../../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, Psion5).\n"
+" It covers some devices specifically for quick set-up (LART, Assabet, "
+"Psion5).\n"
" It also gives generic information, tools and techniques. The GNU\n"
-" toolchain is covered in native and cross-compiler form, as are bootloaders,\n"
-" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It also\n"
-" includes extensive tutorial information on GNU/Linux basics for developers\n"
+" toolchain is covered in native and cross-compiler form, as are "
+"bootloaders,\n"
+" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+"also\n"
+" includes extensive tutorial information on GNU/Linux basics for "
+"developers\n"
" coming from other platforms.\n"
" It is not specific to Debian, but the Aleph\n"
-" ARMLinux distribution is closely based on Debian-ARM and it is assumed you\n"
+" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+"you\n"
" will be working from this distribution and preferably have a Debian based\n"
" host machine too."
msgstr ""
@@ -149,16 +173,19 @@ msgstr ""
" Assabet, Psion5).\n"
" Den innehåller även allmän information om verktyg och tekniker.\n"
" GNU-verktygskedjan täcks, både i direkt och korskompilerande form,\n"
-" tillsammans med startladdare, kärnpatchar, RAM-diskar, ARM-specialiteter och\n"
+" tillsammans med startladdare, kärnpatchar, RAM-diskar, ARM-specialiteter "
+"och\n"
" andra ARM-resurser.\n"
-" Dessutom finns omfattande introduktioner om GNU/Linuxgrunder för utvecklare\n"
+" Dessutom finns omfattande introduktioner om GNU/Linuxgrunder för "
+"utvecklare\n"
" som kommer från andra plattformar.\n"
" Boken är inte skriven specifikt för Debian, men Aleph\n"
-" ARMLinux-distributionen är nära baserad på Debian-ARM och det antas att du\n"
+" ARMLinux-distributionen är nära baserad på Debian-ARM och det antas att "
+"du\n"
" arbetar från den distributionen, och gärna har tillgång till en\n"
" Debianbaserad värdmaskin."
-#: ../../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"
@@ -170,11 +197,11 @@ msgstr ""
" Windowsanvändare får en vänlig introduktion till detta spännande område i\n"
" datorvärlden, guidad av Bill McCarty i <q>Learning Debian GNU/Linux</q>."
-#: ../../english/doc/books.data:145
+#: ../../english/doc/books.data:172
msgid "Debian 2.1"
msgstr "Debian 2.1"
-#: ../../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"
@@ -187,17 +214,18 @@ msgstr ""
" trycksaksproduktion, affärsanvändning, skojiga prylar och multimedia.\n"
" 30 dagars gratis e-poststöd ingår."
-#: ../../english/doc/books.data:163
+#: ../../english/doc/books.data:190
msgid "DVD Debian Squeeze i386/amd64"
msgstr "DVD Debian Squeeze i386/amd64"
-#: ../../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"
" to the configuration of network services.\n"
" Written by two Debian developers, this book can be of interest to many\n"
-" people: the beginner wishing to discover Debian, the advanced user looking\n"
+" people: the beginner wishing to discover Debian, the advanced user "
+"looking\n"
" for tips to enhance his mastership of the Debian tools and the\n"
" administrator who wants to build a reliable network with Debian."
msgstr ""
@@ -209,23 +237,48 @@ msgstr ""
" söker tips för att förbättra sin bemästring av Debianverktyg och\n"
" administratören som vill bygga ett pålitligt nätverk med Debian."
-#: ../../english/doc/books.data:205
+#: ../../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:248
msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
msgstr "2 utgåvor: En utan dvd, den andra med 2 dvd:er (i386)"
-#: ../../english/doc/books.data:213
+#: ../../english/doc/books.data:256
msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
msgstr "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) på DVD"
-#: ../../english/doc/books.data:216
-msgid "This book teaches you how to install and configure the system and also how to use Debian in a professional environment. It shows the full potential of the distribution (in its current version 6.0) and provides a practical manual for all users who want to learn more about Debian and its range of services."
-msgstr "Den här boken lär dig hur du installerar och konfigurerar ditt system och även hur du använder Debian i en professionell miljö. Den visar distributionens fulla potential (i dess aktuella version 6.0) och ger en praktisk manual för alla användare som vill lära sig mer om Debian och dess utbud av tjänster."
+#: ../../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 "
+"the distribution (in its current version 6.0) and provides a practical "
+"manual for all users who want to learn more about Debian and its range of "
+"services."
+msgstr ""
+"Den här boken lär dig hur du installerar och konfigurerar ditt system och "
+"även hur du använder Debian i en professionell miljö. Den visar "
+"distributionens fulla potential (i dess aktuella version 6.0) och ger en "
+"praktisk manual för alla användare som vill lära sig mer om Debian och dess "
+"utbud av tjänster."
-#: ../../english/doc/books.data:244
-msgid "2 editions: One with no CD, the other with Official CD (i386, contrib and sources)"
-msgstr "två varianter: en utan och en med officiell cd (i386, contrib och källkod)"
+#: ../../english/doc/books.data:287
+msgid ""
+"2 editions: One with no CD, the other with Official CD (i386, contrib and "
+"sources)"
+msgstr ""
+"två varianter: en utan och en med officiell cd (i386, contrib och källkod)"
-#: ../../english/doc/books.data:247
+#: ../../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"
@@ -245,7 +298,8 @@ msgstr ""
" tillämpningsprogram såsom X Window System, fönsterhanterare och\n"
" skrivbordsmiljöer (KDE, GNOME), och ett urval av viktiga systemtjänster.\n"
" Grundläggande Unix-/Linuxhandhavande och -koncept tillsammans med\n"
-" systemanvändning och viktiga komponenter (bash, systemtjänster och viktiga\n"
+" systemanvändning och viktiga komponenter (bash, systemtjänster och "
+"viktiga\n"
" kommandon) introduceras.\n"
" Den innehåller en beskrivning av Debians paketformat och hur man skapar\n"
" paket i detta format kommer.\n"
@@ -255,27 +309,29 @@ msgstr ""
" exempelvis planering och uppbyggnad av en modempool, eller en server för\n"
" Windowsbaserade klienter (Samba)."
-#: ../../english/doc/books.data:290
+#: ../../english/doc/books.data:333
msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
msgstr "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
-#: ../../english/doc/books.data:293
+#: ../../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 ""
-"Denna bok är i ordboksstil och täcker flera tips för nybörjare och användare\n"
-" på medelnivå; installation på olika sätt, skräddarsy skrivbordet, felsökning,\n"
+"Denna bok är i ordboksstil och täcker flera tips för nybörjare och "
+"användare\n"
+" på medelnivå; installation på olika sätt, skräddarsy skrivbordet, "
+"felsökning,\n"
" viktiga kunskaper och så vidare."
-#: ../../english/doc/books.data:306
+#: ../../english/doc/books.data:349
msgid ""
"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
" CD)"
msgstr "Debian GNU/Linux 3.1r0 i386, författarens utgåva (dvd + cd)"
-#: ../../english/doc/books.data:310
+#: ../../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"
@@ -290,16 +346,17 @@ msgstr ""
" Boken täcker alla infallsvinklar om att använda Debian GNU/Linux 3.1,\n"
" såsom installation, skrivbordsmiljöer, systemadministration och\n"
" serverkonfiguration.\n"
-" Dessutom innehåller boken ett kommersiellt paket teckensnitt som dekorerar\n"
+" Dessutom innehåller boken ett kommersiellt paket teckensnitt som "
+"dekorerar\n"
" ditt skrivbord.\n"
" Boken kan vara användbar för alla Debiananvändare, från nybörjare till\n"
" avancerade användare."
-#: ../../english/doc/books.data:325
+#: ../../english/doc/books.data:368
msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
msgstr "Debian 2.2r0 i386 författarens utgåva (3 cd)"
-#: ../../english/doc/books.data:328
+#: ../../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"
@@ -315,14 +372,15 @@ msgstr ""
" Du kommer kunna installera och börja använda Debian GNU/Linux'\n"
" japanska miljö väldigt enkelt via dess skräddarsydda cd-skivor."
-#: ../../english/doc/books.data:344
+#: ../../english/doc/books.data:387
msgid "1 unofficial Woody, 3 Potato rev0"
msgstr "1 inofficiell Woody, 3 Potato rev0"
-#: ../../english/doc/books.data:347
+#: ../../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 and\n"
+" GNU/Linux, fundamentals of Unix or Linux commands, basic configuration "
+"and\n"
" maintenance of system and networking,\n"
" X Window System setup, and using multimedia in Debian GNU/Linux.\n"
" This book also includes a guide for maintainers, which stimulates\n"
@@ -336,11 +394,11 @@ msgstr ""
" vilket stimulerar personer i Korea\n"
" att bli nya officiella Debianutvecklare."
-#: ../../english/doc/books.data:361
+#: ../../english/doc/books.data:404
msgid "Three official potato r3 CDs and an unofficial woody CD"
msgstr "Tre officiella potato r3-cd-skivor och en inofficiell woody-cd"
-#: ../../english/doc/books.data:364
+#: ../../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"
@@ -357,11 +415,11 @@ msgstr ""
" Denna bok ger ett antal tips på hur Debian ställs in för en\n"
" koreansk språkmiljö och är även bra för nybörjare."
-#: ../../english/doc/books.data:386
+#: ../../english/doc/books.data:429
msgid "Debian GNU/Linux 3.1r0 CD1"
msgstr "Debian GNU/Linux 3.1r0 CD1"
-#: ../../english/doc/books.data:389
+#: ../../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"
@@ -375,10 +433,11 @@ msgstr ""
" Den hjälper dig även att börja använda GNU/Linux och Debians\n"
" kraftfulla pakethanteringssystem."
-#: ../../english/doc/books.data:405
+#: ../../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 chapter\n"
+" GNU/Linux, Administration of the system and Advanced operations. Each "
+"chapter\n"
" explains in depth the features of the operating system. The first\n"
" chapters explain the structure of GNU/Linux. These chapters will help\n"
" the reader to understand how the system uses basic resources such as\n"
@@ -400,9 +459,21 @@ msgstr ""
" Denna bok är avsedd för högskolestudenter och alla som vill lära sig\n"
" detaljer om GNU/Linux. Denna bok är skriven för Debian Sarge."
-#: ../../english/doc/books.data:428
-msgid "This is the right book for you to learn how to create basic and complex IT platforms using only Free Software. Inside it you will find a wide range of procedures reviewed and adjusted to fit into the best practices of technological infrastructure implementation. This easy to read and comprehensive guide will take you by the hand to achieve specific objectives with the Debian GNU/Linux operating system."
-msgstr "Det här är den rätta boken för dig för att lära sig hur skapar enkla och komplexa IT-plattformar med hjälp av endast fri mjukvara. I den hittar du ett brett utbud av förfaranden som granskats och justerats för att passa din infrastrukturs teknologiska implementation. Denna lättlästa och omfattande guide kommer att handleda dig till att nå specifika objektiv med operativsystemet GNU/Linux."
+#: ../../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 "
+"procedures reviewed and adjusted to fit into the best practices of "
+"technological infrastructure implementation. This easy to read and "
+"comprehensive guide will take you by the hand to achieve specific objectives "
+"with the Debian GNU/Linux operating system."
+msgstr ""
+"Det här är den rätta boken för dig för att lära sig hur skapar enkla och "
+"komplexa IT-plattformar med hjälp av endast fri mjukvara. I den hittar du "
+"ett brett utbud av förfaranden som granskats och justerats för att passa din "
+"infrastrukturs teknologiska implementation. Denna lättlästa och omfattande "
+"guide kommer att handleda dig till att nå specifika objektiv med "
+"operativsystemet GNU/Linux."
#: ../../english/doc/books.def:38
msgid "Author:"
@@ -452,80 +523,82 @@ msgstr "Senaste version:"
msgid "(version <get-var version />)"
msgstr "(version <get-var version />)"
-#: ../../english/doc/manuals.defs:138
-#: ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr "ren text"
#: ../../english/doc/manuals.defs:154
-msgid "The latest <get-var srctype /> source is available through the <a href=\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
-msgstr "Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href=\"https://www.debian.org/doc/cvs\">Subversion</a>-förrådet."
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://www.debian.org/doc/cvs\">Subversion</a> repository."
+msgstr ""
+"Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href="
+"\"https://www.debian.org/doc/cvs\">Subversion</a>-förrådet."
-#: ../../english/doc/manuals.defs:156
-#: ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172
-#: ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:156 ../../english/doc/manuals.defs:164
+#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
msgid "Web interface: "
msgstr "Webbgränssnitt:"
-#: ../../english/doc/manuals.defs:157
-#: ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173
-#: ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
msgid "VCS interface: "
msgstr "VCS-gränssnitt:"
#: ../../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 "Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href=\"https://packages.debian.org/cvs\">Cvs</a>-förrådet."
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+"Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a>-förrådet."
#: ../../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 "Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href=\"https://packages.debian.org/subversion\">Subversion</a>-förrådet."
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a> repository."
+msgstr ""
+"Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a>-förrådet."
#: ../../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 "Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href=\"https://packages.debian.org/git\">Git</a>-förrådet."
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"Den senaste <get-var srctype />-källkoden finns tillgänglig i <a href="
+"\"https://packages.debian.org/git\">Git</a>-förrådet."
#: ../../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"
" and check out the <kbd>boot-floppies/documentation</kbd> module."
-msgstr "Arbetskopia av CVS-källkod: sätt <code>CVSROOT</code> till <kbd>:ext:<var>användar-id</var>@cvs.debian.org:/cvs/debian-boot</kbd>, och hämta ut modulen <kbd>boot-floppies/documentation</kbd>."
+msgstr ""
+"Arbetskopia av CVS-källkod: sätt <code>CVSROOT</code> till <kbd>:ext:"
+"<var>användar-id</var>@cvs.debian.org:/cvs/debian-boot</kbd>, och hämta ut "
+"modulen <kbd>boot-floppies/documentation</kbd>."
#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "CVS via webben"
-#: ../../english/doc/manuals.defs:197
-#: ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Debianpaketet"
-#: ../../english/doc/manuals.defs:206
-#: ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
msgid "Debian package (archived)"
msgstr "Debianpaketet (arkiverat)"
-#: ../../english/releases/arches.data:32
+#: ../../english/releases/arches.data:34
msgid "HTML"
msgstr "HTML"
-#: ../../english/releases/arches.data:33
+#: ../../english/releases/arches.data:35
msgid "PDF"
msgstr "PDF"
-#~ 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 ""
-#~ "Använd <a href=\"cvs\">Subversion</a> för att hämta SGML-källtexten för "
-#~ "<get-var ddp_pkg_loc />."
-
#~ msgid ""
#~ "An alternative <a href=\"http://www.lob.de/cgi-bin/work/outputexpert?"
#~ "mode=viewone&amp;titnr=254925022\">\n"
@@ -538,3 +611,13 @@ msgstr "PDF"
#~ "titnr=254925022\">\n"
#~ " utgåva</a> finns hos Lehmanns Fachbuchhandlung och kostar 29,95 &euro;\n"
#~ " (gäller 2008)."
+
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "Använd <a href=\"cvs\">Subversion</a> för att hämta SGML-källtexten för "
+#~ "<get-var ddp_pkg_loc />."
+
+#~ msgid "Language:"
+#~ msgstr "Språk:"
diff --git a/swedish/po/mailinglists.sv.po b/swedish/po/mailinglists.sv.po
index dbaab6d79be..bbf5da1d40a 100644
--- a/swedish/po/mailinglists.sv.po
+++ b/swedish/po/mailinglists.sv.po
@@ -130,8 +130,8 @@ msgstr "öppen"
msgid "closed"
msgstr "stängd"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Välj de listor du vill avbeställa:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "Välj vilka listor du vill prenumerera på:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Välj de listor du vill avbeställa:"
diff --git a/swedish/po/newsevents.sv.po b/swedish/po/newsevents.sv.po
index 9e26f8ba30b..4178060c053 100644
--- a/swedish/po/newsevents.sv.po
+++ b/swedish/po/newsevents.sv.po
@@ -21,7 +21,6 @@ msgid "Debian News"
msgstr "Debiannyheter"
#: ../../english/News/news.rdf.in:19
-#| msgid "Latest News"
msgid "Debian Latest News"
msgstr "Debians Senaste Nytt"
@@ -33,27 +32,27 @@ msgstr "s.<get-var page />"
msgid "The newsletter for the Debian community"
msgstr "Nyhetsbrevet för Debiangemenskapen"
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr "Namn:"
-#: ../../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 "Tidigare föredrag:"
-#: ../../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 "Plats:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Ämnen:"
@@ -146,8 +145,12 @@ msgid "Download calendar entry"
msgstr "Hämta kalenderpost"
#: ../../english/template/debian/news.wml:9
-msgid "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/\">Debian Project homepage</a>."
-msgstr "Tillbaka till: andra <a href=\"./\">Debiannyheter</a> || <a href=\"m4_HOME/\">Debianprojektets ingångssida</a>."
+msgid ""
+"Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/\">Debian "
+"Project homepage</a>."
+msgstr ""
+"Tillbaka till: andra <a href=\"./\">Debiannyheter</a> || <a href=\"m4_HOME/"
+"\">Debianprojektets ingångssida</a>."
#. '<get-var url />' is replaced by the URL and must not be translated.
#. In English the final line would look like "<http://broken.com (dead.link)>"
@@ -156,41 +159,124 @@ msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (död länk)"
#: ../../english/template/debian/projectnews/boilerplates.wml:35
-msgid "Welcome to this year's <get-var issue /> issue of DPN, the newsletter for the Debian community. Topics covered in this issue include:"
-msgstr "Välkommen till detta års <get-var issue /> utgåva av DPN, nyhetsbrevet för Debiangemenskapen. Ämnen som täcks i denna utgåva innefattar:"
+msgid ""
+"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
+"the Debian community. Topics covered in this issue include:"
+msgstr ""
+"Välkommen till detta års <get-var issue /> utgåva av DPN, nyhetsbrevet för "
+"Debiangemenskapen. Ämnen som täcks i denna utgåva innefattar:"
#: ../../english/template/debian/projectnews/boilerplates.wml:56
#: ../../english/template/debian/projectnews/boilerplates.wml:77
-msgid "According to the <a href=\"https://udd.debian.org/bugs.cgi\">Bugs Search interface of the Ultimate Debian Database</a>, the upcoming release, Debian <q><get-var release /></q>, is currently affected by <get-var testing /> Release-Critical bugs. Ignoring bugs which are easily solved or on the way to being solved, roughly speaking, about <get-var tobefixed /> Release-Critical bugs remain to be solved for the release to happen."
-msgstr "Enligt <a href=\"https://udd.debian.org/bugs.cgi\">Felsökningsgränssnittet i den Ultimata Debiandatabasen (UDD, Ultimate Debian Database)</a>, påverkas för närvarande den kommande Debianutgåvan <q><get-var release /></q> av <get-var testing /> utgåvekritiska fel. Om man ignorerar fel som är lätta att rätta eller på väg att rättas så återstår uppskattningsvis, <get-var tobefixed /> utgåvekritiska fel som måste rättas innan utgåvan kan ske."
+msgid ""
+"According to the <a href=\"https://udd.debian.org/bugs.cgi\">Bugs Search "
+"interface of the Ultimate Debian Database</a>, the upcoming release, Debian "
+"<q><get-var release /></q>, is currently affected by <get-var testing /> "
+"Release-Critical bugs. Ignoring bugs which are easily solved or on the way "
+"to being solved, roughly speaking, about <get-var tobefixed /> Release-"
+"Critical bugs remain to be solved for the release to happen."
+msgstr ""
+"Enligt <a href=\"https://udd.debian.org/bugs.cgi\">Felsökningsgränssnittet i "
+"den Ultimata Debiandatabasen (UDD, Ultimate Debian Database)</a>, påverkas "
+"för närvarande den kommande Debianutgåvan <q><get-var release /></q> av <get-"
+"var testing /> utgåvekritiska fel. Om man ignorerar fel som är lätta att "
+"rätta eller på väg att rättas så återstår uppskattningsvis, <get-var "
+"tobefixed /> utgåvekritiska fel som måste rättas innan utgåvan kan ske."
#: ../../english/template/debian/projectnews/boilerplates.wml:57
-msgid "There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints on how to interpret</a> these numbers."
-msgstr "Det finns även några <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">tips om hur du tolkar</a> dessa siffror."
+msgid ""
+"There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats"
+"\">hints on how to interpret</a> these numbers."
+msgstr ""
+"Det finns även några <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats"
+"\">tips om hur du tolkar</a> dessa siffror."
#: ../../english/template/debian/projectnews/boilerplates.wml:78
-msgid "There are also <a href=\"<get-var url />\">more detailed statistics</a> as well as some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints on how to interpret</a> these numbers."
-msgstr "Det finns även <a href=\"<get-var url />\">mer detaljerad statistik</a> så väl som <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">tips om hur du tolkar</a> dessa siffror."
+msgid ""
+"There are also <a href=\"<get-var url />\">more detailed statistics</a> as "
+"well as some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints "
+"on how to interpret</a> these numbers."
+msgstr ""
+"Det finns även <a href=\"<get-var url />\">mer detaljerad statistik</a> så "
+"väl som <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">tips om hur "
+"du tolkar</a> dessa siffror."
#: ../../english/template/debian/projectnews/boilerplates.wml:102
-msgid "<a href=\"<get-var link />\">Currently</a> <a href=\"m4_DEVEL/wnpp/orphaned\"><get-var orphaned /> packages are orphaned</a> and <a href=\"m4_DEVEL/wnpp/rfa\"><get-var rfa /> packages are up for adoption</a>: please visit the complete list of <a href=\"m4_DEVEL/wnpp/help_requested\">packages which need your help</a>."
-msgstr "<a href=\"<get-var link />\">För närvarande</a> är <a href=\"m4_DEVEL/wnpp/orphaned\"><get-var orphaned /> paket övergivna </a>, och <a href=\"m4_DEVEL/wnpp/rfa\"><get-var rfa /> paket är tillgängliga för adoption</a>: Vänligen se den fullständiga listan på <a href=\"m4_DEVEL/wnpp/help_requested\">paket som behöver din hjälp</a>."
+msgid ""
+"<a href=\"<get-var link />\">Currently</a> <a href=\"m4_DEVEL/wnpp/orphaned"
+"\"><get-var orphaned /> packages are orphaned</a> and <a href=\"m4_DEVEL/"
+"wnpp/rfa\"><get-var rfa /> packages are up for adoption</a>: please visit "
+"the complete list of <a href=\"m4_DEVEL/wnpp/help_requested\">packages which "
+"need your help</a>."
+msgstr ""
+"<a href=\"<get-var link />\">För närvarande</a> är <a href=\"m4_DEVEL/wnpp/"
+"orphaned\"><get-var orphaned /> paket övergivna </a>, och <a href=\"m4_DEVEL/"
+"wnpp/rfa\"><get-var rfa /> paket är tillgängliga för adoption</a>: Vänligen "
+"se den fullständiga listan på <a href=\"m4_DEVEL/wnpp/help_requested\">paket "
+"som behöver din hjälp</a>."
#: ../../english/template/debian/projectnews/boilerplates.wml:114
-msgid "Please help us create this newsletter. We still need more volunteer writers to watch the Debian community and report about what is going on. Please see the <a href=\"https://wiki.debian.org/ProjectNews/HowToContribute\">contributing page</a> to find out how to help. We're looking forward to receiving your mail at <a href=\"mailto:debian-publicity@lists.debian.org\">debian-publicity@lists.debian.org</a>."
-msgstr "Vänligen hjälp oss att skapa detta nyhetsbrev. Vi behöver fortfarande fler frivilliga författare som övervakar Debiangemenskapen och rapporterar vad som är på gång. Vänligen se <a href=\"https://wiki.debian.org/ProjectNews/HowToContribute\">sidan för bidragslämnare</a> för att få reda på hur du hjälper till. Vi ser fram emot att ta emot ditt mail på <a href=\"mailto:debian-publicity@lists.debian.org\">debian-publicity@lists.debian.org</a>."
+msgid ""
+"Please help us create this newsletter. We still need more volunteer writers "
+"to watch the Debian community and report about what is going on. Please see "
+"the <a href=\"https://wiki.debian.org/ProjectNews/HowToContribute"
+"\">contributing page</a> to find out how to help. We're looking forward to "
+"receiving your mail at <a href=\"mailto:debian-publicity@lists.debian.org"
+"\">debian-publicity@lists.debian.org</a>."
+msgstr ""
+"Vänligen hjälp oss att skapa detta nyhetsbrev. Vi behöver fortfarande fler "
+"frivilliga författare som övervakar Debiangemenskapen och rapporterar vad "
+"som är på gång. Vänligen se <a href=\"https://wiki.debian.org/ProjectNews/"
+"HowToContribute\">sidan för bidragslämnare</a> för att få reda på hur du "
+"hjälper till. Vi ser fram emot att ta emot ditt mail på <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">debian-publicity@lists.debian.org</a>."
#: ../../english/template/debian/projectnews/boilerplates.wml:175
-msgid "Please note that these are a selection of the more important security advisories of the last weeks. If you need to be kept up to date about security advisories released by the Debian Security Team, please subscribe to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href=\"<get-var url-stable-announce />\">stable updates list</a>) for announcements."
-msgstr "Vänligen notera att detta är ett urval av de mer viktiga säkerhetsbulletinerna från de senaste veckorna. Om du behöver hålla dig uppdaterad rörande säkerhetsbulletiner som släpps av Debians säkerhetsgrupp, vänligen prenumerera på <a href=\"<get-var url-dsa />\">säkerhetssändlistan</a> (och den separata <a href=\"<get-var url-bpo />\">sändlistan för bakåtanpassningar</a>, och <a href=\"<get-var url-stable-announce />\">listan för stabila uppdateringarstable updates list</a>) för tillkännagivanden."
+msgid ""
+"Please note that these are a selection of the more important security "
+"advisories of the last weeks. If you need to be kept up to date about "
+"security advisories released by the Debian Security Team, please subscribe "
+"to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
+"\"<get-var url-stable-announce />\">stable updates list</a>) for "
+"announcements."
+msgstr ""
+"Vänligen notera att detta är ett urval av de mer viktiga "
+"säkerhetsbulletinerna från de senaste veckorna. Om du behöver hålla dig "
+"uppdaterad rörande säkerhetsbulletiner som släpps av Debians säkerhetsgrupp, "
+"vänligen prenumerera på <a href=\"<get-var url-dsa />\">säkerhetssändlistan</"
+"a> (och den separata <a href=\"<get-var url-bpo />\">sändlistan för "
+"bakåtanpassningar</a>, och <a href=\"<get-var url-stable-announce />"
+"\">listan för stabila uppdateringarstable updates list</a>) för "
+"tillkännagivanden."
#: ../../english/template/debian/projectnews/boilerplates.wml:176
-msgid "Please note that these are a selection of the more important security advisories of the last weeks. If you need to be kept up to date about security advisories released by the Debian Security Team, please subscribe to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href=\"<get-var url-stable-announce />\">stable updates list</a> or <a href=\"<get-var url-volatile-announce />\">volatile list</a>, for <q><get-var old-stable /></q>, the oldstable distribution) for announcements."
-msgstr "Vänligen notera att detta är ett urval av de mer viktiga säkerhetsbulletinerna från de senaste veckorna. Om du behöver hålla dig mer uppdaterad rörande säkerhetsbulletiner som släpps av Debians säkerhetsgrupp, vänligen prenumerera på <a href=\"<get-var url-dsa />\">säkerhetssändlistan</a> (och den separata <a href=\"<get-var url-bpo />\">sändlistan för bakåtanpassningar</a>, och <a href=\"<get-var url-stable-announce />\">sändlistan för stabila uppdateringar</a> eller <a href=\"<get-var url-volatile-announce />\">volatilesändlistan</a>, för <q><get-var old-stable /></q>, den gamla stabila utgåvan) för tillkännagivanden."
+msgid ""
+"Please note that these are a selection of the more important security "
+"advisories of the last weeks. If you need to be kept up to date about "
+"security advisories released by the Debian Security Team, please subscribe "
+"to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
+"\"<get-var url-stable-announce />\">stable updates list</a> or <a href="
+"\"<get-var url-volatile-announce />\">volatile list</a>, for <q><get-var old-"
+"stable /></q>, the oldstable distribution) for announcements."
+msgstr ""
+"Vänligen notera att detta är ett urval av de mer viktiga "
+"säkerhetsbulletinerna från de senaste veckorna. Om du behöver hålla dig mer "
+"uppdaterad rörande säkerhetsbulletiner som släpps av Debians säkerhetsgrupp, "
+"vänligen prenumerera på <a href=\"<get-var url-dsa />\">säkerhetssändlistan</"
+"a> (och den separata <a href=\"<get-var url-bpo />\">sändlistan för "
+"bakåtanpassningar</a>, och <a href=\"<get-var url-stable-announce />"
+"\">sändlistan för stabila uppdateringar</a> eller <a href=\"<get-var url-"
+"volatile-announce />\">volatilesändlistan</a>, för <q><get-var old-stable /"
+"></q>, den gamla stabila utgåvan) för tillkännagivanden."
#: ../../english/template/debian/projectnews/boilerplates.wml:185
-msgid "Debian's Stable Release Team released an update announcement for the package: "
-msgstr "Debians grupp för stabila utgåvor släppte ett tillkännagivande för paketet:"
+msgid ""
+"Debian's Stable Release Team released an update announcement for the "
+"package: "
+msgstr ""
+"Debians grupp för stabila utgåvor släppte ett tillkännagivande för paketet:"
#: ../../english/template/debian/projectnews/boilerplates.wml:187
#: ../../english/template/debian/projectnews/boilerplates.wml:200
@@ -225,12 +311,19 @@ msgid "Debian's Backports Team released advisories for these packages: "
msgstr "Debians Bakåtanpassningsgrupp släppte bulletiner för följande paket:"
#: ../../english/template/debian/projectnews/boilerplates.wml:211
-msgid "Debian's Security Team recently released advisories for these packages (among others): "
-msgstr "Debians säkerhetsgrupp släppte nyligen bulletiner för (bland annat) dessa paket:"
+msgid ""
+"Debian's Security Team recently released advisories for these packages "
+"(among others): "
+msgstr ""
+"Debians säkerhetsgrupp släppte nyligen bulletiner för (bland annat) dessa "
+"paket:"
#: ../../english/template/debian/projectnews/boilerplates.wml:240
-msgid "<get-var num-newpkg /> packages were added to the unstable Debian archive recently."
-msgstr "<get-var num-newpkg /> paket lades till det ostabila Debianarkivet nyligen."
+msgid ""
+"<get-var num-newpkg /> packages were added to the unstable Debian archive "
+"recently."
+msgstr ""
+"<get-var num-newpkg /> paket lades till det ostabila Debianarkivet nyligen."
#: ../../english/template/debian/projectnews/boilerplates.wml:242
msgid " <a href=\"<get-var url-newpkg />\">Among many others</a> are:"
@@ -241,61 +334,133 @@ msgid "There are several upcoming Debian-related events:"
msgstr "Det finns fler kommande Debian-relaterade händelser:"
#: ../../english/template/debian/projectnews/boilerplates.wml:275
-msgid "You can find more information about Debian-related events and talks on the <a href=\"<get-var events-section />\">events section</a> of the Debian web site, or subscribe to one of our events mailing lists for different regions: <a href=\"<get-var events-ml-eu />\">Europe</a>, <a href=\"<get-var events-ml-nl />\">Netherlands</a>, <a href=\"<get-var events-ml-ha />\">Hispanic America</a>, <a href=\"<get-var events-ml-na />\">North America</a>."
-msgstr "Du kan få mer information om Debianrelaterade evenemang och föreläsningar på <a href=\"<get-var events-section />\">evenemangavdelning</a> av Debians webbplats, eller genom att prenumerera på våran sändlista för evenemang för olika regioner: <a href=\"<get-var events-ml-eu />\">Europa</a>, <a href=\"<get-var events-ml-nl />\">Holland</a>, <a href=\"<get-var events-ml-ha />\">Latinamerika</a>, <a href=\"<get-var events-ml-na />\">Nordamerika</a>."
+msgid ""
+"You can find more information about Debian-related events and talks on the "
+"<a href=\"<get-var events-section />\">events section</a> of the Debian web "
+"site, or subscribe to one of our events mailing lists for different regions: "
+"<a href=\"<get-var events-ml-eu />\">Europe</a>, <a href=\"<get-var events-"
+"ml-nl />\">Netherlands</a>, <a href=\"<get-var events-ml-ha />\">Hispanic "
+"America</a>, <a href=\"<get-var events-ml-na />\">North America</a>."
+msgstr ""
+"Du kan få mer information om Debianrelaterade evenemang och föreläsningar på "
+"<a href=\"<get-var events-section />\">evenemangavdelning</a> av Debians "
+"webbplats, eller genom att prenumerera på våran sändlista för evenemang för "
+"olika regioner: <a href=\"<get-var events-ml-eu />\">Europa</a>, <a href="
+"\"<get-var events-ml-nl />\">Holland</a>, <a href=\"<get-var events-ml-ha />"
+"\">Latinamerika</a>, <a href=\"<get-var events-ml-na />\">Nordamerika</a>."
#: ../../english/template/debian/projectnews/boilerplates.wml:300
-msgid "Do you want to organise a Debian booth or a Debian install party? Are you aware of other upcoming Debian-related events? Have you delivered a Debian talk that you want to link on our <a href=\"<get-var events-talks />\">talks page</a>? Send an email to the <a href=\"<get-var events-team />\">Debian Events Team</a>."
-msgstr "Vill du organisera en Debianmonter eller en Installationsfest för Debian? Känner du till andra kommande Debianrelaterade evenemang? Har du givit ett Debianföredrag som du vill länka på våran <a href=\"<get-var events-talks />\">föredragssida</a>? Skicka ett meddelande till <a href=\"<get-var events-team />\">Debians Evenemangsgrupp</a>."
+msgid ""
+"Do you want to organise a Debian booth or a Debian install party? Are you "
+"aware of other upcoming Debian-related events? Have you delivered a Debian "
+"talk that you want to link on our <a href=\"<get-var events-talks />\">talks "
+"page</a>? Send an email to the <a href=\"<get-var events-team />\">Debian "
+"Events Team</a>."
+msgstr ""
+"Vill du organisera en Debianmonter eller en Installationsfest för Debian? "
+"Känner du till andra kommande Debianrelaterade evenemang? Har du givit ett "
+"Debianföredrag som du vill länka på våran <a href=\"<get-var events-talks />"
+"\">föredragssida</a>? Skicka ett meddelande till <a href=\"<get-var events-"
+"team />\">Debians Evenemangsgrupp</a>."
#: ../../english/template/debian/projectnews/boilerplates.wml:322
-msgid "<get-var dd-num /> applicants have been <a href=\"<get-var dd-url />\">accepted</a> as Debian Developers"
-msgstr "<get-var dd-num /> ansökande har blivit <a href=\"<get-var dd-url />\">antagna</a> som Debianutvecklare"
+msgid ""
+"<get-var dd-num /> applicants have been <a href=\"<get-var dd-url />"
+"\">accepted</a> as Debian Developers"
+msgstr ""
+"<get-var dd-num /> ansökande har blivit <a href=\"<get-var dd-url />"
+"\">antagna</a> som Debianutvecklare"
#: ../../english/template/debian/projectnews/boilerplates.wml:329
-msgid "<get-var dm-num /> applicants have been <a href=\"<get-var dm-url />\">accepted</a> as Debian Maintainers"
-msgstr "<get-var dm-num /> ansökande har blivit <a href=\"<get-var dm-url />\">antagna</a> som Debian Maintainers"
+msgid ""
+"<get-var dm-num /> applicants have been <a href=\"<get-var dm-url />"
+"\">accepted</a> as Debian Maintainers"
+msgstr ""
+"<get-var dm-num /> ansökande har blivit <a href=\"<get-var dm-url />"
+"\">antagna</a> som Debian Maintainers"
#: ../../english/template/debian/projectnews/boilerplates.wml:336
-msgid "<get-var uploader-num /> people have <a href=\"<get-var uploader-url />\">started to maintain packages</a>"
-msgstr "<get-var uploader-num />personer har <a href=\"<get-var uploader-url />\">börjat att underhålla paket</a>"
+msgid ""
+"<get-var uploader-num /> people have <a href=\"<get-var uploader-url />"
+"\">started to maintain packages</a>"
+msgstr ""
+"<get-var uploader-num />personer har <a href=\"<get-var uploader-url />"
+"\">börjat att underhålla paket</a>"
#: ../../english/template/debian/projectnews/boilerplates.wml:381
-msgid "<get-var eval-newcontributors-text-list /> since the previous issue of the Debian Project News. Please welcome <get-var eval-newcontributors-name-list /> into our project!"
-msgstr "<get-var eval-newcontributors-text-list /> sedan föregående utgåvan avDebian Project News. Välkomna <get-var eval-newcontributors-name-list /> till vårat projekt!"
+msgid ""
+"<get-var eval-newcontributors-text-list /> since the previous issue of the "
+"Debian Project News. Please welcome <get-var eval-newcontributors-name-list /"
+"> into our project!"
+msgstr ""
+"<get-var eval-newcontributors-text-list /> sedan föregående utgåvan avDebian "
+"Project News. Välkomna <get-var eval-newcontributors-name-list /> till vårat "
+"projekt!"
#: ../../english/template/debian/projectnews/boilerplates.wml:394
-msgid "The <get-var issue-devel-news /> issue of the <a href=\"<get-var url-devel-news />\">miscellaneous news for developers</a> has been released and covers the following topics:"
-msgstr "Utgåva <get-var issue-devel-news /> av <a href=\"<get-var url-devel-news />\">blandade nyheter för utvecklare</a> har blivit utgiven och täcker följande ämnen:"
+msgid ""
+"The <get-var issue-devel-news /> issue of the <a href=\"<get-var url-devel-"
+"news />\">miscellaneous news for developers</a> has been released and covers "
+"the following topics:"
+msgstr ""
+"Utgåva <get-var issue-devel-news /> av <a href=\"<get-var url-devel-news />"
+"\">blandade nyheter för utvecklare</a> har blivit utgiven och täcker "
+"följande ämnen:"
#: ../../english/template/debian/projectnews/footer.wml:6
-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 "För att få det här nyhetsbrevet tillsänt dig per e-post varannan vecka, <a href=\"https://lists.debian.org/debian-news/\">prenumerera på sändlistan debian-news</a>."
+#, 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 in your mailbox, <a href=\"https://lists.debian."
+"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgstr ""
+"För att få det här nyhetsbrevet tillsänt dig per e-post varje vecka, <a href="
+"\"https://lists.debian.org/debian-news/\">prenumerera på sändlistan debian-"
+"news</a>."
#: ../../english/template/debian/projectnews/footer.wml:10
#: ../../english/template/debian/weeklynews/footer.wml:10
msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-msgstr "<a href=\"../../\">Tidigare utgåvor</a> av nyhetsbrevet finns att tillgå."
+msgstr ""
+"<a href=\"../../\">Tidigare utgåvor</a> av nyhetsbrevet finns att tillgå."
#. One editor name only
#: ../../english/template/debian/projectnews/footer.wml:15
-msgid "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr "Redaktör för Debian Project News är <a href=\"mailto:dwn@debian.org\">%s</a>."
+msgid ""
+"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"Redaktör för Debian Project News är <a href=\"mailto:dwn@debian.org\">%s</a>."
#. Two or more editors
#: ../../english/template/debian/projectnews/footer.wml:20
-msgid "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr "Redaktörer för Debian Project News är <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>."
+msgstr ""
+"Redaktörer för Debian Project News är <a href=\"mailto:dwn@debian.org\">%s</"
+"a>."
#. One editor name only
#: ../../english/template/debian/projectnews/footer.wml:25
-msgid "<void id=\"singular\" />This issue of Debian Project News was edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr "Detta nummer av Debian Project News redigerades av <a href=\"mailto:dwn@debian.org\">%s</a>."
+msgid ""
+"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"Detta nummer av Debian Project News redigerades av <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
#. Two or more editors
#: ../../english/template/debian/projectnews/footer.wml:30
-msgid "<void id=\"plural\" />This issue of Debian Project News was edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-msgstr "Detta nummer av Debian Project News redigerades av <a href=\"mailto:dwn@debian.org\">%s</a>."
+msgid ""
+"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"Detta nummer av Debian Project News redigerades av <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
#. One translator only
#. One translator only
@@ -334,26 +499,54 @@ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
msgstr "Åter till <a href=\"./\">Debians föredragshållaröversikt</a>."
#: ../../english/template/debian/weeklynews/footer.wml:6
-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>."
-msgstr "För att få det här nyhetsbrevet tillsänt dig per e-post varje vecka, <a href=\"https://lists.debian.org/debian-news/\">prenumerera på sändlistan debian-news</a>."
+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>."
+msgstr ""
+"För att få det här nyhetsbrevet tillsänt dig per e-post varje vecka, <a href="
+"\"https://lists.debian.org/debian-news/\">prenumerera på sändlistan debian-"
+"news</a>."
#. One editor name only
#: ../../english/template/debian/weeklynews/footer.wml:15
-msgid "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr "Redaktör för Debian Weekly News är <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>."
+msgstr ""
+"Redaktör för Debian Weekly News är <a href=\"mailto:dwn@debian.org\">%s</a>."
#. Two or more editors
#: ../../english/template/debian/weeklynews/footer.wml:20
-msgid "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr "Redaktörer för Debian Weekly News är <a href=\"mailto:dwn@debian.org\">%s</a>."
+msgid ""
+"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+"Redaktörer för Debian Weekly News är <a href=\"mailto:dwn@debian.org\">%s</"
+"a>."
#. One editor name only
#: ../../english/template/debian/weeklynews/footer.wml:25
-msgid "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr "Detta nummer av Debian Weekly News redigerades av <a href=\"mailto:dwn@debian.org\">%s</a>."
+msgid ""
+"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+msgstr ""
+"Detta nummer av Debian Weekly News redigerades av <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
#. Two or more editors
#: ../../english/template/debian/weeklynews/footer.wml:30
-msgid "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr "Detta nummer av Debian Weekly News redigerades av <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>."
+msgstr ""
+"Detta nummer av Debian Weekly News redigerades av <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 ""
+#~ "För att få det här nyhetsbrevet tillsänt dig per e-post varannan vecka, "
+#~ "<a href=\"https://lists.debian.org/debian-news/\">prenumerera på "
+#~ "sändlistan debian-news</a>."
diff --git a/swedish/po/organization.sv.po b/swedish/po/organization.sv.po
index 9ac63904c02..29bef262712 100644
--- a/swedish/po/organization.sv.po
+++ b/swedish/po/organization.sv.po
@@ -78,7 +78,7 @@ msgid "Officers"
msgstr "Tjänstemän"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Distributionen"
@@ -88,11 +88,11 @@ msgid "Publicity"
msgstr "PR"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Support och 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 "Debian Pure Blends"
@@ -105,79 +105,79 @@ msgstr "Arbetsledare"
msgid "Technical Committee"
msgstr "Teknisk kommitté"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Sekreterare"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Utvecklingsprojekt"
-#: ../../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 Masters"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Ftp-assistenter"
-#: ../../english/intro/organization.data:98
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "FTP Wizards"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Backports-teamet"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Individuella paket"
-#: ../../english/intro/organization.data:109
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Samordning av nya utgåvor"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Utgivningsgruppen"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Kvalitetsstyrning"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Installationssystemgruppen"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Versionsfakta"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Cd-avbildningsfiler"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Produktion"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Testning"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Infrastruktur för automatiska byggen"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Vill-bygga-gruppen"
@@ -225,168 +225,186 @@ msgstr "Presskontakt"
msgid "Partner Program"
msgstr "Partnerprogrammet"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Evenemang"
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Bitar från Debian"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Användarstöd"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Felrapporteringssystem"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Sändlisteadministration och -arkiv"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Nymedlemsreceptionen"
-#: ../../english/intro/organization.data:336
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Debiankontoadministratörer"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Ansvariga för nyckelring (PGP och GPG)"
-#: ../../english/intro/organization.data:344
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Ansvariga för nyckelringen för Debian Maintainers (DM)"
-#: ../../english/intro/organization.data:348
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Säkerhetsgrupp"
-#: ../../english/intro/organization.data:363
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Webbsidor"
-#: ../../english/intro/organization.data:371
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Konsultsida"
-#: ../../english/intro/organization.data:376
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Cd-försäljarsida"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:383
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Policy"
-#: ../../english/intro/organization.data:388
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Systemadministration"
-#: ../../english/intro/organization.data:389
-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."
-msgstr "Det här är adressen som skall användas när problem uppstår med en av Debians datorer, inklusive lösenordsproblem, eller om du behöver få ett paket installerat."
+#: ../../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."
+msgstr ""
+"Det här är adressen som skall användas när problem uppstår med en av Debians "
+"datorer, inklusive lösenordsproblem, eller om du behöver få ett paket "
+"installerat."
-#: ../../english/intro/organization.data:397
-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 maskinvaruproblem med en av Debians datorer, se <a href=\"https://db.debian.org/machines.cgi\">Debianmaskinsidan</a>, vilken innehåller information om administratörer för varje enskild maskin."
+#: ../../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 maskinvaruproblem med en av Debians datorer, se <a href=\"https://"
+"db.debian.org/machines.cgi\">Debianmaskinsidan</a>, vilken innehåller "
+"information om administratörer för varje enskild maskin."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Administratör för LDAP-utvecklarkatalogen"
-#: ../../english/intro/organization.data:399
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Speglingar"
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "DNS-ansvarig"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Paketspårningssystem"
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Samordning av maskinvarudonationer"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Revisor"
-#: ../../english/intro/organization.data:416
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr "Förfrågningar angående <a href=\"m4_HOME/trademark\">varmärkesanvändning</a>"
-
-#: ../../english/intro/organization.data:417
-msgid "current Debian Project Leader"
-msgstr "Debians nuvarande projektledare"
+#: ../../english/intro/organization.data:413
+#, fuzzy
+#| msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
+msgstr ""
+"Förfrågningar angående <a href=\"m4_HOME/trademark\">varmärkesanvändning</a>"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Administratörer för Alioth"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Debian Women-projektet"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "Debconf-ledare"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Anti-trakasserier"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:436
+msgid "Outreach"
+msgstr ""
+
+#: ../../english/intro/organization.data:446
msgid "Debian for children from 1 to 99"
msgstr "Debian för barn mellan 1 och 99"
-#: ../../english/intro/organization.data:450
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian för medicinsk praktik och forskning"
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian för utbildning"
-#: ../../english/intro/organization.data:458
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian för juridiska firmor"
# Politiskt korrekt? :-)
-#: ../../english/intro/organization.data:462
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian för personer med funktionsnedsättningar"
-#: ../../english/intro/organization.data:466
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian för vetenskap och forskning"
-#~ msgid "Volatile Team"
-#~ msgstr "Volatilegruppen"
+#~ msgid "Testing Security Team"
+#~ msgstr "Uttestningsutgåvans säkerhetsgrupp"
-#~ msgid "Vendors"
-#~ msgstr "Försäljare"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projekt för säkerhetsgenomgång"
-#~ msgid "Handhelds"
-#~ msgstr "Handhållna"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Samordning av nyckelsignering"
#~ msgid "Marketing Team"
#~ msgstr "Marknadsföringsgrupp"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Samordning av nyckelsignering"
+#~ msgid "Handhelds"
+#~ msgstr "Handhållna"
-#~ msgid "Security Audit Project"
-#~ msgstr "Projekt för säkerhetsgenomgång"
+#~ msgid "Vendors"
+#~ msgstr "Försäljare"
-#~ msgid "Testing Security Team"
-#~ msgstr "Uttestningsutgåvans säkerhetsgrupp"
+#~ msgid "Volatile Team"
+#~ msgstr "Volatilegruppen"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Debians nuvarande projektledare"
diff --git a/swedish/po/others.sv.po b/swedish/po/others.sv.po
index a73e068c66e..23119923b12 100644
--- a/swedish/po/others.sv.po
+++ b/swedish/po/others.sv.po
@@ -101,8 +101,12 @@ msgid "Applicants' checklist"
msgstr "Checklista för Ansökande"
#: ../../english/devel/website/tc.data:11
-msgid "See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> (only available in French) for more information."
-msgstr "Se <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> (endast tillgänglig på franska) för mer information."
+msgid ""
+"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
+"(only available in French) for more information."
+msgstr ""
+"Se <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
+"(endast tillgänglig på franska) för mer information."
#: ../../english/devel/website/tc.data:12
#: ../../english/devel/website/tc.data:14
@@ -112,8 +116,12 @@ msgid "More information"
msgstr "Mer information"
#: ../../english/devel/website/tc.data:13
-msgid "See <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</a> (only available in Spanish) for more information."
-msgstr "Se <A href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</A> (endast tillgänglig på spanska) för mer information."
+msgid ""
+"See <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</"
+"a> (only available in Spanish) for more information."
+msgstr ""
+"Se <A href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</"
+"A> (endast tillgänglig på spanska) för mer information."
#: ../../english/distrib/pre-installed.defs:18
msgid "Phone"
@@ -162,27 +170,6 @@ msgstr "[Debian] (liten knapp)"
msgid "same as the above"
msgstr "samma som ovan"
-#: ../../english/misc/hardware.def:12
-#: ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "Önskas:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Av:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Arkitektur:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Specifikationer:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Plats:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Produkter"
@@ -272,11 +259,16 @@ msgid "What got you interested in working with Debian?"
msgstr "Vad fick dig intresserad av att arbeta med Debian?"
#: ../../english/women/profiles/profiles.def:36
-msgid "Do you have any tips for women interested in getting more involved with Debian?"
-msgstr "Har du några tips för kvinnor som är intresserade av att bli mer delaktiga i Debian?"
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+"Har du några tips för kvinnor som är intresserade av att bli mer delaktiga i "
+"Debian?"
#: ../../english/women/profiles/profiles.def:39
-msgid "Are you involved with any other women in technology group? Which one(s)?"
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
msgstr "Känner du några andra kvinnor i teknologigruppen? Vilka?"
#: ../../english/women/profiles/profiles.def:42
@@ -327,3 +319,17 @@ msgstr "Version"
msgid "URL"
msgstr "Webbadress"
+#~ msgid "Where:"
+#~ msgstr "Plats:"
+
+#~ msgid "Specifications:"
+#~ msgstr "Specifikationer:"
+
+#~ msgid "Architecture:"
+#~ msgstr "Arkitektur:"
+
+#~ msgid "Who:"
+#~ msgstr "Av:"
+
+#~ msgid "Wanted:"
+#~ msgstr "Önskas:"
diff --git a/swedish/po/ports.sv.po b/swedish/po/ports.sv.po
index 21d179035eb..b0c977c666c 100644
--- a/swedish/po/ports.sv.po
+++ b/swedish/po/ports.sv.po
@@ -1,6 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2014-05-22 16:18+0100\n"
"Last-Translator: Andreas Rönnquist <gusnan@gusnan.se>\n"
"Language-Team: debian-l10n-swedish@lists.debian.org\n"
@@ -8,7 +9,6 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: \n"
#: ../../english/ports/alpha/menu.inc:6
msgid "Debian for Alpha"
@@ -114,32 +114,32 @@ msgstr "Debian för PowerPC"
msgid "Debian for Sparc"
msgstr "Debian för Sparc"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian för Sparc64"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian för S/390"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian för bärbara"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian för MIPS"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian för AMD64"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian för Motorola 680x0"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian för ARM"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian för Beowulf"
#~ msgid "Main"
#~ msgstr "Huvudsida"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian för Beowulf"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian för ARM"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian för Motorola 680x0"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian för AMD64"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian för MIPS"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian för bärbara"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian för S/390"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian för Sparc64"
diff --git a/swedish/po/stats.sv.po b/swedish/po/stats.sv.po
index ccfe600c1cc..d9a55f1c9f7 100644
--- a/swedish/po/stats.sv.po
+++ b/swedish/po/stats.sv.po
@@ -28,75 +28,75 @@ msgstr "Det finns %d bytes att översätta."
msgid "There are %d strings to translate."
msgstr "Det finns %d strängar att översätta."
-#: ../../stattrans.pl:240 ../../stattrans.pl:244
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
msgid "This translation is too out of date"
msgstr "Den här översättningen är föråldrad"
-#: ../../stattrans.pl:242 ../../stattrans.pl:461
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
msgid "Wrong translation version"
msgstr "Felaktig översättningsversion"
-#: ../../stattrans.pl:246
+#: ../../stattrans.pl:235
msgid "The original is newer than this translation"
msgstr "Originalet är nyare än denna översättning"
-#: ../../stattrans.pl:249 ../../stattrans.pl:461
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
msgid "The original no longer exists"
msgstr "Originalet finns inte längre"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hit count N/A"
msgstr "träffräknare N/A"
-#: ../../stattrans.pl:437
+#: ../../stattrans.pl:403
msgid "hits"
msgstr "träffar"
-#: ../../stattrans.pl:455 ../../stattrans.pl:456
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
msgid "Click to fetch diffstat data"
msgstr "Klicka för att hämta diffstat-data"
-#: ../../stattrans.pl:470 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Unified diff"
msgstr "Samlad diff"
-#: ../../stattrans.pl:473 ../../stattrans.pl:612 ../../stattrans.pl:613
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
msgid "Colored diff"
msgstr "Färglagd diff"
-#: ../../stattrans.pl:575
+#: ../../stattrans.pl:541
msgid "Translation summary for"
msgstr "Översättningssammanfattning för"
-#: ../../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 "Ej översatt"
-#: ../../stattrans.pl:578 ../../stattrans.pl:736 ../../stattrans.pl:782
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
msgid "Outdated"
msgstr "Föråldrade"
-#: ../../stattrans.pl:578
+#: ../../stattrans.pl:544
msgid "Translated"
msgstr "Översatt"
-#: ../../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 "Uppdaterade"
-#: ../../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 "bytes"
-#: ../../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."
@@ -104,134 +104,134 @@ msgstr ""
"Observera: listorna på den här sidan sorteras efter popularitet. Hovra över "
"sidnamnet för att se antal träffar."
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:567
msgid "Outdated translations"
msgstr "Föråldrade översättningar"
-#: ../../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 "Diff"
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:573
msgid "Comment"
msgstr "Kommentar"
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:574
msgid "Diffstat"
msgstr "Diffstat"
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:579
msgid "Log"
msgstr "Logg"
-#: ../../stattrans.pl:617
+#: ../../stattrans.pl:580
msgid "Translation"
msgstr "Översättning"
-#: ../../stattrans.pl:618
+#: ../../stattrans.pl:581
msgid "Maintainer"
msgstr "Underhållare"
-#: ../../stattrans.pl:620
+#: ../../stattrans.pl:583
msgid "Status"
msgstr "Status"
-#: ../../stattrans.pl:621
+#: ../../stattrans.pl:584
msgid "Translator"
msgstr "Översättare"
-#: ../../stattrans.pl:622
+#: ../../stattrans.pl:585
msgid "Date"
msgstr "Datum"
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:592
msgid "General pages not translated"
msgstr "Generella sidor ej översatta"
-#: ../../stattrans.pl:630
+#: ../../stattrans.pl:593
msgid "Untranslated general pages"
msgstr "Ej översatta generella sidor"
-#: ../../stattrans.pl:635
+#: ../../stattrans.pl:598
msgid "News items not translated"
msgstr "Nyheter som inte översatts"
-#: ../../stattrans.pl:636
+#: ../../stattrans.pl:599
msgid "Untranslated news items"
msgstr "Oöversatta nyheter"
-#: ../../stattrans.pl:641
+#: ../../stattrans.pl:604
msgid "Consultant/user pages not translated"
msgstr "Konsult/användarsidor som inte översatts"
-#: ../../stattrans.pl:642
+#: ../../stattrans.pl:605
msgid "Untranslated consultant/user pages"
msgstr "Ej översatta Konsult/användarsidor"
-#: ../../stattrans.pl:647
+#: ../../stattrans.pl:610
msgid "International pages not translated"
msgstr "Internationella sidor som ej översatts"
-#: ../../stattrans.pl:648
+#: ../../stattrans.pl:611
msgid "Untranslated international pages"
msgstr "Ej översatta internationella sidor"
-#: ../../stattrans.pl:653
+#: ../../stattrans.pl:616
msgid "Translated pages (up-to-date)"
msgstr "Översatta sidor (uppdaterade)"
-#: ../../stattrans.pl:660 ../../stattrans.pl:808
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
msgid "Translated templates (PO files)"
msgstr "Översatta mallar (PO-filer)"
-#: ../../stattrans.pl:661 ../../stattrans.pl:811
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
msgid "PO Translation Statistics"
msgstr "Statistik för PO-översättningar"
-#: ../../stattrans.pl:664 ../../stattrans.pl:825
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
msgid "Fuzzy"
msgstr "Luddig"
-#: ../../stattrans.pl:665
+#: ../../stattrans.pl:628
msgid "Untranslated"
msgstr "Ej översatt"
-#: ../../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 "Skapad med"
-#: ../../stattrans.pl:715
+#: ../../stattrans.pl:678
msgid "Translated web pages"
msgstr "Översatta webbsidor"
-#: ../../stattrans.pl:718
+#: ../../stattrans.pl:681
msgid "Translation Statistics by Page Count"
msgstr "Översättningsstatistik efter antal sidor"
-#: ../../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 "Översättningar"
-#: ../../stattrans.pl:761
+#: ../../stattrans.pl:724
msgid "Translated web pages (by size)"
msgstr "Översatta webbsidor (efter storlek)"
-#: ../../stattrans.pl:764
+#: ../../stattrans.pl:727
msgid "Translation Statistics by Page Size"
msgstr "Översättningsstatistik efter sidstorlek"
diff --git a/swedish/po/templates.sv.po b/swedish/po/templates.sv.po
index 4a5d6e6d361..7ecc54b90bd 100644
--- a/swedish/po/templates.sv.po
+++ b/swedish/po/templates.sv.po
@@ -16,6 +16,14 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Debians webbplats"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Sök igenom Debians webbplats"
+
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -38,8 +46,14 @@ msgid "Debian Project"
msgstr "Debianprojektet"
#: ../../english/template/debian/common_translation.wml:13
-msgid "Debian is an operating system and a distribution of Free Software. It is maintained and updated through the work of many users who volunteer their time and effort."
-msgstr "Debian är ett operativsystem och en distribution av fri mjukvara. Det underhålls och uppdateras av frivilliga användare, vilka lägger ner arbete, tid och energi."
+msgid ""
+"Debian is an operating system and a distribution of Free Software. It is "
+"maintained and updated through the work of many users who volunteer their "
+"time and effort."
+msgstr ""
+"Debian är ett operativsystem och en distribution av fri mjukvara. Det "
+"underhålls och uppdateras av frivilliga användare, vilka lägger ner arbete, "
+"tid och energi."
#: ../../english/template/debian/common_translation.wml:16
msgid "debian, GNU, linux, unix, open source, free, DFSG"
@@ -50,7 +64,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "Tillbaka till <a href=\"m4_HOME/\">Debianprojektets ingångssida</a>."
#: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:149
+#: ../../english/template/debian/links.tags.wml:152
msgid "Home"
msgstr "Hem"
@@ -91,7 +105,7 @@ msgid "Support"
msgstr "Support"
#: ../../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 "Utvecklarhörnet"
@@ -128,7 +142,7 @@ msgid "Miscellaneous"
msgstr "Diverse"
#: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:107
msgid "Getting Debian"
msgstr "Få tag på Debian"
@@ -137,8 +151,12 @@ msgid "The Debian Blog"
msgstr "Debianbloggen"
#: ../../english/template/debian/ddp.wml:6
-msgid "Please send all comments, criticisms and suggestions about these web pages to our <a href=\"mailto:debian-doc@lists.debian.org\">mailing list</a>."
-msgstr "Sänd kommentarer, kritik och förslag om dessa webbsidor till vår <a href=\"mailto:debian-doc@lists.debian.org\">sändlista</a>."
+msgid ""
+"Please send all comments, criticisms and suggestions about these web pages "
+"to our <a href=\"mailto:debian-doc@lists.debian.org\">mailing list</a>."
+msgstr ""
+"Sänd kommentarer, kritik och förslag om dessa webbsidor till vår <a href="
+"\"mailto:debian-doc@lists.debian.org\">sändlista</a>."
#: ../../english/template/debian/fixes_link.wml:11
msgid "not needed"
@@ -178,8 +196,20 @@ msgstr "i utgåva 2.2"
#. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
#. your language.
#: ../../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 information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href=\"m4_HOME/devel/website/using_cvs\">available</a>."
-msgstr "För att rapportera ett problem med webbplatsen, kontakta <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</a> (på engelska). Vid problem med och synpunkter på den svenska översättningen, kontakta <a href=\"mailto:debian-l10n-swedish@lists.debian.org\">debian-l10n-swedish@lists.debian.org</a>. För övrig kontaktinformation, se Debians <a href=\"m4_HOME/contact\">kontaktsida</a>. Webbplatsens källkod finns <a href=\"m4_HOME/devel/website/using_cvs\">tillgänglig</a>."
+msgid ""
+"To report a problem with the web site, e-mail <a href=\"mailto:debian-"
+"www@lists.debian.org\">debian-www@lists.debian.org</a>. For other contact "
+"information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>. "
+"Web site source code is <a href=\"m4_HOME/devel/website/using_cvs"
+"\">available</a>."
+msgstr ""
+"För att rapportera ett problem med webbplatsen, kontakta <a href=\"mailto:"
+"debian-www@lists.debian.org\">debian-www@lists.debian.org</a> (på engelska). "
+"Vid problem med och synpunkter på den svenska översättningen, kontakta <a "
+"href=\"mailto:debian-l10n-swedish@lists.debian.org\">debian-l10n-"
+"swedish@lists.debian.org</a>. För övrig kontaktinformation, se Debians <a "
+"href=\"m4_HOME/contact\">kontaktsida</a>. Webbplatsens källkod finns <a href="
+"\"m4_HOME/devel/website/using_cvs\">tillgänglig</a>."
#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
@@ -198,8 +228,12 @@ msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
msgstr "Se <a href=\"m4_HOME/license\" rel=\"copyright\">licensvillkor</a>"
#: ../../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."
-msgstr "Debian är ett registrerat <a href=\"m4_HOME/trademark\">varumärke</a> hos Software in the Public Interest. Inc."
+msgid ""
+"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
+"Software in the Public Interest, Inc."
+msgstr ""
+"Debian är ett registrerat <a href=\"m4_HOME/trademark\">varumärke</a> hos "
+"Software in the Public Interest. Inc."
#: ../../english/template/debian/languages.wml:196
#: ../../english/template/debian/languages.wml:232
@@ -208,7 +242,8 @@ msgstr "Denna sida finns även på följande språk:"
#: ../../english/template/debian/languages.wml:265
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
-msgstr "Så ställer du in <a href=m4_HOME/intro/cn>standardspråkval för dokument</a>"
+msgstr ""
+"Så ställer du in <a href=m4_HOME/intro/cn>standardspråkval för dokument</a>"
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
@@ -255,142 +290,148 @@ msgid "Debian Books"
msgstr "Debianböcker"
#: ../../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 "Sändlistearkiv"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Sändlistor"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Socialt kontrakt"
-#: ../../english/template/debian/links.tags.wml:49
+#: ../../english/template/debian/links.tags.wml:52
msgid "Code of Conduct"
msgstr "Uppförandekod"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:55
msgid "Visit the site sponsor"
msgstr "Besök vår sponsor"
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr "Debian 5.0 - Det universella operativsystemet"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Översikt över Debians webbsidor"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Utvecklardatabas"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:67
msgid "Debian FAQ"
msgstr "Debian FAQ"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Debians policyhandbok"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Utvecklarreferensen"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Nyutvecklarguiden"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Kritiska fel"
-#: ../../english/template/debian/links.tags.wml:79
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Lintianrapporter"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Arkiv för användarsändlistor"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Arkiv för utvecklarsändlistor"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Arkiv for internationaliserings-/landsanpassningssändlistor"
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Arkiv för anpassningssändlistor"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:98
msgid "Archives for mailing lists of the Bug tracking system"
msgstr "Arkiv för sändlistor för felrapporteringssystemet"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Arkiv för blandade sändlistor"
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Fri programvara"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Utveckling"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Hjälp Debian"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Felrapporter"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Anpassningar/arkitekturer"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Installationsguide"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "CD-återförsäljare"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "CD/USB-ISO-avbildningar"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Nätverksinstallation"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Förinstallerat"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Debian-Edu-projektet"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr "Alioth &ndash; Debian GForge"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "Kvalitetskontroll"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Paketspårningssystemet"
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Debianutvecklarnas paketöversikt"
@@ -445,15 +486,24 @@ msgid "<void id=\"doc_for_arch\" />%s for %s"
msgstr "<void id=\"doc_for_arch\" />%s för %s"
#: ../../english/template/debian/translation-check.wml:37
-msgid "<em>Note:</em> The <a href=\"$link\">original document</a> is newer than this translation."
-msgstr "<em>Observera:</em> <a href=\"$link\">Originalet</a> är nyare än denna översättning."
+msgid ""
+"<em>Note:</em> The <a href=\"$link\">original document</a> is newer than "
+"this translation."
+msgstr ""
+"<em>Observera:</em> <a href=\"$link\">Originalet</a> är nyare än denna "
+"översättning."
#: ../../english/template/debian/translation-check.wml:43
-msgid "Warning! This translation is too out of date, please see the <a href=\"$link\">original</a>."
-msgstr "Varning! Den här översättningen är för gammal, vänligen se <a href=\"$link\">originalet</a>."
+msgid ""
+"Warning! This translation is too out of date, please see the <a href=\"$link"
+"\">original</a>."
+msgstr ""
+"Varning! Den här översättningen är för gammal, vänligen se <a href=\"$link"
+"\">originalet</a>."
#: ../../english/template/debian/translation-check.wml:49
-msgid "<em>Note:</em> The original document of this translation no longer exists."
+msgid ""
+"<em>Note:</em> The original document of this translation no longer exists."
msgstr "<em>Observera:</em> Originalet existerar inte längre."
#: ../../english/template/debian/url.wml:4
@@ -463,12 +513,3 @@ msgstr "Webbadress"
#: ../../english/template/debian/users.wml:7
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Åter till <a href=\"./\">Vem använder Debian?</a>"
-
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Debians webbplats"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Sök igenom Debians webbplats"
-
diff --git a/swedish/po/vendors.sv.po b/swedish/po/vendors.sv.po
index 36d82990303..4cce0b65227 100644
--- a/swedish/po/vendors.sv.po
+++ b/swedish/po/vendors.sv.po
@@ -9,137 +9,130 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Distributör:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "Webbadress för Debiansida:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Tillåter bidrag till Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Land:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Levererar internationellt:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "E-post:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Typ av cd:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Typ av dvd:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Arkitekturer:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "Distributör"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Tillåter 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 "Levererar internationellt"
-#: ../../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 "Hemsida för distributör"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "sida"
-#: ../../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 "inom Europa"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "inom vissa områden"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "källkod"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "och"
-#~ msgid "Official CD"
-#~ msgstr "Officiell cd"
+#~ msgid "updated monthly"
+#~ msgstr "uppdateras månadsvis"
-#~ msgid "Official DVD"
-#~ msgstr "Officiell dvd"
+#~ msgid "updated twice weekly"
+#~ msgstr "uppdateras två gånger i veckan"
-#~ msgid "Development Snapshot"
-#~ msgstr "Utvecklarversion"
+#~ msgid "updated weekly"
+#~ msgstr "uppdateras veckovis"
-#~ msgid "Vendor Release"
-#~ msgstr "Distributörspecifik version"
+#~ msgid "reseller"
+#~ msgstr "återförsäljare"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Samdistribuerad"
+#~ msgid "reseller of $var"
+#~ msgstr "återförsäljare för $var"
-#~ msgid "non-US included"
-#~ msgstr "inkluderar non-US-delen"
+#~ msgid "Custom Release"
+#~ msgstr "Specialgjord version"
-#~ msgid "non-free included"
-#~ msgstr "inkluderar non-free-delen"
+#~ msgid "vendor additions"
+#~ msgstr "distributörtillägg"
#~ msgid "contrib included"
#~ msgstr "inkluderar contrib-delen"
-#~ msgid "vendor additions"
-#~ msgstr "distributörtillägg"
+#~ msgid "non-free included"
+#~ msgstr "inkluderar non-free-delen"
-#~ msgid "Custom Release"
-#~ msgstr "Specialgjord version"
+#~ msgid "non-US included"
+#~ msgstr "inkluderar non-US-delen"
-#~ msgid "reseller of $var"
-#~ msgstr "återförsäljare för $var"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Samdistribuerad"
-#~ msgid "reseller"
-#~ msgstr "återförsäljare"
+#~ msgid "Vendor Release"
+#~ msgstr "Distributörspecifik version"
-#~ msgid "updated weekly"
-#~ msgstr "uppdateras veckovis"
+#~ msgid "Development Snapshot"
+#~ msgstr "Utvecklarversion"
-#~ msgid "updated twice weekly"
-#~ msgstr "uppdateras två gånger i veckan"
+#~ msgid "Official DVD"
+#~ msgstr "Officiell dvd"
-#~ msgid "updated monthly"
-#~ msgstr "uppdateras månadsvis"
+#~ msgid "Official CD"
+#~ msgstr "Officiell cd"
+
+#~ msgid "Architectures:"
+#~ msgstr "Arkitekturer:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Typ av dvd:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Typ av cd:"
+
+#~ msgid "email:"
+#~ msgstr "E-post:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Levererar internationellt:"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Tillåter bidrag till Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Webbadress för Debiansida:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Distributör:"
diff --git a/swedish/po/vote.sv.po b/swedish/po/vote.sv.po
index bf800a8347c..acf5464afa1 100644
--- a/swedish/po/vote.sv.po
+++ b/swedish/po/vote.sv.po
@@ -21,229 +21,251 @@ msgid "Time Line"
msgstr "Tidslinje"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "Nomineringar"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "Debatt"
-#: ../../english/template/debian/votebar.wml:25
+#: ../../english/template/debian/votebar.wml:28
msgid "Platforms"
msgstr "Plattformar"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Proposer"
msgstr "Föreslaget av"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposal A Proposer"
msgstr "Förslag A föreslaget av"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal B Proposer"
msgstr "Förslag B föreslaget av"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal C Proposer"
msgstr "Förslag C föreslaget av"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal D Proposer"
msgstr "Förslag D föreslaget av"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal E Proposer"
msgstr "Förslag E föreslaget av"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal F Proposer"
msgstr "Förslag F föreslaget av"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Seconds"
msgstr "Sekunderingar"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
msgid "Proposal A Seconds"
msgstr "Sekunderingar av förslag A"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:58
msgid "Proposal B Seconds"
msgstr "Sekunderingar av förslag B"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:61
msgid "Proposal C Seconds"
msgstr "Sekunderingar av förslag C"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal D Seconds"
msgstr "Sekunderingar av förslag D"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal E Seconds"
msgstr "Sekunderingar av förslag E"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal F Seconds"
msgstr "Sekunderingar av förslag F"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:73
msgid "Opposition"
msgstr "Opponenter"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:76
msgid "Text"
msgstr "Text"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal A"
msgstr "Förslag A"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:82
msgid "Proposal B"
msgstr "Förslag B"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:85
msgid "Proposal C"
msgstr "Förslag C"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:88
msgid "Proposal D"
msgstr "Förslag D"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:91
msgid "Proposal E"
msgstr "Förslag E"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal F"
msgstr "Förslag F"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:97
msgid "Choices"
msgstr "Alternativ"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:100
msgid "Amendment Proposer"
msgstr "Ändringar föreslagna av"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:103
msgid "Amendment Seconds"
msgstr "Sekunderingar av ändringar"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:106
msgid "Amendment Text"
msgstr "Text för ändringar"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:109
msgid "Amendment Proposer A"
msgstr "Ändring A föreslagen av"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:112
msgid "Amendment Seconds A"
msgstr "Ändring A sekunderas av"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:115
msgid "Amendment Text A"
msgstr "Text för ändring A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:118
msgid "Amendment Proposer B"
msgstr "Ändring B föreslagen av"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Seconds B"
msgstr "Ändring B sekunderas av"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Text B"
msgstr "Text för ändring B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:127
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "Ändring A föreslagen av"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "Ändring A sekunderas av"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+msgid "Amendment Text C"
+msgstr "Text för ändring A"
+
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendments"
msgstr "Ändringar"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:139
msgid "Proceedings"
msgstr "Protokoll"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:142
msgid "Majority Requirement"
msgstr "Majoritetskrav"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:145
msgid "Data and Statistics"
msgstr "Data och statistik"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:148
msgid "Quorum"
msgstr "Beslutsmässigt antal"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:151
msgid "Minimum Discussion"
msgstr "Minsta diskussion"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:154
msgid "Ballot"
msgstr "Röstsedel"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:157
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:160
msgid "Outcome"
msgstr "Resultat"
-#: ../../english/template/debian/votebar.wml:152
+#: ../../english/template/debian/votebar.wml:164
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Väntar&nbsp;på&nbsp;sponsor"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Under&nbsp;diskussion"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Röstning&nbsp;pågår"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Beslutade"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Tillbakadragna"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Annat"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Hem&nbsp;-&nbsp;Röstningssida"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Hur&nbsp;man..."
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Avger&nbsp;förslag"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Ändrar&nbsp;förslag"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Följer&nbsp;förslag"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Läser&nbsp;resultat"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Röstar"
diff --git a/tamil/po/bugs.ta.po b/tamil/po/bugs.ta.po
index e3ec8da3cb9..70189c3ec38 100644
--- a/tamil/po/bugs.ta.po
+++ b/tamil/po/bugs.ta.po
@@ -170,152 +170,152 @@ msgstr "களையப் பட்ட வழுக்கள்"
msgid "Archived and Unarchived"
msgstr ""
-#~ msgid "Exclude tag:"
-#~ msgstr "விலக்குவதற்கான அடைகுறி:"
-
-#~ msgid "Include tag:"
-#~ msgstr "சேர்ப்பதற்கான அடைகுறி: "
+#~ msgid "Flags:"
+#~ msgstr "குறிகள்:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "களையப்படா வழுக்கள்"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "ஒன்றிணைக்கப்பட்ட பிழைகளை ஒரு முறை மட்டும் காட்டுக"
-#~ msgid "wontfix"
-#~ msgstr "தீர்க்கப்படாத"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "நிலை மற்றும் முன்னுரிமை வாரியாக வரிசைப் படுத்துவது இல்லை"
-#~ msgid "upstream"
-#~ msgstr "மூலவிடம்"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "தலைகுறிப்பில்பில் அட்டவணையைக் காட்டாதே"
-#~ msgid "unreproducible"
-#~ msgstr "மீட்கவியலாது"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "அடிக்குறிப்பில் புள்ளிவிவரங்களைக் காட்டாதே"
-#~ msgid "security"
-#~ msgstr "அரண்"
+#~ msgid "proposed-updates"
+#~ msgstr "பரிந்துரைக்கப்பட்ப புதுமைகள்"
-#~ msgid "patch"
-#~ msgstr "தீர்வை"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "சோதனையின் போது பரிந்துரைக்கப்பட்ட புதியவை"
-#~ msgid "moreinfo"
-#~ msgstr "மேலும் தகவலுக்கு"
+#~ msgid "Package version:"
+#~ msgstr "பொதி வெளியீடு:"
-#~ msgid "l10n"
-#~ msgstr "தன்மொழியாக்கம்"
+#~ msgid "Distribution:"
+#~ msgstr "வழங்கல்:"
-#~ msgid "help"
-#~ msgstr "உதவி"
+#~ msgid "bugs"
+#~ msgstr "வழுக்கள்"
-#~ msgid "fixed-upstream"
-#~ msgstr "மூலவிடத்தில் சரிசெய்யபட்டது"
+#~ msgid "open"
+#~ msgstr "திறக்க"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "சோதனை வெளியீட்டில் சரிசெய்யப் பட்டது"
+#~ msgid "forwarded"
+#~ msgstr "வழியனுப்பபட்ட"
-#~ msgid "d-i"
-#~ msgstr "டெ-நி"
+#~ msgid "pending"
+#~ msgstr "மீதமுள்ள"
-#~ msgid "confirmed"
-#~ msgstr "உறுதிசெய்யப்பட்ட"
+#~ msgid "fixed"
+#~ msgstr "களையப்பட்ட"
-#~ msgid "sid"
-#~ msgstr "சிட்"
+#~ msgid "done"
+#~ msgstr "பூர்த்திசெய்யப்பட்ட"
-#~ msgid "lenny-ignore"
-#~ msgstr "லென்னி-தவிர்"
+#~ msgid "Include status:"
+#~ msgstr "நிலைமையை உள்ளடக்குக:"
-#~ msgid "lenny"
-#~ msgstr "லென்னி"
+#~ msgid "Exclude status:"
+#~ msgstr "நிலைமையை உள்ளடக்க வேண்டா:"
-#~ msgid "etch-ignore"
-#~ msgstr "எட்ச்-தவிர்"
+#~ msgid "critical"
+#~ msgstr "அவசியமான"
-#~ msgid "etch"
-#~ msgstr "எட்ச்"
+#~ msgid "grave"
+#~ msgstr "அத்தியாவசியமான"
-#~ msgid "sarge-ignore"
-#~ msgstr "சார்ஜ்-தவிர்"
+#~ msgid "serious"
+#~ msgstr "அதிமுக்கியமான"
-#~ msgid "woody"
-#~ msgstr "ஊடி"
+#~ msgid "important"
+#~ msgstr "முக்கியமாக"
-#~ msgid "potato"
-#~ msgstr "பொடேடோ"
+#~ msgid "minor"
+#~ msgstr "சிறிய"
-#~ msgid "Exclude severity:"
-#~ msgstr "முன்னுரிமையை விலக்குக:"
+#~ msgid "wishlist"
+#~ msgstr "அவாப்பட்டியல்"
#~ msgid "Include severity:"
#~ msgstr "முன்னுரிமையை சேர்க்க:"
-#~ msgid "wishlist"
-#~ msgstr "அவாப்பட்டியல்"
+#~ msgid "Exclude severity:"
+#~ msgstr "முன்னுரிமையை விலக்குக:"
-#~ msgid "minor"
-#~ msgstr "சிறிய"
+#~ msgid "potato"
+#~ msgstr "பொடேடோ"
-#~ msgid "important"
-#~ msgstr "முக்கியமாக"
+#~ msgid "woody"
+#~ msgstr "ஊடி"
-#~ msgid "serious"
-#~ msgstr "அதிமுக்கியமான"
+#~ msgid "sarge-ignore"
+#~ msgstr "சார்ஜ்-தவிர்"
-#~ msgid "grave"
-#~ msgstr "அத்தியாவசியமான"
+#~ msgid "etch"
+#~ msgstr "எட்ச்"
-#~ msgid "critical"
-#~ msgstr "அவசியமான"
+#~ msgid "etch-ignore"
+#~ msgstr "எட்ச்-தவிர்"
-#~ msgid "Exclude status:"
-#~ msgstr "நிலைமையை உள்ளடக்க வேண்டா:"
+#~ msgid "lenny"
+#~ msgstr "லென்னி"
-#~ msgid "Include status:"
-#~ msgstr "நிலைமையை உள்ளடக்குக:"
+#~ msgid "lenny-ignore"
+#~ msgstr "லென்னி-தவிர்"
-#~ msgid "done"
-#~ msgstr "பூர்த்திசெய்யப்பட்ட"
+#~ msgid "sid"
+#~ msgstr "சிட்"
-#~ msgid "fixed"
-#~ msgstr "களையப்பட்ட"
+#~ msgid "confirmed"
+#~ msgstr "உறுதிசெய்யப்பட்ட"
-#~ msgid "pending"
-#~ msgstr "மீதமுள்ள"
+#~ msgid "d-i"
+#~ msgstr "டெ-நி"
-#~ msgid "forwarded"
-#~ msgstr "வழியனுப்பபட்ட"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "சோதனை வெளியீட்டில் சரிசெய்யப் பட்டது"
-#~ msgid "open"
-#~ msgstr "திறக்க"
+#~ msgid "fixed-upstream"
+#~ msgstr "மூலவிடத்தில் சரிசெய்யபட்டது"
-#~ msgid "bugs"
-#~ msgstr "வழுக்கள்"
+#~ msgid "help"
+#~ msgstr "உதவி"
-#~ msgid "Distribution:"
-#~ msgstr "வழங்கல்:"
+#~ msgid "l10n"
+#~ msgstr "தன்மொழியாக்கம்"
-#~ msgid "Package version:"
-#~ msgstr "பொதி வெளியீடு:"
+#~ msgid "moreinfo"
+#~ msgstr "மேலும் தகவலுக்கு"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "சோதனையின் போது பரிந்துரைக்கப்பட்ட புதியவை"
+#~ msgid "patch"
+#~ msgstr "தீர்வை"
-#~ msgid "proposed-updates"
-#~ msgstr "பரிந்துரைக்கப்பட்ப புதுமைகள்"
+#~ msgid "security"
+#~ msgstr "அரண்"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "அடிக்குறிப்பில் புள்ளிவிவரங்களைக் காட்டாதே"
+#~ msgid "unreproducible"
+#~ msgstr "மீட்கவியலாது"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "தலைகுறிப்பில்பில் அட்டவணையைக் காட்டாதே"
+#~ msgid "upstream"
+#~ msgstr "மூலவிடம்"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "நிலை மற்றும் முன்னுரிமை வாரியாக வரிசைப் படுத்துவது இல்லை"
+#~ msgid "wontfix"
+#~ msgstr "தீர்க்கப்படாத"
-#~ msgid "display merged bugs only once"
-#~ msgstr "ஒன்றிணைக்கப்பட்ட பிழைகளை ஒரு முறை மட்டும் காட்டுக"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "களையப்படா வழுக்கள்"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "குறிகள்:"
+#~ msgid "Include tag:"
+#~ msgstr "சேர்ப்பதற்கான அடைகுறி: "
+
+#~ msgid "Exclude tag:"
+#~ msgstr "விலக்குவதற்கான அடைகுறி:"
diff --git a/tamil/po/cdimage.ta.po b/tamil/po/cdimage.ta.po
index dee965e0ef6..aae474c986a 100644
--- a/tamil/po/cdimage.ta.po
+++ b/tamil/po/cdimage.ta.po
@@ -17,18 +17,16 @@ msgstr ""
"X-Generator: KBabel 1.11.4\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 " Key fingerprint"
-#: ../../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/tamil/po/distrib.ta.po b/tamil/po/distrib.ta.po
index f2ece5489ad..6ed135e93a3 100644
--- a/tamil/po/distrib.ta.po
+++ b/tamil/po/distrib.ta.po
@@ -132,73 +132,81 @@ msgid "ARM"
msgstr "ஏஆர்எம்"
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
+msgid "Hard Float ABI ARM"
+msgstr ""
+
+#: ../../english/releases/arches.data:14
#, fuzzy
#| msgid "HP PA/RISC"
msgid "HP PA-RISC"
msgstr "ஹச் பிஏ/ரிஸ்க்"
-#: ../../english/releases/arches.data:14
+#: ../../english/releases/arches.data:15
#, fuzzy
#| msgid "Hurd (i386)"
msgid "Hurd 32-bit PC (i386)"
msgstr "ஹர்ட் (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:16
+#: ../../english/releases/arches.data:17
#, fuzzy
#| msgid "Intel IA-64"
msgid "Intel Itanium IA-64"
msgstr "இன்டல் ஜஏ-64"
-#: ../../english/releases/arches.data:17
+#: ../../english/releases/arches.data:18
msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
-#: ../../english/releases/arches.data:19
+#: ../../english/releases/arches.data:20
msgid "Motorola 680x0"
msgstr "மோடரோலா 680x0"
-#: ../../english/releases/arches.data:20
+#: ../../english/releases/arches.data:21
msgid "MIPS (big endian)"
msgstr "மிப்ஸ் (பெரிய என்டியன்)"
-#: ../../english/releases/arches.data:21
+#: ../../english/releases/arches.data:22
msgid "MIPS (little endian)"
msgstr "மிபஸ் (சிறிய என்டியன்)"
-#: ../../english/releases/arches.data:22
+#: ../../english/releases/arches.data:23
msgid "PowerPC"
msgstr "பவர்பிசி"
-#: ../../english/releases/arches.data:23
+#: ../../english/releases/arches.data:24
+msgid "POWER Processors"
+msgstr ""
+
+#: ../../english/releases/arches.data:25
msgid "IBM S/390"
msgstr "ஐபிஎம் 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 "ஸ்பார்க்"
-#~ msgid "AMD64"
-#~ msgstr "ஏஎம்டி64"
-
#~ msgid "Intel x86"
#~ msgstr "இன்டல் எக்ஸ்86"
+
+#~ msgid "AMD64"
+#~ msgstr "ஏஎம்டி64"
diff --git a/tamil/po/doc.ta.po b/tamil/po/doc.ta.po
index 67564c48eeb..db68431d264 100644
--- a/tamil/po/doc.ta.po
+++ b/tamil/po/doc.ta.po
@@ -12,7 +12,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\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"
@@ -27,7 +44,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"
@@ -36,15 +53,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"
@@ -53,13 +70,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"
@@ -74,7 +91,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 -- "
@@ -84,11 +101,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, "
@@ -108,7 +125,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"
@@ -116,11 +133,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"
@@ -128,11 +145,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"
@@ -144,24 +161,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 "
@@ -170,13 +190,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"
@@ -192,24 +212,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"
@@ -220,11 +240,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"
@@ -234,11 +254,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 "
@@ -249,11 +269,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"
@@ -263,11 +283,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"
@@ -275,7 +295,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 "
@@ -291,7 +311,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 "
@@ -321,53 +341,73 @@ msgstr "வட்டு உள்ளடக்கப்பட்டது:"
msgid "Publisher:"
msgstr "பதிப்பித்தவர்:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "இயற்றியோர்:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "தொகுத்தோர்:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "பராமரிப்பாளர்:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "நிலை:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "கிடைக்கக்கூடியதா:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "அண்மைய வெளியீடு:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(வெளியீடு <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 "வெற்று உரை"
-#. 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
-#, fuzzy
-#| msgid ""
-#| "Use <a href=\"cvs\">CVS</a> to download the SGML source text for <get-var "
-#| "ddp_pkg_loc />."
+#: ../../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 ""
-"<a href=\"cvs\">சிவிஎஸ்</a> பயன்படுத்தி <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"
@@ -377,27 +417,38 @@ msgstr ""
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" and check out the <kbd>boot-floppies/documentation</kbd> module."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "இணைய வழி சிவிஎஸ்"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "டெபியன் பொதி"
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
#, fuzzy
#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "டெபியன் பொதி"
-#: ../../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 "மொழி:"
+
+#, fuzzy
+#~| msgid ""
+#~| "Use <a href=\"cvs\">CVS</a> to download the SGML source text for <get-"
+#~| "var ddp_pkg_loc />."
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "<a href=\"cvs\">சிவிஎஸ்</a> பயன்படுத்தி <get-var ddp_pkg_loc /> க்கான "
+#~ "எஸ்ஜிஎம்எல் மூல் உரைகளை பதிவிறக்குக. "
diff --git a/tamil/po/mailinglists.ta.po b/tamil/po/mailinglists.ta.po
index 2d719558162..327d26341c4 100644
--- a/tamil/po/mailinglists.ta.po
+++ b/tamil/po/mailinglists.ta.po
@@ -121,8 +121,8 @@ msgstr "திறக்க"
msgid "closed"
msgstr "மூடுகக்க"
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "தாங்கள் விலக விரும்மும் மடலாடற் குழுக்களைத் தேர்வு செய்க:"
-
#~ msgid "Please select which lists you want to subscribe to:"
#~ msgstr "தாங்கள் சேர விழையும் மடலாடற் குழுக்களை தேர்வு செய்க:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "தாங்கள் விலக விரும்மும் மடலாடற் குழுக்களைத் தேர்வு செய்க:"
diff --git a/tamil/po/newsevents.ta.po b/tamil/po/newsevents.ta.po
index 419216499fd..77a475e3510 100644
--- a/tamil/po/newsevents.ta.po
+++ b/tamil/po/newsevents.ta.po
@@ -34,27 +34,27 @@ msgstr "p<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 "பெயர்:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "மின்னஞ்சல்:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "முந்தையப் பேச்சுகள்:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "மொழிகள்:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "இடம்:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "தலைப்புகள்:"
@@ -346,11 +346,12 @@ 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>."
+#| "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 ""
"இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian.org/"
"debian-news/\">டெபியன்செய்தி மடலாடற் குழுவில் இணையவும்</a>."
@@ -491,3 +492,16 @@ msgid ""
msgstr ""
"<void id=\"plural\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
"dwn@debian.org\">%s</a>."
+
+#, 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>."
+#~ msgstr ""
+#~ "இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian."
+#~ "org/debian-news/\">டெபியன்செய்தி மடலாடற் குழுவில் இணையவும்</a>."
diff --git a/tamil/po/organization.ta.po b/tamil/po/organization.ta.po
index 4e0aacd3a0d..cd1b361043e 100644
--- a/tamil/po/organization.ta.po
+++ b/tamil/po/organization.ta.po
@@ -80,7 +80,7 @@ msgid "Officers"
msgstr "அலுவலர்கள்"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "வழங்கல்"
@@ -90,11 +90,11 @@ msgid "Publicity"
msgstr "விளம்பரம்"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "ஆதரவும் கட்டமைப்பும்"
-#. 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 ""
@@ -107,109 +107,109 @@ msgstr "அணித்தலைவர்"
msgid "Technical Committee"
msgstr "தொழில்நுட்பக் குழு"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "செயலர்"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "உருவாக்கத் திட்டங்கள்"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "கோபநெ பெட்டகம்"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "கோபநெ முதல்வர்"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "கோபநெ துணைவோர்"
-#: ../../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 "தனிப்பட்ட பொதிகள்"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "வெளியீடு நிர்வாகம்"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "வெளியீட்டுக் குறிப்புகள்"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "தர உத்தரவாதம்"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "நிறுவலுக்கான குழுமம்"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "வெளியீட்டுக் குறிப்புகள்"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "குறு வட்டு பிம்பங்கள்"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "உருவாக்கம்"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "சோதனை"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "ஆதரவும் கட்டமைப்பும்"
-#: ../../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
#, fuzzy
#| msgid "Buildd Administration"
msgid "Buildd administration"
msgstr "சமை நிர்வாகம்"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "ஆவணமாக்கம்"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "பணித்-தேவைப் படுபவை மற்றும் வாய்ப்புள்ள பொதிகளின் பட்டியல்"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
#, fuzzy
#| msgid "Installation System Team"
msgid "Live System Team"
msgstr "நிறுவலுக்கான குழுமம்"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "துறைகள்"
@@ -237,83 +237,73 @@ msgstr "பத்திரிக்கை தொடர்பு"
msgid "Partner Program"
msgstr "பங்குதாரர் திட்டம்"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "சம்பவங்கள்"
-#: ../../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 "பயனர் ஆதரவு"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "வழுக் கண்காணிப்பு அமைப்பு"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "மடலாடற் குழு நிர்வாகம் மற்றும் மடலாடற் குழு பெட்டகம்"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "புதிய பராமமரிப்பாளர்கள் முன்னணி"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "டெபியன் கணக்கு மேலாளர்கள்"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "துருப்பு பராமரிப்பாளர்கள் (பிஜிபி மற்றும் ஜிபிஜி)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "பாதுகாப்புக் குழு"
-#: ../../english/intro/organization.data:360
-#, fuzzy
-#| msgid "Security Team"
-msgid "Testing Security Team"
-msgstr "பாதுகாப்புக் குழு"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "பாதுகாப்பு தணிக்கைத் திட்டம்"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "இணையப் பக்கங்கள்"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "ஆலோசகர் பக்கம்"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "வட்டு வழங்குவோர் பக்கம்"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "கொள்கை"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "அமைப்பு நிர்வாகம்"
-#: ../../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."
@@ -321,7 +311,7 @@ msgstr ""
"ஏதெனுமொரு டெபியன் இயந்திரத்தில், கடவுச்சொல் உள்ளிட்ட கோளாறு ஏற்படின் பயன்படுத்தப் பட "
"வேண்டிய முகவரி இது. இல்லையெனில் தாங்கள் நிறுவிட பொதியொன்றுத் தேவைப் படுகிறது. "
-#: ../../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 "
@@ -331,111 +321,107 @@ msgstr ""
"machines.cgi\">டெபியன் இயந்திரங்கள்</a> பக்கத்தினை அணுகவும், பிரதி இயந்திரத்துக்கான "
"நிர்வாகத் தகவலை அது கொண்டிருக்கலாம்."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP உருவாக்குநர் அடைவு நிர்வாகி"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "பிம்பங்கள்"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "DNS பராமரிப்பாளர்"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "பொதி கண்காணிப்பு அமைப்பு"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "வன்பொருள் தான ஒருங்கிணைப்பு"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "அலியோத் நிர்வாகிகள்"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "பெண்களுக்கான டெபியன் திட்டம்"
-#: ../../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 "1 முதல் 99 வரைக் குழந்தைகளுக்கான டெபியன்"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "மருத்துவப் பழகலுக்கும் ஆராய்ச்சிக்கும் டெபியன்"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "கல்விக்கான டெபியன்"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "சட்ட அலுவலகங்களில் டெபியன்"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "ஊனமுற்றோருக்கான டெபியன்"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "மருத்துவப் பழகலுக்கும் ஆராய்ச்சிக்கும் டெபியன்"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "இது முறையான டெபியன் திட்டமல்ல. ஆனால் அது ஒருங்கிணைக்கப் படுவதற்கான நோக்கம் "
-#~ "அறிவிக்கப்பட்டுள்ளதுதப் பட்டுள்ளது."
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "தனிப்பட்ட டெபியன் வழங்கல்கள்"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "டெபியன் பல்லூடக வழங்கல்"
+#~ msgid "Release Managers for ``stable''"
+#~ msgstr "\"நிலையானவை\" க்கான வெளியீட்டு மேலாளர்"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "இலாப நோக்கற்ற நிறுவனங்களுக்கான டெபியன்"
+#~ msgid "Release Assistants"
+#~ msgstr "வெளியீட்டு உதவியாளர்கள்"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "அகிலத்துக்குமான இயங்கு தளம்"
+#~ msgid "Release Assistants for ``stable''"
+#~ msgstr "``நிலையானவைக்கான'' வெளியீட்டு உதவியாளர்கள்"
-#~ msgid "Accountant"
-#~ msgstr "கணக்காளர்"
+#~ msgid "Release Wizard"
+#~ msgstr "வெளியீட்டு பலகை"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "துருப்பு ஒப்புமை ஒருங்கிணைப்பு"
+#~ msgid "Vendors"
+#~ msgstr "வழங்குவோர்"
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "தனிப்பட்ட சமைப்புக்கான நிர்வாகியின் பெயரை <a href=\"http://www.buildd.net"
-#~ "\">http://www.buildd.net</a> முகவரியில் காணலாம். கட்டமைப்பு ஒன்றையும் "
-#~ "வழங்கலொன்றையும் தேர்வு செய்து கிடைக்கக் கூடிய சமைப்புகளையும் அவற்றின் நிர்வாகிகளையும் "
-#~ "காணலாம்."
+#~ msgid "APT Team"
+#~ msgstr "ஏபிடி குழு"
+
+#~ msgid "Handhelds"
+#~ msgstr "கையடக்க"
+
+#~ msgid "Security Testing Team"
+#~ msgstr "பாதுகாப்புச் சோதனைக் குழு"
#~ msgid ""
#~ "The admins responsible for buildd's for a particular arch can be reached "
@@ -446,29 +432,42 @@ msgstr "மருத்துவப் பழகலுக்கும் ஆர
#~ "arch@buildd.debian.org> முகவரியில் தொடர்புக் கொள்ளலாம். உதாரணம் <genericemail "
#~ "i386@buildd.debian.org>."
-#~ msgid "Security Testing Team"
-#~ msgstr "பாதுகாப்புச் சோதனைக் குழு"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>. Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "தனிப்பட்ட சமைப்புக்கான நிர்வாகியின் பெயரை <a href=\"http://www.buildd.net"
+#~ "\">http://www.buildd.net</a> முகவரியில் காணலாம். கட்டமைப்பு ஒன்றையும் "
+#~ "வழங்கலொன்றையும் தேர்வு செய்து கிடைக்கக் கூடிய சமைப்புகளையும் அவற்றின் நிர்வாகிகளையும் "
+#~ "காணலாம்."
-#~ msgid "Handhelds"
-#~ msgstr "கையடக்க"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "துருப்பு ஒப்புமை ஒருங்கிணைப்பு"
-#~ msgid "APT Team"
-#~ msgstr "ஏபிடி குழு"
+#~ msgid "Accountant"
+#~ msgstr "கணக்காளர்"
-#~ msgid "Vendors"
-#~ msgstr "வழங்குவோர்"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "அகிலத்துக்குமான இயங்கு தளம்"
-#~ msgid "Release Wizard"
-#~ msgstr "வெளியீட்டு பலகை"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "இலாப நோக்கற்ற நிறுவனங்களுக்கான டெபியன்"
-#~ msgid "Release Assistants for ``stable''"
-#~ msgstr "``நிலையானவைக்கான'' வெளியீட்டு உதவியாளர்கள்"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "டெபியன் பல்லூடக வழங்கல்"
-#~ msgid "Release Assistants"
-#~ msgstr "வெளியீட்டு உதவியாளர்கள்"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "இது முறையான டெபியன் திட்டமல்ல. ஆனால் அது ஒருங்கிணைக்கப் படுவதற்கான நோக்கம் "
+#~ "அறிவிக்கப்பட்டுள்ளதுதப் பட்டுள்ளது."
-#~ msgid "Release Managers for ``stable''"
-#~ msgstr "\"நிலையானவை\" க்கான வெளியீட்டு மேலாளர்"
+#~ msgid "Security Audit Project"
+#~ msgstr "பாதுகாப்பு தணிக்கைத் திட்டம்"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "தனிப்பட்ட டெபியன் வழங்கல்கள்"
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "பாதுகாப்புக் குழு"
diff --git a/tamil/po/others.ta.po b/tamil/po/others.ta.po
index 015cd10cbec..538c1779bf0 100755
--- a/tamil/po/others.ta.po
+++ b/tamil/po/others.ta.po
@@ -174,26 +174,6 @@ msgstr "[டெபியன்] (குட்டி மென்மேடு)"
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "தேவை:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "யார்:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "கட்டமைப்பு:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "தேவைக்குறிப்புகள்:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "எங்கே:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "பொருட்கள்"
@@ -238,24 +218,36 @@ msgstr "அடையாள அட்டைகள்"
msgid "basketball goals"
msgstr "கூடைப் பந்து இலக்குகள்"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "காதணி"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "பெட்டிகள்"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
#, fuzzy
#| msgid "suitcases"
msgid "pillowcases"
msgstr "பெட்டிகள்"
+#: ../../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 ""
@@ -331,129 +323,144 @@ msgstr "வெளியீடு"
msgid "URL"
msgstr "URL"
-#~ msgid "Name:"
-#~ msgstr "பெயர்:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
-#~ msgid "Company:"
-#~ msgstr "நிறுவனம்:"
+#~ msgid "Previous Talks:"
+#~ msgstr "முந்தையப் பேச்சுகள்:"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Languages:"
+#~ msgstr "மொழிகள்:"
-#~ msgid "or"
-#~ msgstr "அல்லது"
+#~ msgid "Location:"
+#~ msgstr "இடம்:"
-#~ msgid "Email:"
-#~ msgstr "மின்னஞ்சல்:"
+#~ msgid "Topics:"
+#~ msgstr "தலைப்புகள்:"
-#~ msgid "Rates:"
-#~ msgstr "விலை:"
+#~ msgid "closed"
+#~ msgstr "மூடுகக்க"
-#~ msgid "Willing to Relocate"
-#~ msgstr "இருப்பிடத்தை மாற்றிக் கொள்ள விருப்பம்"
+#~ msgid "open"
+#~ msgstr "திறக்க"
-#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
-#~ msgstr ""
-#~ "அகிலமனைத்திலும் உள்ள <total_consultant> டெபியன் ஆலோசகர்கள் பட்டியல் "
-#~ "<total_country>."
+#~ msgid "Unsubscribe"
+#~ msgstr "விலகுக"
-#~ msgid "Mailing List Subscription"
-#~ msgstr "மடலாடற் குழுவில் இணைய"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "தாங்கள் விலக விரும்மும் மடலாடற் குழுக்களைத் தேர்வு செய்க:"
#~ 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 ""
-#~ "மின்னஞ்சல் தந்து இணைவது குறித்து அறிய <a href=\"./#subunsub\">மடலாடற் குழு</a> "
-#~ "பக்கத்தைப் பார்க்க. <a href=\"unsubscribe\">விலகுவதற்கான இணைய படிவமும்</a> "
-#~ "உள்ளது. "
+#~ "மின்னஞ்சல் துணைக் கொண்டு விலகுவது எப்படி எனபது குறித்து அறிய <a href=\"./"
+#~ "#subunsub\">மடலாடற் குழுக்களின்</a> பக்கத்தினைப் பார்க்கவும். சேரும் பொருட்டு<a href="
+#~ "\"subscribe\">சேர்வதற்கான இணைய படிவம்</a> ஒன்றும் கிடைக்கிறது."
+
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "மடலாடற் குழுவிலிருந்து விலக"
#~ msgid ""
-#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
-#~ "them will be published in public mailing list archives and indexed by "
-#~ "search engines. You should only subscribe to Debian mailing lists using "
-#~ "an e-mail address that you do not mind being made public."
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "டெபியனின் மடலாடற் குழுக்கள் பொது மேடையாகும். அவற்றுக்கு அனுப்பப்படும் எந்தவொரு மடலும் "
-#~ "பொது பெட்டகங்களில் பதிப்பிக்கப்பட்டு தேடு பொறிகளால் வரிசைப் படுத்தப்படும். டெபியன் "
-#~ "மடலாடற் குழுக்களில் பொதுப் பார்வையில் இடத்தக்கதாக தாங்கள் கருதும் மடல் முகவரியினைக் "
-#~ "கொண்டு சேரவும்."
+#~ "<a href=\"./#ads\">டெபியன் மடலாடற் குழு விளம்பரக் கொள்கையை</a> மதித்தொழுகவும்."
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "தாங்கள் சேர விழையும் மடலாடற் குழுக்களை தேர்வு செய்க:"
+#~ msgid "Clear"
+#~ msgstr "துடைக்க"
-#~ msgid "No description given"
-#~ msgstr "விவரமளிக்கப் படவில்லை"
+#~ msgid "Subscribe"
+#~ msgstr "சேருக"
-#~ msgid "Moderated:"
-#~ msgstr "நெறிபடுத்தப்பட்ட:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "தங்களின் மின்னஞ்சல்:"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "இணைந்தோர் மாத்திரமே மடலனுப்ப இயலும்"
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "வாசிக்க மட்டும், தொகுக்கப்பட்ட வெளியீடு."
+
+#~ msgid "Subscription:"
+#~ msgstr "சேருக:"
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
#~ msgstr "டெபியன் உருவாக்குநரால் ஒப்பமிடப் பட்ட மடல்களை மாத்திரமே இக்குழுமம் ஏற்கும்."
-#~ msgid "Subscription:"
-#~ msgstr "சேருக:"
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "இணைந்தோர் மாத்திரமே மடலனுப்ப இயலும்"
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "வாசிக்க மட்டும், தொகுக்கப்பட்ட வெளியீடு."
+#~ msgid "Moderated:"
+#~ msgstr "நெறிபடுத்தப்பட்ட:"
-#~ msgid "Your E-Mail address:"
-#~ msgstr "தங்களின் மின்னஞ்சல்:"
+#~ msgid "No description given"
+#~ msgstr "விவரமளிக்கப் படவில்லை"
-#~ msgid "Subscribe"
-#~ msgstr "சேருக"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "தாங்கள் சேர விழையும் மடலாடற் குழுக்களை தேர்வு செய்க:"
-#~ msgid "Clear"
-#~ msgstr "துடைக்க"
+#~ msgid ""
+#~ "Note that most Debian mailing lists are public forums. Any mails sent to "
+#~ "them will be published in public mailing list archives and indexed by "
+#~ "search engines. You should only subscribe to Debian mailing lists using "
+#~ "an e-mail address that you do not mind being made public."
+#~ msgstr ""
+#~ "டெபியனின் மடலாடற் குழுக்கள் பொது மேடையாகும். அவற்றுக்கு அனுப்பப்படும் எந்தவொரு மடலும் "
+#~ "பொது பெட்டகங்களில் பதிப்பிக்கப்பட்டு தேடு பொறிகளால் வரிசைப் படுத்தப்படும். டெபியன் "
+#~ "மடலாடற் குழுக்களில் பொதுப் பார்வையில் இடத்தக்கதாக தாங்கள் கருதும் மடல் முகவரியினைக் "
+#~ "கொண்டு சேரவும்."
#~ 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 ""
-#~ "<a href=\"./#ads\">டெபியன் மடலாடற் குழு விளம்பரக் கொள்கையை</a> மதித்தொழுகவும்."
+#~ "மின்னஞ்சல் தந்து இணைவது குறித்து அறிய <a href=\"./#subunsub\">மடலாடற் குழு</a> "
+#~ "பக்கத்தைப் பார்க்க. <a href=\"unsubscribe\">விலகுவதற்கான இணைய படிவமும்</a> "
+#~ "உள்ளது. "
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "மடலாடற் குழுவிலிருந்து விலக"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "மடலாடற் குழுவில் இணைய"
#~ 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. "
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "மின்னஞ்சல் துணைக் கொண்டு விலகுவது எப்படி எனபது குறித்து அறிய <a href=\"./"
-#~ "#subunsub\">மடலாடற் குழுக்களின்</a> பக்கத்தினைப் பார்க்கவும். சேரும் பொருட்டு<a href="
-#~ "\"subscribe\">சேர்வதற்கான இணைய படிவம்</a> ஒன்றும் கிடைக்கிறது."
+#~ "அகிலமனைத்திலும் உள்ள <total_consultant> டெபியன் ஆலோசகர்கள் பட்டியல் "
+#~ "<total_country>."
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "தாங்கள் விலக விரும்மும் மடலாடற் குழுக்களைத் தேர்வு செய்க:"
+#~ msgid "Willing to Relocate"
+#~ msgstr "இருப்பிடத்தை மாற்றிக் கொள்ள விருப்பம்"
-#~ msgid "Unsubscribe"
-#~ msgstr "விலகுக"
+#~ msgid "Rates:"
+#~ msgstr "விலை:"
-#~ msgid "open"
-#~ msgstr "திறக்க"
+#~ msgid "Email:"
+#~ msgstr "மின்னஞ்சல்:"
-#~ msgid "closed"
-#~ msgstr "மூடுகக்க"
+#~ msgid "or"
+#~ msgstr "அல்லது"
-#~ msgid "Topics:"
-#~ msgstr "தலைப்புகள்:"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "Location:"
-#~ msgstr "இடம்:"
+#~ msgid "Company:"
+#~ msgstr "நிறுவனம்:"
-#~ msgid "Languages:"
-#~ msgstr "மொழிகள்:"
+#~ msgid "Name:"
+#~ msgstr "பெயர்:"
-#~ msgid "Previous Talks:"
-#~ msgstr "முந்தையப் பேச்சுகள்:"
+#~ msgid "Where:"
+#~ msgstr "எங்கே:"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Specifications:"
+#~ msgstr "தேவைக்குறிப்புகள்:"
+
+#~ msgid "Architecture:"
+#~ msgstr "கட்டமைப்பு:"
+
+#~ msgid "Who:"
+#~ msgstr "யார்:"
+
+#~ msgid "Wanted:"
+#~ msgstr "தேவை:"
diff --git a/tamil/po/ports.ta.po b/tamil/po/ports.ta.po
index db16fba6901..a7ad7aa3958 100755
--- a/tamil/po/ports.ta.po
+++ b/tamil/po/ports.ta.po
@@ -117,32 +117,32 @@ msgstr "பவர் கணினிக்கான டெபியன்"
msgid "Debian for Sparc"
msgstr "ஸ்பார்க்குக்கான டெபியன்"
-#~ msgid "Debian for Laptops"
-#~ msgstr "மடிக்கணினிகளுக்கான டெபியன்"
-
-#~ msgid "Debian for Sparc64"
-#~ msgstr "ஸ்பார்க்64 க்கான டெபியன்"
+#~ msgid "Debian for AMD64"
+#~ msgstr "ஏஎம்டி64 க்கான டெபியன்"
-#~ msgid "Debian for S/390"
-#~ msgstr "எஸ்/390 க்கான டெபியன்"
+#~ msgid "Debian for ARM"
+#~ msgstr "ஏஆர்எம் க்கான டெபியன்"
-#~ msgid "Debian for MIPS"
-#~ msgstr "எம்ஐபிஎஸ் க்கான டெபியன்"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "பியோவுல்ப் க்கான டெபியன்"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "மோடரோலா 680x0 க்கான"
+#~ msgid "Main"
+#~ msgstr "பிரதான"
#~ msgid "Debian GNU/FreeBSD"
#~ msgstr "குனு/ப்ஃரீபிஎஸ்டி க்கான டெபியன்"
-#~ msgid "Main"
-#~ msgstr "பிரதான"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "மோடரோலா 680x0 க்கான"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "பியோவுல்ப் க்கான டெபியன்"
+#~ msgid "Debian for MIPS"
+#~ msgstr "எம்ஐபிஎஸ் க்கான டெபியன்"
-#~ msgid "Debian for ARM"
-#~ msgstr "ஏஆர்எம் க்கான டெபியன்"
+#~ msgid "Debian for S/390"
+#~ msgstr "எஸ்/390 க்கான டெபியன்"
-#~ msgid "Debian for AMD64"
-#~ msgstr "ஏஎம்டி64 க்கான டெபியன்"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "ஸ்பார்க்64 க்கான டெபியன்"
+
+#~ msgid "Debian for Laptops"
+#~ msgstr "மடிக்கணினிகளுக்கான டெபியன்"
diff --git a/tamil/po/templates.ta.po b/tamil/po/templates.ta.po
index 5a60e2a512f..75a3925e43d 100644
--- a/tamil/po/templates.ta.po
+++ b/tamil/po/templates.ta.po
@@ -72,7 +72,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "<a href=\"m4_HOME/\">டெபியன் திட்ட முதற்</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 "அகம்"
@@ -113,7 +113,7 @@ msgid "Support"
msgstr "ஆதரவு"
#: ../../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 "உருவாக்குவோர் கூடல்"
@@ -150,7 +150,7 @@ msgid "Miscellaneous"
msgstr "ஏனைய"
#: ../../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 "டெபியன் பெற"
@@ -205,7 +205,7 @@ msgstr "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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -223,24 +223,24 @@ msgstr ""
"debian.org\">debian-www@lists.debian.org</a> க்கு மடலிடவும். தொடர்பு கொள்ள "
"விழைந்தால் டெபியன்<a href=\"m4_HOME/contact\">தொடர்பு பக்கத்தை பார்க்கவும்</a>."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "கடைசியாக மாற்றப் பட்டது"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "பதிப்புரிமை"
-#: ../../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 ""
-#: ../../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 ""
"<a href=\"m4_HOME/license\" rel=\"copyright\">உரும விவரங்களைப் பார்வையிடவும்</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."
@@ -306,140 +306,152 @@ msgid "Debian Books"
msgstr "டெபியன் புத்தகங்கள்"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "டெபியனுக்கு உதவுக"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "மடலாடற் குழு பெட்டகம்"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "மடலாடற் குழுக்கள்"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "சமூக ஒப்பந்தம்"
-#: ../../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 "தள ஆதரவாளரை அறிய"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "டெபியன் இணையத் தளப்ப பக்கங்களின் வழிகாட்டி"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "உருவோக்குவோரின் தரவுக் களன்"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "டெபியன் புத்தகங்கள்"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "டெபியன் கொள்கைக் கையேடு"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "உருவாக்குவோரது பார்வைக்கு"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "புதியப் பராமரிப்பாளரது கையேடு"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "முக்கியமான வழுக்களை வெளியிடுக"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "லின்டியன் அறிக்கைகள்"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "பயனர்களது மடலாடற் குழுக்களுக்கான பெட்டகங்கள்"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "உருவாக்குவோரதுளது மடலாடற் குழுக்களுக்கான பெட்டகங்கள்"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "சர்வதேச/ தன் மொழியாக்க மடலாடற் குழுக்களுக்கான பெட்டகங்கள்"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "பெயர்த்தலுக்கான மடலாடற் குழுக்களுக்கான பெட்டகம்"
-#: ../../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 "வழு நோட்ட அமைப்பு மடலாடற் குழுவுக்கான பெட்டகம்"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "ஏனைய மடலாடற் குழுக்களுக்கான பெட்டகங்கள்"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "கட்டற்ற மென்பொருள்"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "உருவாக்கம்"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "டெபியனுக்கு உதவுக"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "வழுத் தாக்கல்"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "துறைகள்/கட்டமைப்புகள்"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "நிறுவல் கையேடு"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "வட்டு வழங்குவோர்"
-#: ../../english/template/debian/links.tags.wml:122
-msgid "CD ISO images"
+#: ../../english/template/debian/links.tags.wml:128
+#, fuzzy
+#| msgid "CD ISO images"
+msgid "CD/USB ISO images"
msgstr "ஐஎஸ்ஓ மாதிரிகளுக்கான வட்டு"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "பிணைய நிறுவல்"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "முன்-நிறுவப்பட்டபட்ட"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "டெபியன் கல்வித் திட்டம்"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr "அலியோத் &ndash; டெபியன் GForge"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "தர உத்தரவாதம்"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "பொதி நோட்ட அமைப்பு"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "பொதிகள் குறித்த டெபியன் உருவாக்குநரது கண்ணோட்டம்"
@@ -525,558 +537,559 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "<a href=\"../\">டெபியனைப் பயன்படுத்துவோர் யார்?</a> பக்கத்திற்கு திரும்புக."
-#~ msgid "More information"
-#~ msgstr "மேறகொண்டு விவரமறிய"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "எதிர்வருபவை"
-
-#~ msgid "link may no longer be valid"
-#~ msgstr "இணைப்பு இனி செல்லுபடியாகாதிருக்கலாம்"
-
-#~ msgid "When"
-#~ msgstr "எப்பொழுது"
-
-#~ msgid "Where"
-#~ msgstr "எங்கே"
-
-#~ msgid "More Info"
-#~ msgstr "மேலும் விவரங்களுக்கு"
-
-#~ msgid "Debian Involvement"
-#~ msgstr "டெபியன் ஈடுபாடு"
+#~ msgid "Select a server near you"
+#~ msgstr "தங்களுக்கு அருகாமையிலுள்ள வழங்கியினைத் தேர்வுச் செய்க"
-#~ msgid "Main Coordinator"
-#~ msgstr "முதன்மை ஒருங்கிணைப்பாளர்"
+#~ msgid "More information:"
+#~ msgstr "மேலும் விவரங்களுக்கு:"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>திட்ட</th><th>ஒருங்கிணைப்பாளர்</th>"
+#~ msgid "Taken by:"
+#~ msgstr "ஏற்றவர்:"
-#~ msgid "Related Links"
-#~ msgstr "தொடர்புடைய இணைப்புகள்"
+#~ msgid "Nobody"
+#~ msgstr "யாருமில்லை"
-#~ msgid "Latest News"
-#~ msgstr "புதிய செய்தி"
+#~ msgid "Rating:"
+#~ msgstr "தரமதிப்பீடு:"
-#~ msgid "Download calendar entry"
-#~ msgstr "நாட்காட்டிப் பதிவை பதிவிறக்குக"
+#~ msgid "List of Consultants"
+#~ msgstr "ஆலோசகர்கள் பட்டியல்"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "ஏனைய <a href=\"./\">டெபியன் செயதிகளுக்குத் </a> திரும்பவும் || <a href="
-#~ "\"m4_HOME/\">டெபியன் திட்ட முதற் பக்கம்</a>."
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "<a href=\"./\">டெபியன் ஆலோசகர்கள் பக்கத்திற்குத்</a> திரும்புக."
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (செயற் படாத இணைப்பு)"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
#, 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>."
-#~ msgstr ""
-#~ "இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian.org/"
-#~ "debian-news/\">டெபியன்செய்தி மடலாடற் குழுவில் இணையவும்</a>."
-
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "செய்தியறிக்கையின்<a href=\"../../\">முந்தைய பதிப்புகள்</a> கிடைக்கின்றன."
+#~| msgid "Network install"
+#~ msgid "Network Install"
+#~ msgstr "பிணைய நிறுவல்"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்<a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
#, 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>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்கள் <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~| msgid "<void id=\"misc-bottom\" />misc"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"misc-bottom\" />ஏனைய"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
-#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~| "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />%s இதனை மொழிபெயர்த்தார்."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />%s இதனை மொழிபெயர்த்தவர்கள் ஆவர்."
+#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
+#~ msgstr "<void id=\"dc_relinfo\" />பிம்ப வெளியீட்டுத் தகவல்"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />%s இதனை மொழிபெயர்த்தார்."
+#~ msgid "Debian CD team"
+#~ msgstr "டெபியன் வட்டுக் குழு"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />%s இதனை மொழிபெயர்த்தவர்கள் ஆவர்."
+#~ msgid "debian_on_cd"
+#~ msgstr "வட்டில்_டெபியன்"
-#~ msgid "List of Speakers"
-#~ msgstr "பேச்சாளர் பட்டியல்"
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />கேள்விகள்"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "<a href=\"./\">டெபியன்</a> பேச்சாளர் பக்கத்திற்குத் திரும்புக."
+#~ msgid "jigdo"
+#~ msgstr "ஜிக்டோ"
-#~ 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>."
-#~ msgstr ""
-#~ "இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian.org/"
-#~ "debian-news/\">டெபியன்செய்தி மடலாடற் குழுவில் இணையவும்</a>."
+#~ msgid "http_ftp"
+#~ msgstr "மீபநெ_கோபநெ"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்<a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "buy"
+#~ msgstr "வாங்குக"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்கள் <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "net_install"
+#~ msgstr "பிணைய_நிறுவல்"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />ஏனைய"
#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"plural\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "வட்டுக்களுக்கான ஆங்கில மொழியில்<a href=\"/MailingLists/disclaimer\">பொது "
+#~ "மடலாடற் குழு</a> :"
-#~ msgid "No requests for adoption"
-#~ msgstr "தத்தெடுப்பதற்கான கோரிக்கைகள் எதுவும் இல்லை"
+#~ msgid "Date"
+#~ msgstr "தேதி"
-#~ msgid "No orphaned packages"
-#~ msgstr "கைவிடப்பட்ட பொதிகள் எதுவும் இல்லை"
+#~ msgid "Time Line"
+#~ msgstr "காலவரை"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "தத்தெடுக்கும் பொருட்டு எந்தவொரு பொதியும் இல்லை"
+#~ msgid "Nominations"
+#~ msgstr "பரிந்துரைகள்"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "பொதியாக்கும்டுக்கும் பொருட்டு எந்தவொரு பொதியும் இல்லை"
+#~ msgid "Debate"
+#~ msgstr "விவாதம்"
-#~ msgid "No Requested packages"
-#~ msgstr "எந்த பொதியும் கோரப்படவில்லை"
+#~ msgid "Platforms"
+#~ msgstr "கட்டமைப்புகள்"
-#~ msgid "No help requested"
-#~ msgstr "எந்த உதவியும் கோரப்படவில்லை"
+#~ msgid "Proposer"
+#~ msgstr "பரிந்துரைத்தவர்"
-#~ msgid "in adoption since today."
-#~ msgstr "இன்றிற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
+#~ msgid "Proposal A Proposer"
+#~ msgstr "பரிந்துரை அ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "நேற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
+#~ msgid "Proposal B Proposer"
+#~ msgstr "பரிந்துரை இ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s நாட்களாக தத்தெடுக்கப் பட்டுள்ளது."
+#~ msgid "Proposal C Proposer"
+#~ msgstr "பரிந்துரை உ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "in preparation since today."
-#~ msgstr "இன்றிலிருந்து தயாரிக்கப் பட்டு வருகின்றது."
+#~ msgid "Proposal D Proposer"
+#~ msgstr "பரிந்துரை எ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "நேற்றிலிருந்து தயாரிக்கப் பட்டு வருகிறது."
+#~ msgid "Proposal E Proposer"
+#~ msgstr "பரிந்துரை ஐ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "%s days in preparation."
-#~ msgstr "தயாரிப்பில் %s நாட்கள்."
+#~ msgid "Proposal F Proposer"
+#~ msgstr "பரிந்துரை ஒ வினைப் பரிந்துரைத்தவர்"
-#~ msgid "requested today."
-#~ msgstr "இன்று கோரப்பட்டது."
+#~ msgid "Seconds"
+#~ msgstr "நொடிகள்"
-#~ msgid "requested yesterday."
-#~ msgstr "நேற்று கோரப்பட்டது"
+#~ msgid "Proposal A Seconds"
+#~ msgstr "பரிந்துரை அ நொடிகள்"
-#~ msgid "requested %s days ago."
-#~ msgstr "%s நாட்களுக்கு முன் கோரப்பட்டது."
+#~ msgid "Proposal B Seconds"
+#~ msgstr "பரிந்துரை இ நொடிகள்"
-#~ msgid "package info"
-#~ msgstr "பொதி விவரம்"
+#~ msgid "Proposal C Seconds"
+#~ msgstr "பரிந்துரை உ நொடிகள்"
-#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
-#~ msgstr "<void id=\"dc_pik\" />பிம்பக் கருவியின் மாதிரி"
+#~ msgid "Proposal D Seconds"
+#~ msgstr "பரிந்துரை எ நொடிகள்"
-#~ msgid "License Information"
-#~ msgstr "உரிம விவரம்"
+#~ msgid "Proposal E Seconds"
+#~ msgstr "பரிந்துரை ஐ நொடிகள்"
-#~ msgid "DLS Index"
-#~ msgstr "டிஎல்எஸ் வரிசை"
+#~ msgid "Proposal F Seconds"
+#~ msgstr "பரிந்துரை ஒ நொடிகள்"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Opposition"
+#~ msgstr "எதிர்தரப்பு"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG கேள்விகள்"
+#~ msgid "Text"
+#~ msgstr "உரை"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "டெபியன்-சட்ட பெட்டகம்"
+#~ msgid "Proposal A"
+#~ msgstr "பரிந்துரை அ"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid "Proposal B"
+#~ msgstr "பரிந்துரை இ"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, வெளியீடு %s: %s"
+#~ msgid "Proposal C"
+#~ msgstr "பரிந்துரை உ"
-#~ msgid "Date published"
-#~ msgstr "பதிப்பிக்கப் பட்ட தேதி"
+#~ msgid "Proposal D"
+#~ msgstr "பரிந்துரை எ"
-#~ msgid "License"
-#~ msgstr "உரிமம்"
+#~ msgid "Proposal E"
+#~ msgstr "பரிந்துரை ஐ"
-#~ msgid "Version"
-#~ msgstr "வெளியீடு"
+#~ msgid "Proposal F"
+#~ msgstr "பரிந்துரை ஒ"
-#~ msgid "Summary"
-#~ msgstr "தொகுப்புரை"
+#~ msgid "Choices"
+#~ msgstr "தேர்வுகள்"
-#~ msgid "Justification"
-#~ msgstr "நியாயம்"
+#~ msgid "Amendment Proposer"
+#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர்"
-#~ msgid "Discussion"
-#~ msgstr "விவாதம்"
+#~ msgid "Amendment Seconds"
+#~ msgstr "திருத்த நொடிகள்"
-#~ msgid "Original Summary"
-#~ msgstr "முதல் தொகுப்புரைை"
+#~ msgid "Amendment Text"
+#~ msgstr "திருத்த உரைகள்"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "முதல் உரைத் தொகுப்பினை <summary-author/> <a href=\"<summary-url/>"
-#~ "\">பெட்டகத்தில்</a> காணலாம்."
+#~ msgid "Amendment Proposer A"
+#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் அ"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "உரைத் தொகுப்பினைத் தயாரித்தவர் <summary-author/>."
+#~ msgid "Amendment Seconds A"
+#~ msgstr "திருத்த நொடிகள் அ"
-#~ msgid "License text (translated)"
-#~ msgstr "உரிம உரை (மொழிபெயர்க்கப் பட்டது)"
+#~ msgid "Amendment Text A"
+#~ msgstr "திருத்த உரை அ"
-#~ msgid "License text"
-#~ msgstr "உரிம உரை"
+#~ msgid "Amendment Proposer B"
+#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் இ"
-#~ msgid "free"
-#~ msgstr "கட்டற்ற"
+#~ msgid "Amendment Seconds B"
+#~ msgstr "திருத்த நொடிகள் இ"
-#~ msgid "non-free"
-#~ msgstr "கட்டுடைய"
+#~ msgid "Amendment Text B"
+#~ msgstr "திருத்த நொடிகள் இ"
-#~ msgid "not redistributable"
-#~ msgstr "மீண்டும் விநியோகிக்கத் தகாத"
+#~ msgid "Amendments"
+#~ msgstr "திருத்தங்கள்"
-#~ msgid "Free"
-#~ msgstr "கட்டற்ற"
+#~ msgid "Proceedings"
+#~ msgstr "நிகழ்பவை"
-#~ msgid "Non-Free"
-#~ msgstr "கட்டுடைய"
+#~ msgid "Majority Requirement"
+#~ msgstr "பெரும்பான்மைத் தேவை"
-#~ msgid "Not Redistributable"
-#~ msgstr "மீண்டும் விநியோகிக்கத் தகாத"
+#~ msgid "Data and Statistics"
+#~ msgstr "தரவும் புள்ளி விவரமும்"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "டெபியன் உரிமங்கள் குறித்து அறிய <a href=\"./\">உரிமத் தகவல்</a> பக்கத்தின் "
-#~ "துணையினை நாடுக."
+#~ msgid "Quorum"
+#~ msgstr "குறைந்தபட்ச தேவை"
-#~ msgid "Vote"
-#~ msgstr "வாக்களி"
+#~ msgid "Minimum Discussion"
+#~ msgstr "குறைந்த பட்ச கலந்தாயவு"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "விளைவொன்றை&nbsp;வாசிக்கவும்&nbsp;"
+#~ msgid "Ballot"
+#~ msgstr "வாக்கெடுப்பு"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "பரிந்துரையொன்றை&nbsp;பின்பற்றவும்&nbsp;"
+#~ msgid "Forum"
+#~ msgstr "தருக்கம்"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "பரிந்துரையொன்றை&nbsp;அமல் படுத்துக&nbsp;"
+#~ msgid "Outcome"
+#~ msgstr "விளைவு"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "பரிந்துரையொன்றை&nbsp;சமர்பிக்கவும்&nbsp;"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "ஆதரவாளர்களுக்காக&nbsp;காத்திருக்கிறொம்&nbsp;"
-#~ msgid "How&nbsp;To"
-#~ msgstr "எப்படி"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "விவாதத்தில்"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "&nbsp;வாக்களிப்பின்&nbsp;முதற் பக்கத்திற்கு"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "வாக்கெடுப்பு&nbsp;நடைபெறுகிறது "
-#~ msgid "Other"
-#~ msgstr "ஏனைய"
+#~ msgid "Decided"
+#~ msgstr "தீர்மானிக்கப்பட்டது"
#~ msgid "Withdrawn"
#~ msgstr "திரும்பப் பெறப் பட்டது"
-#~ msgid "Decided"
-#~ msgstr "தீர்மானிக்கப்பட்டது"
+#~ msgid "Other"
+#~ msgstr "ஏனைய"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "வாக்கெடுப்பு&nbsp;நடைபெறுகிறது "
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "&nbsp;வாக்களிப்பின்&nbsp;முதற் பக்கத்திற்கு"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "விவாதத்தில்"
+#~ msgid "How&nbsp;To"
+#~ msgstr "எப்படி"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "ஆதரவாளர்களுக்காக&nbsp;காத்திருக்கிறொம்&nbsp;"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "பரிந்துரையொன்றை&nbsp;சமர்பிக்கவும்&nbsp;"
-#~ msgid "Outcome"
-#~ msgstr "விளைவு"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "பரிந்துரையொன்றை&nbsp;அமல் படுத்துக&nbsp;"
-#~ msgid "Forum"
-#~ msgstr "தருக்கம்"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "பரிந்துரையொன்றை&nbsp;பின்பற்றவும்&nbsp;"
-#~ msgid "Ballot"
-#~ msgstr "வாக்கெடுப்பு"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "விளைவொன்றை&nbsp;வாசிக்கவும்&nbsp;"
-#~ msgid "Minimum Discussion"
-#~ msgstr "குறைந்த பட்ச கலந்தாயவு"
+#~ msgid "Vote"
+#~ msgstr "வாக்களி"
-#~ msgid "Quorum"
-#~ msgstr "குறைந்தபட்ச தேவை"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "டெபியன் உரிமங்கள் குறித்து அறிய <a href=\"./\">உரிமத் தகவல்</a> பக்கத்தின் "
+#~ "துணையினை நாடுக."
-#~ msgid "Data and Statistics"
-#~ msgstr "தரவும் புள்ளி விவரமும்"
+#~ msgid "Not Redistributable"
+#~ msgstr "மீண்டும் விநியோகிக்கத் தகாத"
-#~ msgid "Majority Requirement"
-#~ msgstr "பெரும்பான்மைத் தேவை"
+#~ msgid "Non-Free"
+#~ msgstr "கட்டுடைய"
-#~ msgid "Proceedings"
-#~ msgstr "நிகழ்பவை"
+#~ msgid "Free"
+#~ msgstr "கட்டற்ற"
-#~ msgid "Amendments"
-#~ msgstr "திருத்தங்கள்"
+#~ msgid "not redistributable"
+#~ msgstr "மீண்டும் விநியோகிக்கத் தகாத"
-#~ msgid "Amendment Text B"
-#~ msgstr "திருத்த நொடிகள் இ"
+#~ msgid "non-free"
+#~ msgstr "கட்டுடைய"
-#~ msgid "Amendment Seconds B"
-#~ msgstr "திருத்த நொடிகள் இ"
+#~ msgid "free"
+#~ msgstr "கட்டற்ற"
-#~ msgid "Amendment Proposer B"
-#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் இ"
+#~ msgid "License text"
+#~ msgstr "உரிம உரை"
-#~ msgid "Amendment Text A"
-#~ msgstr "திருத்த உரை அ"
+#~ msgid "License text (translated)"
+#~ msgstr "உரிம உரை (மொழிபெயர்க்கப் பட்டது)"
-#~ msgid "Amendment Seconds A"
-#~ msgstr "திருத்த நொடிகள் அ"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "உரைத் தொகுப்பினைத் தயாரித்தவர் <summary-author/>."
-#~ msgid "Amendment Proposer A"
-#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் அ"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "முதல் உரைத் தொகுப்பினை <summary-author/> <a href=\"<summary-url/>"
+#~ "\">பெட்டகத்தில்</a> காணலாம்."
-#~ msgid "Amendment Text"
-#~ msgstr "திருத்த உரைகள்"
+#~ msgid "Original Summary"
+#~ msgstr "முதல் தொகுப்புரைை"
-#~ msgid "Amendment Seconds"
-#~ msgstr "திருத்த நொடிகள்"
+#~ msgid "Discussion"
+#~ msgstr "விவாதம்"
-#~ msgid "Amendment Proposer"
-#~ msgstr "திருத்தத்தைப் பரிந்துரைத்தவர்"
+#~ msgid "Justification"
+#~ msgstr "நியாயம்"
-#~ msgid "Choices"
-#~ msgstr "தேர்வுகள்"
+#~ msgid "Summary"
+#~ msgstr "தொகுப்புரை"
-#~ msgid "Proposal F"
-#~ msgstr "பரிந்துரை ஒ"
+#~ msgid "Version"
+#~ msgstr "வெளியீடு"
-#~ msgid "Proposal E"
-#~ msgstr "பரிந்துரை ஐ"
+#~ msgid "License"
+#~ msgstr "உரிமம்"
-#~ msgid "Proposal D"
-#~ msgstr "பரிந்துரை எ"
+#~ msgid "Date published"
+#~ msgstr "பதிப்பிக்கப் பட்ட தேதி"
-#~ msgid "Proposal C"
-#~ msgstr "பரிந்துரை உ"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, வெளியீடு %s: %s"
-#~ msgid "Proposal B"
-#~ msgstr "பரிந்துரை இ"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Proposal A"
-#~ msgstr "பரிந்துரை அ"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "டெபியன்-சட்ட பெட்டகம்"
-#~ msgid "Text"
-#~ msgstr "உரை"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG கேள்விகள்"
-#~ msgid "Opposition"
-#~ msgstr "எதிர்தரப்பு"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Proposal F Seconds"
-#~ msgstr "பரிந்துரை ஒ நொடிகள்"
+#~ msgid "DLS Index"
+#~ msgstr "டிஎல்எஸ் வரிசை"
-#~ msgid "Proposal E Seconds"
-#~ msgstr "பரிந்துரை ஐ நொடிகள்"
+#~ msgid "License Information"
+#~ msgstr "உரிம விவரம்"
-#~ msgid "Proposal D Seconds"
-#~ msgstr "பரிந்துரை எ நொடிகள்"
+#~ msgid "<void id=\"dc_pik\" />Pseudo Image Kit"
+#~ msgstr "<void id=\"dc_pik\" />பிம்பக் கருவியின் மாதிரி"
-#~ msgid "Proposal C Seconds"
-#~ msgstr "பரிந்துரை உ நொடிகள்"
+#~ msgid "package info"
+#~ msgstr "பொதி விவரம்"
-#~ msgid "Proposal B Seconds"
-#~ msgstr "பரிந்துரை இ நொடிகள்"
+#~ msgid "requested %s days ago."
+#~ msgstr "%s நாட்களுக்கு முன் கோரப்பட்டது."
-#~ msgid "Proposal A Seconds"
-#~ msgstr "பரிந்துரை அ நொடிகள்"
+#~ msgid "requested yesterday."
+#~ msgstr "நேற்று கோரப்பட்டது"
-#~ msgid "Seconds"
-#~ msgstr "நொடிகள்"
+#~ msgid "requested today."
+#~ msgstr "இன்று கோரப்பட்டது."
-#~ msgid "Proposal F Proposer"
-#~ msgstr "பரிந்துரை ஒ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "%s days in preparation."
+#~ msgstr "தயாரிப்பில் %s நாட்கள்."
-#~ msgid "Proposal E Proposer"
-#~ msgstr "பரிந்துரை ஐ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "நேற்றிலிருந்து தயாரிக்கப் பட்டு வருகிறது."
-#~ msgid "Proposal D Proposer"
-#~ msgstr "பரிந்துரை எ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "in preparation since today."
+#~ msgstr "இன்றிலிருந்து தயாரிக்கப் பட்டு வருகின்றது."
-#~ msgid "Proposal C Proposer"
-#~ msgstr "பரிந்துரை உ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s நாட்களாக தத்தெடுக்கப் பட்டுள்ளது."
-#~ msgid "Proposal B Proposer"
-#~ msgstr "பரிந்துரை இ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "நேற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
-#~ msgid "Proposal A Proposer"
-#~ msgstr "பரிந்துரை அ வினைப் பரிந்துரைத்தவர்"
+#~ msgid "in adoption since today."
+#~ msgstr "இன்றிற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
-#~ msgid "Proposer"
-#~ msgstr "பரிந்துரைத்தவர்"
+#~ msgid "No help requested"
+#~ msgstr "எந்த உதவியும் கோரப்படவில்லை"
-#~ msgid "Platforms"
-#~ msgstr "கட்டமைப்புகள்"
+#~ msgid "No Requested packages"
+#~ msgstr "எந்த பொதியும் கோரப்படவில்லை"
-#~ msgid "Debate"
-#~ msgstr "விவாதம்"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "பொதியாக்கும்டுக்கும் பொருட்டு எந்தவொரு பொதியும் இல்லை"
-#~ msgid "Nominations"
-#~ msgstr "பரிந்துரைகள்"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "தத்தெடுக்கும் பொருட்டு எந்தவொரு பொதியும் இல்லை"
-#~ msgid "Time Line"
-#~ msgstr "காலவரை"
+#~ msgid "No orphaned packages"
+#~ msgstr "கைவிடப்பட்ட பொதிகள் எதுவும் இல்லை"
-#~ msgid "Date"
-#~ msgstr "தேதி"
+#~ msgid "No requests for adoption"
+#~ msgstr "தத்தெடுப்பதற்கான கோரிக்கைகள் எதுவும் இல்லை"
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "வட்டுக்களுக்கான ஆங்கில மொழியில்<a href=\"/MailingLists/disclaimer\">பொது "
-#~ "மடலாடற் குழு</a> :"
+#~ "<void id=\"plural\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />ஏனைய"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "net_install"
-#~ msgstr "பிணைய_நிறுவல்"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்கள் <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "buy"
-#~ msgstr "வாங்குக"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்<a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "http_ftp"
-#~ msgstr "மீபநெ_கோபநெ"
+#~ 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>."
+#~ msgstr ""
+#~ "இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian."
+#~ "org/debian-news/\">டெபியன்செய்தி மடலாடற் குழுவில் இணையவும்</a>."
-#~ msgid "jigdo"
-#~ msgstr "ஜிக்டோ"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "<a href=\"./\">டெபியன்</a> பேச்சாளர் பக்கத்திற்குத் திரும்புக."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />கேள்விகள்"
+#~ msgid "List of Speakers"
+#~ msgstr "பேச்சாளர் பட்டியல்"
-#~ msgid "debian_on_cd"
-#~ msgstr "வட்டில்_டெபியன்"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />%s இதனை மொழிபெயர்த்தவர்கள் ஆவர்."
-#~ msgid "Debian CD team"
-#~ msgstr "டெபியன் வட்டுக் குழு"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />%s இதனை மொழிபெயர்த்தார்."
-#~ msgid "<void id=\"dc_relinfo\" />Image Release Info"
-#~ msgstr "<void id=\"dc_relinfo\" />பிம்ப வெளியீட்டுத் தகவல்"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />%s இதனை மொழிபெயர்த்தவர்கள் ஆவர்."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />%s இதனை மொழிபெயர்த்தார்."
#, fuzzy
-#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
+#~| msgid ""
+#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~| "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#, fuzzy
-#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
+#~| msgid ""
+#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
+#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#, fuzzy
-#~| msgid "<void id=\"misc-bottom\" />misc"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"misc-bottom\" />ஏனைய"
+#~| 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>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்கள் <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
#, fuzzy
-#~| msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்<a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "செய்தியறிக்கையின்<a href=\"../../\">முந்தைய பதிப்புகள்</a> கிடைக்கின்றன."
#, fuzzy
-#~| msgid "Network install"
-#~ msgid "Network Install"
-#~ msgstr "பிணைய நிறுவல்"
+#~| 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>."
+#~ msgstr ""
+#~ "இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian."
+#~ "org/debian-news/\">டெபியன்செய்தி மடலாடற் குழுவில் இணையவும்</a>."
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (செயற் படாத இணைப்பு)"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "<a href=\"./\">டெபியன் ஆலோசகர்கள் பக்கத்திற்குத்</a> திரும்புக."
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "ஏனைய <a href=\"./\">டெபியன் செயதிகளுக்குத் </a> திரும்பவும் || <a href="
+#~ "\"m4_HOME/\">டெபியன் திட்ட முதற் பக்கம்</a>."
-#~ msgid "List of Consultants"
-#~ msgstr "ஆலோசகர்கள் பட்டியல்"
+#~ msgid "Download calendar entry"
+#~ msgstr "நாட்காட்டிப் பதிவை பதிவிறக்குக"
-#~ msgid "Rating:"
-#~ msgstr "தரமதிப்பீடு:"
+#~ msgid "Latest News"
+#~ msgstr "புதிய செய்தி"
-#~ msgid "Nobody"
-#~ msgstr "யாருமில்லை"
+#~ msgid "Related Links"
+#~ msgstr "தொடர்புடைய இணைப்புகள்"
-#~ msgid "Taken by:"
-#~ msgstr "ஏற்றவர்:"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>திட்ட</th><th>ஒருங்கிணைப்பாளர்</th>"
-#~ msgid "More information:"
-#~ msgstr "மேலும் விவரங்களுக்கு:"
+#~ msgid "Main Coordinator"
+#~ msgstr "முதன்மை ஒருங்கிணைப்பாளர்"
-#~ msgid "Select a server near you"
-#~ msgstr "தங்களுக்கு அருகாமையிலுள்ள வழங்கியினைத் தேர்வுச் செய்க"
+#~ msgid "Debian Involvement"
+#~ msgstr "டெபியன் ஈடுபாடு"
+
+#~ msgid "More Info"
+#~ msgstr "மேலும் விவரங்களுக்கு"
+
+#~ msgid "Where"
+#~ msgstr "எங்கே"
+
+#~ msgid "When"
+#~ msgstr "எப்பொழுது"
+
+#~ msgid "link may no longer be valid"
+#~ msgstr "இணைப்பு இனி செல்லுபடியாகாதிருக்கலாம்"
+
+#~ msgid "Upcoming Attractions"
+#~ msgstr "எதிர்வருபவை"
+
+#~ msgid "More information"
+#~ msgstr "மேறகொண்டு விவரமறிய"
diff --git a/tamil/po/vendors.ta.po b/tamil/po/vendors.ta.po
index e7ec0d37b09..50fccdb7215 100644
--- a/tamil/po/vendors.ta.po
+++ b/tamil/po/vendors.ta.po
@@ -12,92 +12,85 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "வழங்குவோர்:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "டெபியன் பக்கத்துக்கான இணைப்பு:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "டெபியன் பங்களிப்பினை ஊக்குவிக்கின்றது:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "நாடு:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "சர்வதேச விநியோகம்:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "மின்னஞ்சல்:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "வட்டு வகை:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "பெருவட்டு வகை:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "கட்டமைப்புகள்:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
msgid "Vendor"
msgstr "வழங்குவோர்"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "பங்களிப்புகளை அனுமதிக்கும்"
-#: ../../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 "வட்டு/பெருவட்டு"
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr "கட்டமைப்பு"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "சர்வதேச விநியோகம்"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "தொடர்பு கொள்க"
#. ###################
#. 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 "வழங்குவோர் இல்லம்"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "பக்கம்"
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "மின்னஞ்சல்"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "ஐரோப்பாவுக்குள்"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "சிலப் பகுதிகளுக்கு"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "மூலம்"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "மற்றும்"
+
+#~ msgid "Architectures:"
+#~ msgstr "கட்டமைப்புகள்:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "பெருவட்டு வகை:"
+
+#~ msgid "CD Type:"
+#~ msgstr "வட்டு வகை:"
+
+#~ msgid "email:"
+#~ msgstr "மின்னஞ்சல்:"
+
+#~ msgid "Ship International:"
+#~ msgstr "சர்வதேச விநியோகம்:"
+
+#~ msgid "Country:"
+#~ msgstr "நாடு:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "டெபியன் பங்களிப்பினை ஊக்குவிக்கின்றது:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "டெபியன் பக்கத்துக்கான இணைப்பு:"
+
+#~ msgid "Vendor:"
+#~ msgstr "வழங்குவோர்:"
diff --git a/tamil/po/vote.ta.po b/tamil/po/vote.ta.po
index 4ca04394a14..54dea571331 100644
--- a/tamil/po/vote.ta.po
+++ b/tamil/po/vote.ta.po
@@ -25,229 +25,251 @@ msgid "Time Line"
msgstr "காலவரை"
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
msgid "Nominations"
msgstr "பரிந்துரைகள்"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
msgid "Debate"
msgstr "விவாதம்"
-#: ../../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
msgid "Proposer"
msgstr "பரிந்துரைத்தவர்"
-#: ../../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
+#, fuzzy
+#| msgid "Amendment Proposer A"
+msgid "Amendment Proposer C"
+msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் அ"
+
+#: ../../english/template/debian/votebar.wml:130
+#, fuzzy
+#| msgid "Amendment Seconds A"
+msgid "Amendment Seconds C"
+msgstr "திருத்த நொடிகள் அ"
+
+#: ../../english/template/debian/votebar.wml:133
+#, fuzzy
+#| msgid "Amendment Text A"
+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
msgid "Minimum Discussion"
msgstr "குறைந்த பட்ச கலந்தாயவு"
-#: ../../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 "ஆதரவாளர்களுக்காக&nbsp;காத்திருக்கிறொம்&nbsp;"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "விவாதத்தில்"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "வாக்கெடுப்பு&nbsp;நடைபெறுகிறது "
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "தீர்மானிக்கப்பட்டது"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "திரும்பப் பெறப் பட்டது"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "ஏனைய"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "&nbsp;வாக்களிப்பின்&nbsp;முதற் பக்கத்திற்கு"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "எப்படி"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "பரிந்துரையொன்றை&nbsp;சமர்பிக்கவும்&nbsp;"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "பரிந்துரையொன்றை&nbsp;அமல் படுத்துக&nbsp;"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "பரிந்துரையொன்றை&nbsp;பின்பற்றவும்&nbsp;"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "விளைவொன்றை&nbsp;வாசிக்கவும்&nbsp;"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "வாக்களி"
diff --git a/turkish/po/cdimage.tr.po b/turkish/po/cdimage.tr.po
index c42d032122e..21a5269040c 100644
--- a/turkish/po/cdimage.tr.po
+++ b/turkish/po/cdimage.tr.po
@@ -21,18 +21,16 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\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 " Anahtar parmakizi"
-#: ../../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/turkish/po/distrib.tr.po b/turkish/po/distrib.tr.po
index 719afee0afe..465a8ee0066 100644
--- a/turkish/po/distrib.tr.po
+++ b/turkish/po/distrib.tr.po
@@ -143,61 +143,71 @@ 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 "Hard Float ABI ARM"
-#: ../../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 "IBM System z"
-#: ../../english/releases/arches.data:25
+#: ../../english/releases/arches.data:27
msgid "SPARC"
msgstr "SPARC"
diff --git a/turkish/po/doc.tr.po b/turkish/po/doc.tr.po
index 7641d1b2064..024df1d1b81 100644
--- a/turkish/po/doc.tr.po
+++ b/turkish/po/doc.tr.po
@@ -19,7 +19,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\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"
@@ -34,7 +51,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"
@@ -43,15 +60,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"
@@ -60,13 +77,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"
@@ -81,7 +98,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 -- "
@@ -91,11 +108,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, "
@@ -115,7 +132,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"
@@ -123,11 +140,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"
@@ -135,11 +152,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"
@@ -151,24 +168,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 "
@@ -177,13 +197,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"
@@ -199,24 +219,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"
@@ -227,11 +247,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"
@@ -241,11 +261,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 "
@@ -256,11 +276,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"
@@ -270,11 +290,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"
@@ -282,7 +302,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 "
@@ -298,7 +318,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 "
@@ -328,53 +348,73 @@ msgstr "CD içeriyor:"
msgid "Publisher:"
msgstr "Yayımcı:"
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr "Yazarlar:"
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr "Editörler:"
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr "Geliştirici:"
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr "Durum:"
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr "Bulunabilirlik:"
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr "En son sürüm:"
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr "(sürüm <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 "düz metin"
-#. 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
-#, fuzzy
-#| msgid ""
-#| "Use <a href=\"cvs\">CVS</a> to download the SGML source text for <get-var "
-#| "ddp_pkg_loc />."
+#: ../../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 ""
+
+#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+msgid "VCS interface: "
msgstr ""
-"<get-var ddp_pkg_loc /> SGML kaynak metnini indirmek için <a href=\"cvs"
-"\">CVS</a> kullanın."
-#: ../../english/doc/manuals.defs:158
+#: ../../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"
@@ -384,28 +424,31 @@ msgstr ""
" <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>\n"
" olarak ayarla ve <kbd>boot-floppies/documentation</kbd> modülünü getirin."
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr "Web üzerinden CVS"
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr "Debian paketi"
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
#, fuzzy
#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Debian paketi"
-#: ../../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 "Dil:"
+
#~ msgid ""
#~ "<p>You can visit the current <a href=\"manuals/<get-var doc />/"
#~ "\">development version</a> here, use <a href=\"cvs\">CVS</a> to download "
@@ -415,5 +458,13 @@ msgstr ""
#~ "versiyona bakabilir veya isterseniz <a href=\"cvs\">CVS</a> kullanarak "
#~ "SGML formatında kaynağı bilgisayarınıza indirebilirsiniz."
-#~ msgid "Language:"
-#~ msgstr "Dil:"
+#, fuzzy
+#~| msgid ""
+#~| "Use <a href=\"cvs\">CVS</a> to download the SGML source text for <get-"
+#~| "var ddp_pkg_loc />."
+#~ msgid ""
+#~ "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var "
+#~ "ddp_pkg_loc />."
+#~ msgstr ""
+#~ "<get-var ddp_pkg_loc /> SGML kaynak metnini indirmek için <a href=\"cvs"
+#~ "\">CVS</a> kullanın."
diff --git a/turkish/po/newsevents.tr.po b/turkish/po/newsevents.tr.po
index e6f3de7f688..e867551c790 100644
--- a/turkish/po/newsevents.tr.po
+++ b/turkish/po/newsevents.tr.po
@@ -37,27 +37,27 @@ msgstr "p<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 "İsim:"
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr "Eposta:"
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr "Önceki Konuşmalar:"
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr "Diller:"
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr "Yerler:"
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr "Konular:"
@@ -349,11 +349,12 @@ 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>."
+#| "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 ""
"Bu bültenin haftalık olarak eposta adresinize gönderilmesini isterseniz, <a "
"href=\"https://lists.debian.org/debian-news/\">debian-news eposta listesine</"
@@ -496,3 +497,17 @@ msgid ""
msgstr ""
"<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:"
"dwn@debian.org\">%s</a> tarafından düzenlendi."
+
+#, 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>."
+#~ msgstr ""
+#~ "Bu bültenin haftalık olarak eposta adresinize gönderilmesini isterseniz, "
+#~ "<a href=\"https://lists.debian.org/debian-news/\">debian-news eposta "
+#~ "listesine</a> üye olmanız yeterlidir."
diff --git a/turkish/po/organization.tr.po b/turkish/po/organization.tr.po
index f787fc8ca56..88c89d85762 100644
--- a/turkish/po/organization.tr.po
+++ b/turkish/po/organization.tr.po
@@ -85,7 +85,7 @@ msgid "Officers"
msgstr "Ofis Üyeleri"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Dağıtım"
@@ -95,11 +95,11 @@ msgid "Publicity"
msgstr "Tanıtım"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Destek ve Altyapı"
-#. 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 ""
@@ -112,111 +112,111 @@ msgstr "Lider"
msgid "Technical Committee"
msgstr "Teknik Komite"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Sekreter"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Geliştirilen Projeler"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP Arşivleri"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
#, fuzzy
#| msgid "Release Assistants"
msgid "FTP Assistants"
msgstr "Sürüm Yardımcıları"
-#: ../../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 "Ayrı paketler"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Sürüm Yönetimi"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "Sürüm Notları"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Kalite Güvencesi"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Kurulum Sistemi Ekibi"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Sürüm Notları"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "CD imajları"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Üretim"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Test"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Destek ve Altyapı"
-#: ../../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
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Sistem Yönetimi"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Belgelendirme"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
#, fuzzy
#| msgid "Work-needing and Prospective Packages list"
msgid "Work-Needing and Prospective Packages list"
msgstr "Üzerinde çalışılması gereken ve Paketlenmesi olası paket listeleri"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
#, fuzzy
#| msgid "Installation System Team"
msgid "Live System Team"
msgstr "Kurulum Sistemi Ekibi"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Donanım Platformları"
@@ -244,87 +244,77 @@ msgstr "Basınla İletişim"
msgid "Partner Program"
msgstr "İş Ortakları Programı"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Olaylar"
-#: ../../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 "Kullanıcı desteği"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Hata Takip Sistemi"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
#, fuzzy
#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Eposta Listeleri Yönetimi"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Yeni Geliştiriciler Başvuru Masası"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
#, fuzzy
#| msgid "Developer Accounts Managers"
msgid "Debian Account Managers"
msgstr "Geliştirici Hesapları Yöneticileri"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Anahtar halkası Yöneticileri (PGP ve GPG)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Güvenlik Ekibi"
-#: ../../english/intro/organization.data:360
-#, fuzzy
-#| msgid "Security Team"
-msgid "Testing Security Team"
-msgstr "Güvenlik Ekibi"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Güvenlik Duyuruları Projesi"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Web Sayfaları"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Danışmanlar Sayfası"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "CD Satıcıları Sayfası"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Kurallar"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Sistem Yönetimi"
-#: ../../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."
@@ -333,7 +323,7 @@ msgstr ""
"belirli bir paketin kurulumuna olan gereksinim gibi sorunlarla "
"karşılaştığınızda kullanacağınız adrestir."
-#: ../../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 "
@@ -343,130 +333,139 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">Debian Makineleri</a> sayfasını "
"inceleyin; bu sayfa her makineye ilişkin yönetim bilgilerini içermektedir."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP Geliştirici Dizinleri Yönetimi"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Yansılar"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "DNS Yöneticisi"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Paket Takip Sistemi"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Donanım Bağışları Koordinasyonu"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Alioth yöneticileri"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
#, fuzzy
#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Geliştirilen Projeler"
-#: ../../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 "Yedine yetmişe çocuklar için Debian"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Tıbbî uygulama ve araştırmalar için Debian"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Eğitim için Debian"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Resmî dairelerde Debian"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Özürlüler için Debian"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Tıbbî uygulama ve araştırmalar için Debian"
-#~ msgid "Mailing list"
-#~ msgstr "Mail listesi"
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "``Stable'' Sürüm Yöneticisi"
-#~ msgid "Installation"
-#~ msgstr "Kurulum"
+#~ msgid "Installation System for ``stable''"
+#~ msgstr "``Stable'' Kurulum Sistemi"
-#~ msgid "Delegates"
-#~ msgstr "Temsilciler"
+#~ msgid "Vendors"
+#~ msgstr "Satıcılar"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Bu proje henüz resmî bir dahili Debian projesi değil, fakat bu yönde bir "
-#~ "niyet bildirilmiş durumda."
+#~ msgid "APT Team"
+#~ msgstr "APT Ekibi"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Debian Çokluortam Dağıtımı"
+#~ msgid "Handhelds"
+#~ msgstr "Elde taşınabilirler"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "İş dünyası için Debian GNU/Linux"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Eposta Liste Arşivleri"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Kâr amacı gütmeyen kurumlar için Debian"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Anahtar İmzalama Koordinasyonu"
+
+#~ msgid "Accountant"
+#~ msgstr "Sayman"
#~ msgid "The Universal Operating System as your Desktop"
#~ msgstr "Masaüstünüz için Evrensel İşletim Sistemi"
-#~ msgid "Accountant"
-#~ msgstr "Sayman"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Kâr amacı gütmeyen kurumlar için Debian"
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Anahtar İmzalama Koordinasyonu"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "İş dünyası için Debian GNU/Linux"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Eposta Liste Arşivleri"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Debian Çokluortam Dağıtımı"
-#~ msgid "Handhelds"
-#~ msgstr "Elde taşınabilirler"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Bu proje henüz resmî bir dahili Debian projesi değil, fakat bu yönde bir "
+#~ "niyet bildirilmiş durumda."
-#~ msgid "APT Team"
-#~ msgstr "APT Ekibi"
+#~ msgid "Delegates"
+#~ msgstr "Temsilciler"
-#~ msgid "Vendors"
-#~ msgstr "Satıcılar"
+#~ msgid "Installation"
+#~ msgstr "Kurulum"
-#~ msgid "Installation System for ``stable''"
-#~ msgstr "``Stable'' Kurulum Sistemi"
+#~ msgid "Mailing list"
+#~ msgstr "Mail listesi"
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "``Stable'' Sürüm Yöneticisi"
+#~ msgid "Security Audit Project"
+#~ msgstr "Güvenlik Duyuruları Projesi"
+
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Güvenlik Ekibi"
diff --git a/turkish/po/others.tr.po b/turkish/po/others.tr.po
index d6c1ab7c469..453b85f92b4 100644
--- a/turkish/po/others.tr.po
+++ b/turkish/po/others.tr.po
@@ -116,8 +116,9 @@ msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
"(only available in French) for more information."
msgstr ""
-"Daha fazla bilgi için <a href=\"m4_HOME/intl/french/\">https://www.debian.org/"
-"intl/french/</a> sayfasına başvurun (içerik sadece Fransızca olarak mevcut)."
+"Daha fazla bilgi için <a href=\"m4_HOME/intl/french/\">https://www.debian."
+"org/intl/french/</a> sayfasına başvurun (içerik sadece Fransızca olarak "
+"mevcut)."
#: ../../english/devel/website/tc.data:12
#: ../../english/devel/website/tc.data:14
@@ -192,26 +193,6 @@ msgstr "[Debian] (mini buton)"
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr "İstenenler:"
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr "Kim:"
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr "Mimari:"
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr "Özellikler:"
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr "Neresi:"
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Ürünler"
@@ -256,24 +237,36 @@ msgstr "rozetler"
msgid "basketball goals"
msgstr "basketbol potaları"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "küpeler"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "çantalar"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
#, fuzzy
#| msgid "suitcases"
msgid "pillowcases"
msgstr "çantalar"
+#: ../../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 ""
@@ -349,58 +342,88 @@ msgstr "Sürüm"
msgid "URL"
msgstr "URL"
-#~ msgid "Name:"
-#~ msgstr "İsim:"
+#~ msgid "p<get-var page />"
+#~ msgstr "p<get-var page />"
-#~ msgid "Company:"
-#~ msgstr "Şirket:"
+#~ msgid "Previous Talks:"
+#~ msgstr "Önceki Konuşmalar:"
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Languages:"
+#~ msgstr "Diller:"
-#~ msgid "or"
-#~ msgstr "veya"
+#~ msgid "Location:"
+#~ msgstr "Yerler:"
-#~ msgid "Email:"
-#~ msgstr "Eposta:"
+#~ msgid "Topics:"
+#~ msgstr "Konular:"
-#~ msgid "Rates:"
-#~ msgstr "Tarifeler:"
+#~ msgid "Q"
+#~ msgstr "S"
-#~ msgid "Willing to Relocate"
-#~ msgstr "Herhangi bir yerde hizmet verebilecekler"
+#~ msgid "animated&nbsp;GIF&nbsp;banner"
+#~ msgstr "animasyonlu&nbsp;GIF&nbsp;içeren&nbsp;banner"
+
+#~ msgid "horizontal&nbsp;banner"
+#~ msgstr "yatay&nbsp;banner"
+
+#~ msgid "vertical&nbsp;banner"
+#~ msgstr "dikey&nbsp;banner"
+
+#~ msgid "Debian Technical Committee only"
+#~ msgstr "Sadece Debian Teknik Komitesi"
+
+#~ msgid "developers only"
+#~ msgstr "sadece geliştiricilere açık"
+
+#~ msgid "rc2"
+#~ msgstr "rc2"
+
+#~ msgid "closed"
+#~ msgstr "kapalı"
+
+#~ msgid "open"
+#~ msgstr "açık"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Üyelikten Çık"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Lütfen üyelikten çıkmak istediğiniz listeleri seçin:"
#~ msgid ""
-#~ "<total_consultant> Debian consultants listed in <total_country> countries "
-#~ "worldwide."
+#~ "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 ""
-#~ "<total_country> ülkede toplam <total_consultant> Debian danışmanı "
-#~ "bulunmaktadır."
+#~ "Eposta göndererek nasıl liste üyeliğinden çıkabileceğinize dair bilgileri "
+#~ "<a href=\"./#subunsub\">mail listeleri</a> sayfasından edinebilirsiniz. "
+#~ "Başka listelere de üye olmak isterseniz ayrıca bir <a href=\"subscribe"
+#~ "\">üyelik formu</a> mevcuttur."
-#~ msgid "Mailing List Subscription"
-#~ msgstr "Eposta Listesi Üyeliği"
+#~ msgid "Mailing List Unsubscription"
+#~ msgstr "Eposta Liste Üyeliğinden Çıkma"
#~ msgid ""
-#~ "See the <a href=\"./#subunsub\">mailing lists</a> page for information on "
-#~ "how to subscribe using e-mail. An <a href=\"unsubscribe\">unsubscription "
-#~ "web form</a> is also available, for unsubscribing from mailing lists. "
+#~ "Please respect the <a href=\"./#ads\">Debian mailing list advertising "
+#~ "policy</a>."
#~ msgstr ""
-#~ "Eposta kullanarak nasıl üye olacağınıza ait bilgileri <a href=\"./"
-#~ "#subunsub\">mail listeleri</a> sayfasından edinebilirsiniz. Liste "
-#~ "üyeliklerden çıkmak için ayrıca <a href=\"unsubscribe\">üyelikten çıkma "
-#~ "formu</a> mevcuttur."
+#~ "Lütfen <a href=\"./#ads\">Debian eposta listeleri reklam politikasına</a> "
+#~ "saygılı olunuz."
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Lütfen üye olmak istediğiniz listeleri seçin:"
+#~ msgid "Clear"
+#~ msgstr "Temizle"
-#~ msgid "No description given"
-#~ msgstr "Açıklama verilmemiş"
+#~ msgid "Subscribe"
+#~ msgstr "Üye ol"
-#~ msgid "Moderated:"
-#~ msgstr "Kısıtlanmış:"
+#~ msgid "Your E-Mail address:"
+#~ msgstr "Eposta adresiniz:"
-#~ msgid "Posting messages allowed only to subscribers."
-#~ msgstr "Sadece üyeler eposta gönderebilir."
+#~ msgid "is a read-only, digestified version."
+#~ msgstr "salt-okunabilir, derlenmiş sürüm."
+
+#~ msgid "Subscription:"
+#~ msgstr "Üyelik:"
#~ msgid ""
#~ "Only messages signed by a Debian developer will be accepted by this list."
@@ -408,85 +431,70 @@ msgstr "URL"
#~ "Bu listeye sadece bir Debian geliştiricisi tarafından imzalanmış iletiler "
#~ "kabul edilecektir."
-#~ msgid "Subscription:"
-#~ msgstr "Üyelik:"
-
-#~ msgid "is a read-only, digestified version."
-#~ msgstr "salt-okunabilir, derlenmiş sürüm."
+#~ msgid "Posting messages allowed only to subscribers."
+#~ msgstr "Sadece üyeler eposta gönderebilir."
-#~ msgid "Your E-Mail address:"
-#~ msgstr "Eposta adresiniz:"
+#~ msgid "Moderated:"
+#~ msgstr "Kısıtlanmış:"
-#~ msgid "Subscribe"
-#~ msgstr "Üye ol"
+#~ msgid "No description given"
+#~ msgstr "Açıklama verilmemiş"
-#~ msgid "Clear"
-#~ msgstr "Temizle"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Lütfen üye olmak istediğiniz listeleri seçin:"
#~ 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 ""
-#~ "Lütfen <a href=\"./#ads\">Debian eposta listeleri reklam politikasına</a> "
-#~ "saygılı olunuz."
+#~ "Eposta kullanarak nasıl üye olacağınıza ait bilgileri <a href=\"./"
+#~ "#subunsub\">mail listeleri</a> sayfasından edinebilirsiniz. Liste "
+#~ "üyeliklerden çıkmak için ayrıca <a href=\"unsubscribe\">üyelikten çıkma "
+#~ "formu</a> mevcuttur."
-#~ msgid "Mailing List Unsubscription"
-#~ msgstr "Eposta Liste Üyeliğinden Çıkma"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "Eposta Listesi Üyeliği"
#~ 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. "
+#~ "<total_consultant> Debian consultants listed in <total_country> countries "
+#~ "worldwide."
#~ msgstr ""
-#~ "Eposta göndererek nasıl liste üyeliğinden çıkabileceğinize dair bilgileri "
-#~ "<a href=\"./#subunsub\">mail listeleri</a> sayfasından edinebilirsiniz. "
-#~ "Başka listelere de üye olmak isterseniz ayrıca bir <a href=\"subscribe"
-#~ "\">üyelik formu</a> mevcuttur."
-
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Lütfen üyelikten çıkmak istediğiniz listeleri seçin:"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Üyelikten Çık"
-
-#~ msgid "open"
-#~ msgstr "açık"
-
-#~ msgid "closed"
-#~ msgstr "kapalı"
+#~ "<total_country> ülkede toplam <total_consultant> Debian danışmanı "
+#~ "bulunmaktadır."
-#~ msgid "rc2"
-#~ msgstr "rc2"
+#~ msgid "Willing to Relocate"
+#~ msgstr "Herhangi bir yerde hizmet verebilecekler"
-#~ msgid "developers only"
-#~ msgstr "sadece geliştiricilere açık"
+#~ msgid "Rates:"
+#~ msgstr "Tarifeler:"
-#~ msgid "Debian Technical Committee only"
-#~ msgstr "Sadece Debian Teknik Komitesi"
+#~ msgid "Email:"
+#~ msgstr "Eposta:"
-#~ msgid "vertical&nbsp;banner"
-#~ msgstr "dikey&nbsp;banner"
+#~ msgid "or"
+#~ msgstr "veya"
-#~ msgid "horizontal&nbsp;banner"
-#~ msgstr "yatay&nbsp;banner"
+#~ msgid "URL:"
+#~ msgstr "URL:"
-#~ msgid "animated&nbsp;GIF&nbsp;banner"
-#~ msgstr "animasyonlu&nbsp;GIF&nbsp;içeren&nbsp;banner"
+#~ msgid "Company:"
+#~ msgstr "Şirket:"
-#~ msgid "Q"
-#~ msgstr "S"
+#~ msgid "Name:"
+#~ msgstr "İsim:"
-#~ msgid "Topics:"
-#~ msgstr "Konular:"
+#~ msgid "Where:"
+#~ msgstr "Neresi:"
-#~ msgid "Location:"
-#~ msgstr "Yerler:"
+#~ msgid "Specifications:"
+#~ msgstr "Özellikler:"
-#~ msgid "Languages:"
-#~ msgstr "Diller:"
+#~ msgid "Architecture:"
+#~ msgstr "Mimari:"
-#~ msgid "Previous Talks:"
-#~ msgstr "Önceki Konuşmalar:"
+#~ msgid "Who:"
+#~ msgstr "Kim:"
-#~ msgid "p<get-var page />"
-#~ msgstr "p<get-var page />"
+#~ msgid "Wanted:"
+#~ msgstr "İstenenler:"
diff --git a/turkish/po/ports.tr.po b/turkish/po/ports.tr.po
index dbb05005e6b..29d691bd471 100644
--- a/turkish/po/ports.tr.po
+++ b/turkish/po/ports.tr.po
@@ -123,68 +123,65 @@ msgstr "Debian PowerPC"
msgid "Debian for Sparc"
msgstr "Debian Sparc"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian Sparc64"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Dizüstü bilgisayarlar için Debian"
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian S/390"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian AMD64"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian MIPS"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian ARM"
-#~ msgid ""
-#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
-#~ "USB, Touchpad, Audio"
-#~ msgstr ""
-#~ "Mips 16, LCD denetleyici, Kompakt Flash, UART, Paralel, RTC, Klavye, USB, "
-#~ "Touchpad, Audio"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian Beowulf"
-#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
-#~ msgstr "Mips 16, Kompakt Flash, UART, Paralel, RTC, Ses, PCIC"
+#~ msgid "Main"
+#~ msgstr "Temel"
-#~ msgid ""
-#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
-#~ msgstr "Mips 16, Klavye, TouchPanel, Ses, Kompakt Flash, UART, Paralel"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Mips 16"
-#~ msgstr "Mips 16"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian Motorola 680x0"
-#~ msgid "256 L2 cache on die"
-#~ msgstr "Yonga üzerinde 256 L2 önbellek"
+#~ msgid "Vendor/Name"
+#~ msgstr "Üretici/İsim"
-#~ msgid "FPU, 64-bit external bus, external L2 cache"
-#~ msgstr "FPU, 64-bit harici yol, harici L2 önbellek"
+#~ msgid "Date announced"
+#~ msgstr "Duyurulduğu tarihi"
-#~ msgid "FPU, 64-bit external bus"
-#~ msgstr "FPU, 64-bit harici yol"
+#~ msgid "Clock"
+#~ msgstr "Saat"
-#~ msgid "FPU, 32-bit external bus"
-#~ msgstr "FPU, 32-bit harici yol"
+#~ msgid "ICache"
+#~ msgstr "ICache"
-#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
-#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Sayısal I/O"
+#~ msgid "DCache"
+#~ msgstr "DCache"
-#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "FPU yok, SDRAMC, ROMC, DMAC, PCIC, UART, Zamanlayıcı"
+#~ msgid "TLB"
+#~ msgstr "TLB"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
-#~ msgstr "FPU yok, SDRAMC, ROMC, UART, Zamanlayıcı, PCMCIA, IrDA"
+#~ msgid "ISA"
+#~ msgstr "ISA"
-#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr ""
-#~ "FPU yok, SDRAMC, ROMC, UART, Zamanlayıcı, PCMCIA, LCD Denetleyici, IrDA"
+#~ msgid "Specials"
+#~ msgstr "Özel"
-#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
-#~ msgstr "FPU yok, SDRAMC, ROMC, Zamanlayıcı, PCMCIA, LCD Denetleyici, IrDA"
+#~ msgid "No FPU (R2010), external caches"
+#~ msgstr "FPU (R2010) yok, harici önbellek"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
-#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, PCIC, UART, Zamanlayıcı"
+#~ msgid "No FPU (R3010)"
+#~ msgstr "FPU (R3010)"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
-#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, UART, Zamanlayıcı"
+#~ msgid "Virtual indexed L1 cache, L2 cache controller"
+#~ msgstr "Sanal endekslenmiş L1 önbellek, L2 önbellek denetleyici"
-#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
-#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, UART, Zamanlayıcı, I2C, LCD Denetleyici"
+#~ msgid "External L1 cache"
+#~ msgstr "Harici L1 önbellek"
+
+#~ msgid "Multiple chip CPU"
+#~ msgstr "Çoklu yongalı CPU"
#~ msgid ""
#~ "Mips16 isa extension, No FPU, 512k flash, 16k ram, DMAC, UART, Timer, "
@@ -193,62 +190,65 @@ msgstr "Debian Sparc"
#~ "Mips16 isa uzantısı, FPU yok, 512k flash, 16k bellek, DMAC, UART, "
#~ "Zamanlayıcı, I2C, Watchdog"
-#~ msgid "Multiple chip CPU"
-#~ msgstr "Çoklu yongalı CPU"
-
-#~ msgid "External L1 cache"
-#~ msgstr "Harici L1 önbellek"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer, I2C, LCD Controller"
+#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, UART, Zamanlayıcı, I2C, LCD Denetleyici"
-#~ msgid "Virtual indexed L1 cache, L2 cache controller"
-#~ msgstr "Sanal endekslenmiş L1 önbellek, L2 önbellek denetleyici"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, UART, Timer"
+#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, UART, Zamanlayıcı"
-#~ msgid "No FPU (R3010)"
-#~ msgstr "FPU (R3010)"
+#~ msgid "No FPU, DRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "FPU yok, DRAMC, ROMC, DMAC, PCIC, UART, Zamanlayıcı"
-#~ msgid "No FPU (R2010), external caches"
-#~ msgstr "FPU (R2010) yok, harici önbellek"
+#~ msgid "No FPU, SDRAMC, ROMC, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr "FPU yok, SDRAMC, ROMC, Zamanlayıcı, PCMCIA, LCD Denetleyici, IrDA"
-#~ msgid "Specials"
-#~ msgstr "Özel"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, LCD Controller, IrDA"
+#~ msgstr ""
+#~ "FPU yok, SDRAMC, ROMC, UART, Zamanlayıcı, PCMCIA, LCD Denetleyici, IrDA"
-#~ msgid "ISA"
-#~ msgstr "ISA"
+#~ msgid "No FPU, SDRAMC, ROMC, UART, Timer, PCMCIA, IrDA"
+#~ msgstr "FPU yok, SDRAMC, ROMC, UART, Zamanlayıcı, PCMCIA, IrDA"
-#~ msgid "TLB"
-#~ msgstr "TLB"
+#~ msgid "No FPU, SDRAMC, ROMC, DMAC, PCIC, UART, Timer"
+#~ msgstr "FPU yok, SDRAMC, ROMC, DMAC, PCIC, UART, Zamanlayıcı"
-#~ msgid "DCache"
-#~ msgstr "DCache"
+#~ msgid "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Digital I/O"
+#~ msgstr "2 10/100 Ethernet, 4 UART, IrDA, AC'97, I2C, 38 Sayısal I/O"
-#~ msgid "ICache"
-#~ msgstr "ICache"
+#~ msgid "FPU, 32-bit external bus"
+#~ msgstr "FPU, 32-bit harici yol"
-#~ msgid "Clock"
-#~ msgstr "Saat"
+#~ msgid "FPU, 64-bit external bus"
+#~ msgstr "FPU, 64-bit harici yol"
-#~ msgid "Date announced"
-#~ msgstr "Duyurulduğu tarihi"
+#~ msgid "FPU, 64-bit external bus, external L2 cache"
+#~ msgstr "FPU, 64-bit harici yol, harici L2 önbellek"
-#~ msgid "Vendor/Name"
-#~ msgstr "Üretici/İsim"
+#~ msgid "256 L2 cache on die"
+#~ msgstr "Yonga üzerinde 256 L2 önbellek"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian Motorola 680x0"
+#~ msgid "Mips 16"
+#~ msgstr "Mips 16"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid ""
+#~ "Mips 16, RTC, Keyboard, TouchPanel, Audio, Compact-Flash, UART, Parallel"
+#~ msgstr "Mips 16, Klavye, TouchPanel, Ses, Kompakt Flash, UART, Paralel"
-#~ msgid "Main"
-#~ msgstr "Temel"
+#~ msgid "Mips 16, Compact Flash, UART, Parallel, RTC, Audio, PCIC"
+#~ msgstr "Mips 16, Kompakt Flash, UART, Paralel, RTC, Ses, PCIC"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian Beowulf"
+#~ msgid ""
+#~ "Mips 16, LCD controller, Compact Flash, UART, Parallel, RTC, Keyboard, "
+#~ "USB, Touchpad, Audio"
+#~ msgstr ""
+#~ "Mips 16, LCD denetleyici, Kompakt Flash, UART, Paralel, RTC, Klavye, USB, "
+#~ "Touchpad, Audio"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian ARM"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian MIPS"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian AMD64"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian S/390"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Dizüstü bilgisayarlar için Debian"
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian Sparc64"
diff --git a/turkish/po/templates.tr.po b/turkish/po/templates.tr.po
index 6eb7734cc34..510ee943a18 100644
--- a/turkish/po/templates.tr.po
+++ b/turkish/po/templates.tr.po
@@ -76,7 +76,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
msgstr "<a href=\"m4_HOME/\">Debian ana sayfası</a>'na dönüş."
#: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:152
msgid "Home"
msgstr "Ana Sayfa"
@@ -117,7 +117,7 @@ msgid "Support"
msgstr "Destek"
#: ../../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 "Geliştiriciler Köşesi"
@@ -154,7 +154,7 @@ msgid "Miscellaneous"
msgstr "Çeşitli"
#: ../../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 "Debian'ı Edinme"
@@ -209,7 +209,7 @@ msgstr "sürüm 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -228,23 +228,23 @@ msgstr ""
"yazın. Diğer iletişim bilgileri için, Debian <a href=\"m4_HOME/contact"
"\">iletişim sayfası</a>'na bakın."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Son Güncelleme"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Telif Hakkı"
-#: ../../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 ""
-#: ../../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 "<a href=\"m4_HOME/license\" rel=\"copyright\">Lisans Şartları</a>"
-#: ../../english/template/debian/footer.wml:111
+#: ../../english/template/debian/footer.wml:112
#, fuzzy
#| msgid ""
#| "Debian is a registered trademark of Software in the Public Interest, Inc."
@@ -313,140 +313,150 @@ msgid "Debian Books"
msgstr "Debian Kitapları"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "Debian'a Yardım"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Liste Arşivleri"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Eposta Listeleri"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Sosyal Sözleşme"
-#: ../../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 "Site sponsorunu ziyaret edin"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Site haritası"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "Geliştiriciler&nbsp;veritabanı"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Debian Kitapları"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Debian Kurallar Kılavuzu"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Geliştirici Rehberi"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Yeni Geliştirici Kılavuzu"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Sürümün Önemli Hataları"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Lintian Raporları"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Kullanıcılara ilişkin liste arşivleri"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Geliştiricilere ilişkin liste arşivleri"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "i18n/l10n liste arşivleri"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Taşınanlara özel liste arşivleri"
-#: ../../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 "Hata takip sistemine ilişkin liste arşivleri"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Diğer liste arşivleri"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Özgür Yazılım"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Geliştirme"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Debian'a Yardım"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Hata raporları"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Platformlar/Mimariler"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Kurulum Kılavuzu"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "CD sağlayıcılar"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "CD/USB ISO kopyaları"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Ağdan kurulum"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Hazır sistemler"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Debian-Edu projesi"
-#: ../../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 "Kalite Güvence"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Paket Takip Sistemi"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Debian Geliştirici Paketlerine Genel bakış"
@@ -537,489 +547,490 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "<a href=\"./\">Debian konuşmacıları sayfası</a>'na dönüş."
-#~ msgid "More information"
-#~ msgstr "Daha fazla bilgi için"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Çok Yakında"
-
-#~ msgid "link may no longer be valid"
-#~ msgstr "bağlantı artık geçerli olmayabilir"
-
-#~ msgid "When"
-#~ msgstr "Ne Zaman"
-
-#~ msgid "Where"
-#~ msgstr "Nerede"
+#~ msgid "Select a server near you"
+#~ msgstr "Yakınınızda bir sunucu seçin"
-#~ msgid "More Info"
-#~ msgstr "Daha fazla bilgi için"
+#~ msgid "More information:"
+#~ msgstr "Daha fazla bilgi:"
-#~ msgid "Debian Involvement"
-#~ msgstr "Debian Katılım"
+#~ msgid "Taken by:"
+#~ msgstr "Üstlenen:"
-#~ msgid "Main Coordinator"
-#~ msgstr "Ana Koordinatör"
+#~ msgid "Nobody"
+#~ msgstr "Hiçkimse"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Proje</th><th>Koordinatörü</th>"
+#~ msgid "Rating:"
+#~ msgstr "Önemi:"
-#~ msgid "Related Links"
-#~ msgstr "İlgili bağlantılar"
+#~ msgid "List of Consultants"
+#~ msgstr "Danışman Listesi"
-#~ msgid "Latest News"
-#~ msgstr "Güncel Haberler"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "<a href=\"./\">Debian danışmanlar sayfası</a>'na dönüş."
-#~ msgid "Download calendar entry"
-#~ msgstr "Takvim girdisini indir"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Diğer <a href=\"./\">Debian haberlerine</a> veya <a href=\"m4_HOME/"
-#~ "\">Debian ana sayfasına</a> dönüş."
+#, fuzzy
+#~| msgid "download with jigdo"
+#~ msgid "Download with Jigdo"
+#~ msgstr "jigdo ile indir"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (ölü bağlantı)"
+#, fuzzy
+#~| msgid "download via http/ftp"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "http/ftp ile indir"
#, 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>."
-#~ msgstr ""
-#~ "Bu bültenin haftalık olarak eposta adresinize gönderilmesini isterseniz, "
-#~ "<a href=\"https://lists.debian.org/debian-news/\">debian-news eposta "
-#~ "listesine</a> üye olmanız yeterlidir."
+#~| msgid "Network install"
+#~ msgid "Network Install"
+#~ msgstr "Ağdan kurulum"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "Bu bültenin <a href=\"../../\">Eski sayıları</a> mevcut."
+#, fuzzy
+#~| msgid "<void id=\"dc_faq\" />faq"
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_faq\" />sss"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~| msgid "<void id=\"dc_misc\" />misc"
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />çeşitli"
#, 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>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~| msgid "<void id=\"dc_faq\" />faq"
+#~ msgid "<void id=\"dc_artwork\" />Artwork"
+#~ msgstr "<void id=\"dc_faq\" />sss"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
-#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">"
-#~ "%s</a> tarafından düzenlendi."
+#~| msgid "<void id=\"dc_misc\" />misc"
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_misc\" />çeşitli"
#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~| "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~| msgid "<void id=\"dc_misc\" />misc"
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_misc\" />çeşitli"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />%s tarafından çevirildi."
+#~ msgid "Debian CD team"
+#~ msgstr "Debian CD ekibi"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />%s tarafından çevirildi."
+#~ msgid "debian_on_cd"
+#~ msgstr "debian_cd"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />%s tarafından çevirildi."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />sss"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />%s tarafından çevirildi."
+#~ msgid "jigdo"
+#~ msgstr "jigdo"
-#~ msgid "List of Speakers"
-#~ msgstr "Konuşmacı Listesi"
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "<a href=\"./\">Debian konuşmacıları sayfası</a>'na dönüş."
+#~ msgid "buy"
+#~ msgstr "satın_al"
-#~ 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>."
-#~ msgstr ""
-#~ "Bu bültenin haftalık olarak eposta adresinize gönderilmesini isterseniz, "
-#~ "<a href=\"https://lists.debian.org/debian-news/\">debian-news eposta "
-#~ "listesine</a> üye olmanız yeterlidir."
+#~ msgid "net_install"
+#~ msgstr "ağdan_kurulum"
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />çeşitli"
#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~ "CD/DVD'ler için İngilizce dilinde <a href=\"/MailingLists/disclaimer"
+#~ "\">kamuya açık eposta listesi</a>:"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">"
-#~ "%s</a> tarafından düzenlendi."
+#, fuzzy
+#~| msgid "Donations"
+#~ msgid "Nominations"
+#~ msgstr "Bağışlar"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#, fuzzy
+#~| msgid "Debian CD team"
+#~ msgid "Debate"
+#~ msgstr "Debian CD ekibi"
-#~ msgid "No requests for adoption"
-#~ msgstr "Herhangi bir el değiştirme talebi yok"
+#, fuzzy
+#~| msgid "proposed"
+#~ msgid "Proposer"
+#~ msgstr "önerilen"
-#~ msgid "No orphaned packages"
-#~ msgstr "Sahipsiz bırakılmış bir paket yok"
+#, fuzzy
+#~| msgid "Discussion"
+#~ msgid "Minimum Discussion"
+#~ msgstr "Değerlendirme"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "El değiştirmeyi bekleyen bir paket yok"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Sponsor Aranıyor"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Hazırlanmayı bekleyen bir paket yok"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Fikir&nbsp;Alışverişi&nbsp;Sırasında"
-#~ msgid "No Requested packages"
-#~ msgstr "İstenmiş bir paket yok"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Açık&nbsp;Anketler"
-#~ msgid "No help requested"
-#~ msgstr "Herhangi bir yardım istenmemiş"
+#~ msgid "Decided"
+#~ msgstr "Kararlaştırılan"
-#~ msgid "in adoption since today."
-#~ msgstr "bugün itibarıyla el değiştirme sürecinde"
+#~ msgid "Withdrawn"
+#~ msgstr "Geri alınmış"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "dünden beri el değiştirme sürecinde"
+#~ msgid "Other"
+#~ msgstr "Diğer"
-#~ msgid "%s days in adoption."
-#~ msgstr "%s günden beri el değiştirme sürecinde"
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "Ana&nbsp;Anket&nbsp;Sayfası"
-#~ msgid "in preparation since today."
-#~ msgstr "bugün itibarıyla hazırlanmaya başladı"
+#~ msgid "How&nbsp;To"
+#~ msgstr "Nasıl"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "dünden beri hazırlanıyor"
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Öneri&nbsp;Gönder"
-#~ msgid "%s days in preparation."
-#~ msgstr "%s günden beri hazırlanıyor"
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Öneri&nbsp;Değiştir"
-#~ msgid "requested today."
-#~ msgstr "bugün istenmiş"
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Öneri&nbsp;İzle"
-#~ msgid "requested yesterday."
-#~ msgstr "dün istenmiş"
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Sonuçlara&nbsp;Gözat"
-#~ msgid "requested %s days ago."
-#~ msgstr "%s gün önce istenmiş"
+#~ msgid "Vote"
+#~ msgstr "Oyla"
-#~ msgid "package info"
-#~ msgstr "paket bilgisi"
+#~ msgid ""
+#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
+#~ "url />\">original advisory</a>."
+#~ msgstr ""
+#~ "Yukarıdaki dosyaların MD5 checksum değerlerini <a href=\"%attributes"
+#~ "\">orjinal duyuru</a>'dan edinebilirsiniz."
-#~ msgid "buy pre-made images"
-#~ msgstr "önceden hazırlanmış imajları satın al"
+#~ msgid "Architecture-independent component:"
+#~ msgstr "Mimari-bağımsız parça:"
-#~ msgid "network install"
-#~ msgstr "ağ üzerinden kurulum"
+#~ msgid "Source:"
+#~ msgstr "Kaynak:"
-#~ msgid "License Information"
-#~ msgstr "Lisans Bilgileri"
+#~ msgid "Fixed in"
+#~ msgstr "Düzeltilmiş hali"
-#~ msgid "DLS Index"
-#~ msgstr "DLÖ Listesi"
+#~ msgid "Vulnerable"
+#~ msgstr "Etkilenebilir"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "Debian Security Advisories"
+#~ msgstr "Debian Güvenlik Duyuruları"
-#~ msgid "DFSG FAQ"
-#~ msgstr "DFSG SSS"
+#~ msgid "Debian Security Advisory"
+#~ msgstr "Debian Güvenlik Duyurusu"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Debian-Legal Arşivi"
+#~ msgid "Back to other <a href=\"./\">Debian news</a>."
+#~ msgstr "Diğer <a href=\"./\">Debian haberlerine</a> geri dön."
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s &ndash; %s: %s"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "Bizimle iletişim sağlamak için Debian <a href=\"m4_HOME/contact\">kontak "
+#~ "sayfası</a>'nı ziyaret edin"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s &ndash; %s, Sürüm %s: %s"
+#~ msgid "discussed"
+#~ msgstr "görüşülmüş"
-#~ msgid "Date published"
-#~ msgstr "Yayımlandığı tarih"
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Debian Lisans Özetlerine (DLÖ) genel bir bakış için <a href=\"./\">lisans "
+#~ "bilgileri</a> sayfasına bakın."
-#~ msgid "License"
-#~ msgstr "Lisans"
+#~ msgid "Not Redistributable"
+#~ msgstr "Dağıtılabilir durumda değil"
-#~ msgid "Version"
-#~ msgstr "Sürüm"
+#~ msgid "Non-Free"
+#~ msgstr "Özgür-Olmayan"
-#~ msgid "Summary"
-#~ msgstr "Özet"
+#~ msgid "Free"
+#~ msgstr "Özgür"
-#~ msgid "Justification"
-#~ msgstr "Gerekçe"
+#~ msgid "not redistributable"
+#~ msgstr "dağıtılabilir durumda değil"
-#~ msgid "Original Summary"
-#~ msgstr "Özgün Özet"
+#~ msgid "non-free"
+#~ msgstr "özgür-değil"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "<summary-author/> tarafından hazırlanmış özetin özgün hali <a href="
-#~ "\"<summary-url/>\">liste arşivlerinde</a> bulunabilir."
+#~ msgid "free"
+#~ msgstr "özgür"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Bu özet <summary-author/> tarafından hazırlanmıştır."
+#~ msgid "License text"
+#~ msgstr "Lisans metni"
#~ msgid "License text (translated)"
#~ msgstr "Lisans metni (çeviri)"
-#~ msgid "License text"
-#~ msgstr "Lisans metni"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Bu özet <summary-author/> tarafından hazırlanmıştır."
-#~ msgid "free"
-#~ msgstr "özgür"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "<summary-author/> tarafından hazırlanmış özetin özgün hali <a href="
+#~ "\"<summary-url/>\">liste arşivlerinde</a> bulunabilir."
-#~ msgid "non-free"
-#~ msgstr "özgür-değil"
+#~ msgid "Original Summary"
+#~ msgstr "Özgün Özet"
-#~ msgid "not redistributable"
-#~ msgstr "dağıtılabilir durumda değil"
+#~ msgid "Justification"
+#~ msgstr "Gerekçe"
-#~ msgid "Free"
-#~ msgstr "Özgür"
+#~ msgid "Summary"
+#~ msgstr "Özet"
-#~ msgid "Non-Free"
-#~ msgstr "Özgür-Olmayan"
+#~ msgid "Version"
+#~ msgstr "Sürüm"
-#~ msgid "Not Redistributable"
-#~ msgstr "Dağıtılabilir durumda değil"
+#~ msgid "License"
+#~ msgstr "Lisans"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Debian Lisans Özetlerine (DLÖ) genel bir bakış için <a href=\"./\">lisans "
-#~ "bilgileri</a> sayfasına bakın."
+#~ msgid "Date published"
+#~ msgstr "Yayımlandığı tarih"
-#~ msgid "discussed"
-#~ msgstr "görüşülmüş"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s &ndash; %s, Sürüm %s: %s"
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "Bizimle iletişim sağlamak için Debian <a href=\"m4_HOME/contact\">kontak "
-#~ "sayfası</a>'nı ziyaret edin"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s &ndash; %s: %s"
-#~ msgid "Back to other <a href=\"./\">Debian news</a>."
-#~ msgstr "Diğer <a href=\"./\">Debian haberlerine</a> geri dön."
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Debian-Legal Arşivi"
-#~ msgid "Debian Security Advisory"
-#~ msgstr "Debian Güvenlik Duyurusu"
+#~ msgid "DFSG FAQ"
+#~ msgstr "DFSG SSS"
-#~ msgid "Debian Security Advisories"
-#~ msgstr "Debian Güvenlik Duyuruları"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Vulnerable"
-#~ msgstr "Etkilenebilir"
+#~ msgid "DLS Index"
+#~ msgstr "DLÖ Listesi"
-#~ msgid "Fixed in"
-#~ msgstr "Düzeltilmiş hali"
+#~ msgid "License Information"
+#~ msgstr "Lisans Bilgileri"
-#~ msgid "Source:"
-#~ msgstr "Kaynak:"
+#~ msgid "network install"
+#~ msgstr "ağ üzerinden kurulum"
-#~ msgid "Architecture-independent component:"
-#~ msgstr "Mimari-bağımsız parça:"
+#~ msgid "buy pre-made images"
+#~ msgstr "önceden hazırlanmış imajları satın al"
-#~ msgid ""
-#~ "MD5 checksums of the listed files are available in the <a href=\"<get-var "
-#~ "url />\">original advisory</a>."
-#~ msgstr ""
-#~ "Yukarıdaki dosyaların MD5 checksum değerlerini <a href=\"%attributes"
-#~ "\">orjinal duyuru</a>'dan edinebilirsiniz."
+#~ msgid "package info"
+#~ msgstr "paket bilgisi"
-#~ msgid "Vote"
-#~ msgstr "Oyla"
+#~ msgid "requested %s days ago."
+#~ msgstr "%s gün önce istenmiş"
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Sonuçlara&nbsp;Gözat"
+#~ msgid "requested yesterday."
+#~ msgstr "dün istenmiş"
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Öneri&nbsp;İzle"
+#~ msgid "requested today."
+#~ msgstr "bugün istenmiş"
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Öneri&nbsp;Değiştir"
+#~ msgid "%s days in preparation."
+#~ msgstr "%s günden beri hazırlanıyor"
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Öneri&nbsp;Gönder"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "dünden beri hazırlanıyor"
-#~ msgid "How&nbsp;To"
-#~ msgstr "Nasıl"
+#~ msgid "in preparation since today."
+#~ msgstr "bugün itibarıyla hazırlanmaya başladı"
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "Ana&nbsp;Anket&nbsp;Sayfası"
+#~ msgid "%s days in adoption."
+#~ msgstr "%s günden beri el değiştirme sürecinde"
-#~ msgid "Other"
-#~ msgstr "Diğer"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "dünden beri el değiştirme sürecinde"
-#~ msgid "Withdrawn"
-#~ msgstr "Geri alınmış"
+#~ msgid "in adoption since today."
+#~ msgstr "bugün itibarıyla el değiştirme sürecinde"
-#~ msgid "Decided"
-#~ msgstr "Kararlaştırılan"
+#~ msgid "No help requested"
+#~ msgstr "Herhangi bir yardım istenmemiş"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Açık&nbsp;Anketler"
+#~ msgid "No Requested packages"
+#~ msgstr "İstenmiş bir paket yok"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Fikir&nbsp;Alışverişi&nbsp;Sırasında"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Hazırlanmayı bekleyen bir paket yok"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Sponsor Aranıyor"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "El değiştirmeyi bekleyen bir paket yok"
-#, fuzzy
-#~| msgid "Discussion"
-#~ msgid "Minimum Discussion"
-#~ msgstr "Değerlendirme"
+#~ msgid "No orphaned packages"
+#~ msgstr "Sahipsiz bırakılmış bir paket yok"
-#, fuzzy
-#~| msgid "proposed"
-#~ msgid "Proposer"
-#~ msgstr "önerilen"
+#~ msgid "No requests for adoption"
+#~ msgstr "Herhangi bir el değiştirme talebi yok"
-#, fuzzy
-#~| msgid "Debian CD team"
-#~ msgid "Debate"
-#~ msgstr "Debian CD ekibi"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
-#, fuzzy
-#~| msgid "Donations"
-#~ msgid "Nominations"
-#~ msgstr "Bağışlar"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">"
+#~ "%s</a> tarafından düzenlendi."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "CD/DVD'ler için İngilizce dilinde <a href=\"/MailingLists/disclaimer"
-#~ "\">kamuya açık eposta listesi</a>:"
+#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />çeşitli"
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
-#~ msgid "net_install"
-#~ msgstr "ağdan_kurulum"
+#~ 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>."
+#~ msgstr ""
+#~ "Bu bültenin haftalık olarak eposta adresinize gönderilmesini isterseniz, "
+#~ "<a href=\"https://lists.debian.org/debian-news/\">debian-news eposta "
+#~ "listesine</a> üye olmanız yeterlidir."
-#~ msgid "buy"
-#~ msgstr "satın_al"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "<a href=\"./\">Debian konuşmacıları sayfası</a>'na dönüş."
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "List of Speakers"
+#~ msgstr "Konuşmacı Listesi"
-#~ msgid "jigdo"
-#~ msgstr "jigdo"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />%s tarafından çevirildi."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />sss"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />%s tarafından çevirildi."
-#~ msgid "debian_on_cd"
-#~ msgstr "debian_cd"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />%s tarafından çevirildi."
-#~ msgid "Debian CD team"
-#~ msgstr "Debian CD ekibi"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />%s tarafından çevirildi."
#, fuzzy
-#~| msgid "<void id=\"dc_misc\" />misc"
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_misc\" />çeşitli"
+#~| msgid ""
+#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~| "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
#, fuzzy
-#~| msgid "<void id=\"dc_misc\" />misc"
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_misc\" />çeşitli"
+#~| msgid ""
+#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
+#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">"
+#~ "%s</a> tarafından düzenlendi."
#, fuzzy
-#~| msgid "<void id=\"dc_faq\" />faq"
-#~ msgid "<void id=\"dc_artwork\" />Artwork"
-#~ msgstr "<void id=\"dc_faq\" />sss"
+#~| 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>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
#, fuzzy
-#~| msgid "<void id=\"dc_misc\" />misc"
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />çeşitli"
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Debian Haftalık Haberlerin bu sayısı <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
-#, fuzzy
-#~| msgid "<void id=\"dc_faq\" />faq"
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_faq\" />sss"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "Bu bültenin <a href=\"../../\">Eski sayıları</a> mevcut."
#, fuzzy
-#~| msgid "Network install"
-#~ msgid "Network Install"
-#~ msgstr "Ağdan kurulum"
+#~| 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>."
+#~ msgstr ""
+#~ "Bu bültenin haftalık olarak eposta adresinize gönderilmesini isterseniz, "
+#~ "<a href=\"https://lists.debian.org/debian-news/\">debian-news eposta "
+#~ "listesine</a> üye olmanız yeterlidir."
-#, fuzzy
-#~| msgid "download via http/ftp"
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "http/ftp ile indir"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (ölü bağlantı)"
-#, fuzzy
-#~| msgid "download with jigdo"
-#~ msgid "Download with Jigdo"
-#~ msgstr "jigdo ile indir"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Diğer <a href=\"./\">Debian haberlerine</a> veya <a href=\"m4_HOME/"
+#~ "\">Debian ana sayfasına</a> dönüş."
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Download calendar entry"
+#~ msgstr "Takvim girdisini indir"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "<a href=\"./\">Debian danışmanlar sayfası</a>'na dönüş."
+#~ msgid "Latest News"
+#~ msgstr "Güncel Haberler"
-#~ msgid "List of Consultants"
-#~ msgstr "Danışman Listesi"
+#~ msgid "Related Links"
+#~ msgstr "İlgili bağlantılar"
-#~ msgid "Rating:"
-#~ msgstr "Önemi:"
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Proje</th><th>Koordinatörü</th>"
-#~ msgid "Nobody"
-#~ msgstr "Hiçkimse"
+#~ msgid "Main Coordinator"
+#~ msgstr "Ana Koordinatör"
-#~ msgid "Taken by:"
-#~ msgstr "Üstlenen:"
+#~ msgid "Debian Involvement"
+#~ msgstr "Debian Katılım"
-#~ msgid "More information:"
-#~ msgstr "Daha fazla bilgi:"
+#~ msgid "More Info"
+#~ msgstr "Daha fazla bilgi için"
-#~ msgid "Select a server near you"
-#~ msgstr "Yakınınızda bir sunucu seçin"
+#~ msgid "Where"
+#~ msgstr "Nerede"
+
+#~ msgid "When"
+#~ msgstr "Ne Zaman"
+
+#~ msgid "link may no longer be valid"
+#~ msgstr "bağlantı artık geçerli olmayabilir"
+
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Çok Yakında"
+
+#~ msgid "More information"
+#~ msgstr "Daha fazla bilgi için"
diff --git a/turkish/po/vendors.tr.po b/turkish/po/vendors.tr.po
index 0b6b78e10dc..19cb110f7eb 100644
--- a/turkish/po/vendors.tr.po
+++ b/turkish/po/vendors.tr.po
@@ -19,146 +19,137 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Satıcı:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "Debian Sayfası için URL:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Debian'a Katkıya İzin veriyor:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Ülke:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Uluslararası "
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "eposta:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "CD tipi:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "DVD tipi:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Mimariler:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
#, fuzzy
#| msgid "Vendor:"
msgid "Vendor"
msgstr "Satıcı:"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
#, fuzzy
#| msgid "Allows Contribution to Debian:"
msgid "Allows Contributions"
msgstr "Debian'a Katkıya İzin veriyor:"
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
#, fuzzy
#| msgid "Architectures:"
msgid "Architectures"
msgstr "Mimariler:"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
#, fuzzy
#| msgid "Ship International:"
msgid "Ship International"
msgstr "Uluslararası "
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr ""
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:54
+#: ../../english/CD/vendors/vendors.CD.def:44
#, fuzzy
#| msgid "Vendor:"
msgid "Vendor Home"
msgstr "Satıcı:"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
#, fuzzy
#| msgid "email:"
msgid "email"
msgstr "eposta:"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "Avrupa içinde"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "Bazı bölgelere"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "kaynak"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "ve"
-#~ msgid "updated monthly"
-#~ msgstr "aylık güncelleniyor"
+#~ msgid "Official CD"
+#~ msgstr "Resmi CD"
-#~ msgid "updated twice weekly"
-#~ msgstr "haftada iki defa güncelleniyor"
+#~ msgid "Development Snapshot"
+#~ msgstr "Geliştirme Sürümü"
-#~ msgid "updated weekly"
-#~ msgstr "haftalık güncelleniyor"
+#~ msgid "Vendor Release"
+#~ msgstr "Satıcı Sürümü"
-#~ msgid "reseller"
-#~ msgstr "tekrar dağıtıcı"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Çoklu Dağıtım"
-#~ msgid "reseller of $var"
-#~ msgstr "$var için tekrar dağıtıcı"
+#~ msgid "non-US included"
+#~ msgstr "non-US dahil"
-#~ msgid "Custom Release"
-#~ msgstr "Özel Sürüm"
+#~ msgid "non-free included"
+#~ msgstr "non-free dahil"
+
+#~ msgid "contrib included"
+#~ msgstr "contrib dahil"
#~ msgid "vendor additions"
#~ msgstr "satıcı eklemeleri"
-#~ msgid "contrib included"
-#~ msgstr "contrib dahil"
+#~ msgid "Custom Release"
+#~ msgstr "Özel Sürüm"
-#~ msgid "non-free included"
-#~ msgstr "non-free dahil"
+#~ msgid "reseller of $var"
+#~ msgstr "$var için tekrar dağıtıcı"
-#~ msgid "non-US included"
-#~ msgstr "non-US dahil"
+#~ msgid "reseller"
+#~ msgstr "tekrar dağıtıcı"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Çoklu Dağıtım"
+#~ msgid "updated weekly"
+#~ msgstr "haftalık güncelleniyor"
-#~ msgid "Vendor Release"
-#~ msgstr "Satıcı Sürümü"
+#~ msgid "updated twice weekly"
+#~ msgstr "haftada iki defa güncelleniyor"
-#~ msgid "Development Snapshot"
-#~ msgstr "Geliştirme Sürümü"
+#~ msgid "updated monthly"
+#~ msgstr "aylık güncelleniyor"
-#~ msgid "Official CD"
-#~ msgstr "Resmi CD"
+#~ msgid "Architectures:"
+#~ msgstr "Mimariler:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "DVD tipi:"
+
+#~ msgid "CD Type:"
+#~ msgstr "CD tipi:"
+
+#~ msgid "email:"
+#~ msgstr "eposta:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Uluslararası "
+
+#~ msgid "Country:"
+#~ msgstr "Ülke:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Debian'a Katkıya İzin veriyor:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "Debian Sayfası için URL:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Satıcı:"
diff --git a/turkish/po/vote.tr.po b/turkish/po/vote.tr.po
index ff8863ccc9c..c15d4806ddb 100644
--- a/turkish/po/vote.tr.po
+++ b/turkish/po/vote.tr.po
@@ -28,237 +28,253 @@ msgid "Time Line"
msgstr ""
#: ../../english/template/debian/votebar.wml:19
+msgid "Summary"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:22
#, fuzzy
#| msgid "Donations"
msgid "Nominations"
msgstr "Bağışlar"
-#: ../../english/template/debian/votebar.wml:22
+#: ../../english/template/debian/votebar.wml:25
#, fuzzy
#| msgid "Debian CD team"
msgid "Debate"
msgstr "Debian CD ekibi"
-#: ../../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 "proposed"
msgid "Proposer"
msgstr "önerilen"
-#: ../../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 "Discussion"
msgid "Minimum Discussion"
msgstr "Değerlendirme"
-#: ../../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 "Sponsor Aranıyor"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Fikir&nbsp;Alışverişi&nbsp;Sırasında"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Açık&nbsp;Anketler"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Kararlaştırılan"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Geri alınmış"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Diğer"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Ana&nbsp;Anket&nbsp;Sayfası"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Nasıl"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Öneri&nbsp;Gönder"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Öneri&nbsp;Değiştir"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Öneri&nbsp;İzle"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Sonuçlara&nbsp;Gözat"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Oyla"
diff --git a/ukrainian/po/bugs.uk.po b/ukrainian/po/bugs.uk.po
index 770fb52e69e..e4f04bfaf7e 100644
--- a/ukrainian/po/bugs.uk.po
+++ b/ukrainian/po/bugs.uk.po
@@ -172,146 +172,146 @@ msgstr "заархівовані помилки"
msgid "Archived and Unarchived"
msgstr ""
-#~ msgid "Exclude tag:"
-#~ msgstr "Не включаючи мітки:"
-
-#~ msgid "Include tag:"
-#~ msgstr "Включаючи мітки:"
+#~ msgid "Flags:"
+#~ msgstr "Прапорці:"
-#~ msgid "lfs"
-#~ msgstr "lfs"
+#~ msgid "active bugs"
+#~ msgstr "активні помилки"
-#~ msgid "ipv6"
-#~ msgstr "ipv6"
+#~ msgid "display merged bugs only once"
+#~ msgstr "показувати злиті помилки лише раз"
-#~ msgid "wontfix"
-#~ msgstr "wontfix"
+#~ msgid "no ordering by status or severity"
+#~ msgstr "не впорядковувати по стану чи важливості"
-#~ msgid "upstream"
-#~ msgstr "upstream"
+#~ msgid "don't show table of contents in the header"
+#~ msgstr "не показувати зміст в заголовку"
-#~ msgid "unreproducible"
-#~ msgstr "unreproducible"
+#~ msgid "don't show statistics in the footer"
+#~ msgstr "не показувати статистику в кінці"
-#~ msgid "security"
-#~ msgstr "security"
+#~ msgid "proposed-updates"
+#~ msgstr "proposed-updates"
-#~ msgid "patch"
-#~ msgstr "patch"
+#~ msgid "testing-proposed-updates"
+#~ msgstr "testing-proposed-updates"
-#~ msgid "moreinfo"
-#~ msgstr "moreinfo"
+#~ msgid "Package version:"
+#~ msgstr "Версія пакунка:"
-#~ msgid "l10n"
-#~ msgstr "l10n"
+#~ msgid "Distribution:"
+#~ msgstr "Дистрибутив:"
-#~ msgid "help"
-#~ msgstr "help"
+#~ msgid "bugs"
+#~ msgstr "помилки"
-#~ msgid "fixed-upstream"
-#~ msgstr "fixed-upstream"
+#~ msgid "open"
+#~ msgstr "відкриті"
-#~ msgid "fixed-in-experimental"
-#~ msgstr "fixed-in-experimental"
+#~ msgid "forwarded"
+#~ msgstr "переслані"
-#~ msgid "d-i"
-#~ msgstr "d-i"
+#~ msgid "pending"
+#~ msgstr "в очікуванні"
-#~ msgid "confirmed"
-#~ msgstr "confirmed"
+#~ msgid "fixed"
+#~ msgstr "виправлені"
-#~ msgid "sid"
-#~ msgstr "sid"
+#~ msgid "done"
+#~ msgstr "закриті"
-#~ msgid "etch-ignore"
-#~ msgstr "etch-ignore"
+#~ msgid "Include status:"
+#~ msgstr "Включаючи стан:"
-#~ msgid "etch"
-#~ msgstr "etch"
+#~ msgid "Exclude status:"
+#~ msgstr "Не включаючи стан:"
-#~ msgid "sarge-ignore"
-#~ msgstr "sarge-ignore"
+#~ msgid "critical"
+#~ msgstr "критична"
-#~ msgid "woody"
-#~ msgstr "woody"
+#~ msgid "grave"
+#~ msgstr "дуже серйозна"
-#~ msgid "potato"
-#~ msgstr "potato"
+#~ msgid "serious"
+#~ msgstr "серйозна"
-#~ msgid "Exclude severity:"
-#~ msgstr "Не включаючи важливість"
+#~ msgid "important"
+#~ msgstr "важлива"
-#~ msgid "Include severity:"
-#~ msgstr "Включаючи важливість"
+#~ msgid "minor"
+#~ msgstr "незначна"
#~ msgid "wishlist"
#~ msgstr "побажання"
-#~ msgid "minor"
-#~ msgstr "незначна"
+#~ msgid "Include severity:"
+#~ msgstr "Включаючи важливість"
-#~ msgid "important"
-#~ msgstr "важлива"
+#~ msgid "Exclude severity:"
+#~ msgstr "Не включаючи важливість"
-#~ msgid "serious"
-#~ msgstr "серйозна"
+#~ msgid "potato"
+#~ msgstr "potato"
-#~ msgid "grave"
-#~ msgstr "дуже серйозна"
+#~ msgid "woody"
+#~ msgstr "woody"
-#~ msgid "critical"
-#~ msgstr "критична"
+#~ msgid "sarge-ignore"
+#~ msgstr "sarge-ignore"
-#~ msgid "Exclude status:"
-#~ msgstr "Не включаючи стан:"
+#~ msgid "etch"
+#~ msgstr "etch"
-#~ msgid "Include status:"
-#~ msgstr "Включаючи стан:"
+#~ msgid "etch-ignore"
+#~ msgstr "etch-ignore"
-#~ msgid "done"
-#~ msgstr "закриті"
+#~ msgid "sid"
+#~ msgstr "sid"
-#~ msgid "fixed"
-#~ msgstr "виправлені"
+#~ msgid "confirmed"
+#~ msgstr "confirmed"
-#~ msgid "pending"
-#~ msgstr "в очікуванні"
+#~ msgid "d-i"
+#~ msgstr "d-i"
-#~ msgid "forwarded"
-#~ msgstr "переслані"
+#~ msgid "fixed-in-experimental"
+#~ msgstr "fixed-in-experimental"
-#~ msgid "open"
-#~ msgstr "відкриті"
+#~ msgid "fixed-upstream"
+#~ msgstr "fixed-upstream"
-#~ msgid "bugs"
-#~ msgstr "помилки"
+#~ msgid "help"
+#~ msgstr "help"
-#~ msgid "Distribution:"
-#~ msgstr "Дистрибутив:"
+#~ msgid "l10n"
+#~ msgstr "l10n"
-#~ msgid "Package version:"
-#~ msgstr "Версія пакунка:"
+#~ msgid "moreinfo"
+#~ msgstr "moreinfo"
-#~ msgid "testing-proposed-updates"
-#~ msgstr "testing-proposed-updates"
+#~ msgid "patch"
+#~ msgstr "patch"
-#~ msgid "proposed-updates"
-#~ msgstr "proposed-updates"
+#~ msgid "security"
+#~ msgstr "security"
-#~ msgid "don't show statistics in the footer"
-#~ msgstr "не показувати статистику в кінці"
+#~ msgid "unreproducible"
+#~ msgstr "unreproducible"
-#~ msgid "don't show table of contents in the header"
-#~ msgstr "не показувати зміст в заголовку"
+#~ msgid "upstream"
+#~ msgstr "upstream"
-#~ msgid "no ordering by status or severity"
-#~ msgstr "не впорядковувати по стану чи важливості"
+#~ msgid "wontfix"
+#~ msgstr "wontfix"
-#~ msgid "display merged bugs only once"
-#~ msgstr "показувати злиті помилки лише раз"
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
-#~ msgid "active bugs"
-#~ msgstr "активні помилки"
+#~ msgid "lfs"
+#~ msgstr "lfs"
-#~ msgid "Flags:"
-#~ msgstr "Прапорці:"
+#~ msgid "Include tag:"
+#~ msgstr "Включаючи мітки:"
+
+#~ msgid "Exclude tag:"
+#~ msgstr "Не включаючи мітки:"
diff --git a/ukrainian/po/cdimage.uk.po b/ukrainian/po/cdimage.uk.po
index 5aa37082ba5..34b4c955755 100644
--- a/ukrainian/po/cdimage.uk.po
+++ b/ukrainian/po/cdimage.uk.po
@@ -15,18 +15,16 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 " Відбиток ключа"
-#: ../../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/ukrainian/po/distrib.uk.po b/ukrainian/po/distrib.uk.po
index f98be3b219a..2b53f93edcc 100644
--- a/ukrainian/po/distrib.uk.po
+++ b/ukrainian/po/distrib.uk.po
@@ -138,103 +138,111 @@ msgid "ARM"
msgstr "ARM"
#: ../../english/releases/arches.data:11
-msgid "EABI ARM"
+msgid "64-bit ARM (AArch64)"
msgstr ""
#: ../../english/releases/arches.data:12
-msgid "Hard Float ABI ARM"
+msgid "EABI ARM"
msgstr ""
#: ../../english/releases/arches.data:13
+msgid "Hard Float ABI ARM"
+msgstr ""
+
+#: ../../english/releases/arches.data:14
#, fuzzy
#| msgid "HP PA/RISC"
msgid "HP PA-RISC"
msgstr "HP PA/RISC"
-#: ../../english/releases/arches.data:14
+#: ../../english/releases/arches.data:15
#, fuzzy
#| msgid "Hurd (i386)"
msgid "Hurd 32-bit PC (i386)"
msgstr "Hurd (i386)"
-#: ../../english/releases/arches.data:15
+#: ../../english/releases/arches.data:16
msgid "32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:16
+#: ../../english/releases/arches.data:17
#, fuzzy
#| msgid "Intel IA-64"
msgid "Intel Itanium IA-64"
msgstr "Intel IA-64"
-#: ../../english/releases/arches.data:17
+#: ../../english/releases/arches.data:18
msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
-#: ../../english/releases/arches.data:18
+#: ../../english/releases/arches.data:19
msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
-#: ../../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 ""
-#: ../../english/releases/arches.data:21
+#: ../../english/releases/arches.data:22
msgid "MIPS (little endian)"
msgstr ""
-#: ../../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 "non-US"
-#~ msgstr "non-US"
-
-#~ msgid "Search case sensitive"
-#~ msgstr "Пошук чутливий до регістру"
+#~ msgid "packages that contain files or directories named like this"
+#~ msgstr "пакунки, що містять файли чи директорії з такою назвою"
-#~ msgid "Allow searching on subwords"
-#~ msgstr "Шукати частини слів"
+#~ msgid "all files in this package"
+#~ msgstr "всі файли в цьому пакунку"
-#~ msgid "MIPS (DEC)"
-#~ msgstr "MIPS (DEC)"
+#~ msgid "Case sensitive"
+#~ msgstr "Враховувати регістр"
-#~ msgid "MIPS"
-#~ msgstr "MIPS"
+#~ msgid "no"
+#~ msgstr "ні"
-#~ msgid "AMD64"
-#~ msgstr "AMD64"
+#~ msgid "yes"
+#~ msgstr "так"
#~ msgid "Intel x86"
#~ msgstr "Intel x86"
-#~ msgid "yes"
-#~ msgstr "так"
+#~ msgid "AMD64"
+#~ msgstr "AMD64"
-#~ msgid "no"
-#~ msgstr "ні"
+#~ msgid "MIPS"
+#~ msgstr "MIPS"
-#~ msgid "Case sensitive"
-#~ msgstr "Враховувати регістр"
+#~ msgid "MIPS (DEC)"
+#~ msgstr "MIPS (DEC)"
-#~ msgid "all files in this package"
-#~ msgstr "всі файли в цьому пакунку"
+#~ msgid "Allow searching on subwords"
+#~ msgstr "Шукати частини слів"
-#~ msgid "packages that contain files or directories named like this"
-#~ msgstr "пакунки, що містять файли чи директорії з такою назвою"
+#~ msgid "Search case sensitive"
+#~ msgstr "Пошук чутливий до регістру"
+
+#~ msgid "non-US"
+#~ msgstr "non-US"
diff --git a/ukrainian/po/doc.uk.po b/ukrainian/po/doc.uk.po
index d6844b286f8..88012e177c7 100644
--- a/ukrainian/po/doc.uk.po
+++ b/ukrainian/po/doc.uk.po
@@ -9,7 +9,24 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\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,69 +338,95 @@ msgstr ""
msgid "Publisher:"
msgstr ""
-#: ../../english/doc/manuals.defs:26
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr ""
-#: ../../english/doc/manuals.defs:33
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr ""
-#: ../../english/doc/manuals.defs:40
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr ""
-#: ../../english/doc/manuals.defs:47
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr ""
-#: ../../english/doc/manuals.defs:54
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr ""
-#: ../../english/doc/manuals.defs:86
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr ""
-#: ../../english/doc/manuals.defs:102
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr ""
-#: ../../english/doc/manuals.defs:133 ../../english/releases/arches.data:34
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr ""
-#. 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 ""
+"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 ""
+
+#: ../../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 ""
-"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://packages.debian.org/git\">Git</a> repository."
msgstr ""
-#: ../../english/doc/manuals.defs:158
+#: ../../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"
" and check out the <kbd>boot-floppies/documentation</kbd> module."
msgstr ""
-#: ../../english/doc/manuals.defs:163
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:167 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr ""
-#: ../../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 ""
-#: ../../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 ""
diff --git a/ukrainian/po/l10n.uk.po b/ukrainian/po/l10n.uk.po
index 611bb9b88eb..6d8dea355c4 100644
--- a/ukrainian/po/l10n.uk.po
+++ b/ukrainian/po/l10n.uk.po
@@ -99,8 +99,8 @@ msgstr "POT-файли"
msgid "Hints for translators"
msgstr "Підказки перекладачам"
-#~ msgid "Original templates"
-#~ msgstr "Оригінальні шаблони"
-
#~ msgid "Translated templates"
#~ msgstr "Перекладені шаблони"
+
+#~ msgid "Original templates"
+#~ msgstr "Оригінальні шаблони"
diff --git a/ukrainian/po/newsevents.uk.po b/ukrainian/po/newsevents.uk.po
index 75b48370bf4..7a6d41dd097 100644
--- a/ukrainian/po/newsevents.uk.po
+++ b/ukrainian/po/newsevents.uk.po
@@ -32,27 +32,27 @@ msgstr ""
msgid "The newsletter for the Debian community"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:11
+#: ../../english/events/speakers/speakers.defs:12
msgid "Name:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:14
+#: ../../english/events/speakers/speakers.defs:15
msgid "Email:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:19
+#: ../../english/events/speakers/speakers.defs:20
msgid "Previous Talks:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:23
+#: ../../english/events/speakers/speakers.defs:24
msgid "Languages:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:26
+#: ../../english/events/speakers/speakers.defs:28
msgid "Location:"
msgstr ""
-#: ../../english/events/speakers/speakers.defs:29
+#: ../../english/events/speakers/speakers.defs:31
msgid "Topics:"
msgstr ""
@@ -342,11 +342,12 @@ 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>."
+#| "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 ""
"Щоб кожен тиждень отримувати новини поштою, <a href=\"https://lists.debian."
"org/debian-news/\">підпишіться на список розсилки debian-news</a>."
@@ -487,3 +488,16 @@ msgid ""
msgstr ""
"<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href=\"mailto:"
"dwn@debian.org\">%s</a>."
+
+#, 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>."
+#~ msgstr ""
+#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"https://lists."
+#~ "debian.org/debian-news/\">підпишіться на список розсилки debian-news</a>."
diff --git a/ukrainian/po/organization.uk.po b/ukrainian/po/organization.uk.po
index 6986e573c5b..ea5a227831e 100644
--- a/ukrainian/po/organization.uk.po
+++ b/ukrainian/po/organization.uk.po
@@ -80,7 +80,7 @@ msgid "Officers"
msgstr "Чиновники"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Дистрибутив"
@@ -90,11 +90,11 @@ msgid "Publicity"
msgstr "Зв'язки з громадскістю"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Підтримка та інфраструктура"
-#. 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 ""
@@ -107,109 +107,109 @@ msgstr "Лідер"
msgid "Technical Committee"
msgstr "Технічний комітет"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Секретар"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Проекти розробки"
-#: ../../english/intro/organization.data:84
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "FTP-архіви"
-#: ../../english/intro/organization.data:86
+#: ../../english/intro/organization.data:83
#, fuzzy
#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP-майстер"
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "FTP-помічники"
-#: ../../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 "Індивідуальні пакунки"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Керування випуском"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
#, fuzzy
#| msgid "Release Notes"
msgid "Release Team"
msgstr "Інформація про випуск"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Забезпечення якості"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Команда системи встановлення"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Інформація про випуск"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Образи компакт-дисків"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Виробництво"
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Тестування"
-#: ../../english/intro/organization.data:138
+#: ../../english/intro/organization.data:137
#, fuzzy
#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Підтримка та інфраструктура"
-#: ../../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
#, fuzzy
#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Системне адміністрування"
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Документація"
-#: ../../english/intro/organization.data:170
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Список пакунків що потребують доробки або плануються"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:174
#, fuzzy
#| msgid "Installation System Team"
msgid "Live System Team"
msgstr "Команда системи встановлення"
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Перенесення"
@@ -237,85 +237,75 @@ msgstr "Контакт для преси"
msgid "Partner Program"
msgstr "Партнерська програма"
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Події"
-#: ../../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 "Підтримка користувачів"
-#: ../../english/intro/organization.data:316
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Система відслідковування помилок"
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:318
#, fuzzy
#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Керування списками розсилки"
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:326
#, fuzzy
#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Реєстраційний стіл нових супроводжуючих"
-#: ../../english/intro/organization.data:334
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Керуючі обліковими записами Debian"
-#: ../../english/intro/organization.data:338
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Супроводжуючі зв'язки ключів (PGP та GPG)"
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr ""
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Команда безпеки"
-#: ../../english/intro/organization.data:360
-#, fuzzy
-#| msgid "Security Team"
-msgid "Testing Security Team"
-msgstr "Команда безпеки"
-
-#: ../../english/intro/organization.data:369
-msgid "Security Audit Project"
-msgstr "Проект перевірки безпеки"
-
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Веб-сторінки"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Сторінка консультантів"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Сторінка постачальників компакт-дисків"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Політика"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Системне адміністрування"
-#: ../../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."
@@ -324,7 +314,7 @@ msgstr ""
"машинами Debian, включно з проблемами з паролями, або якщо вам потрібно "
"встановити пакунок."
-#: ../../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 "
@@ -334,121 +324,130 @@ msgstr ""
"<a href=\"https://db.debian.org/machines.cgi\">Машини Debian</a>, вона "
"повинна містити інформацію про адміністраторів кожної машини."
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Адміністратор LDAP-каталогу розробників"
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Дзеркала"
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Супроводжуючий DNS"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Система відслідковування пакунків"
-#: ../../english/intro/organization.data:418
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Координація пожертвування обладнання"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr ""
-#: ../../english/intro/organization.data:427
-msgid "<a href=\"m4_HOME/trademark\">Trademark</a> use requests"
-msgstr ""
-
-#: ../../english/intro/organization.data:428
-msgid "current Debian Project Leader"
+#: ../../english/intro/organization.data:413
+msgid ""
+"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:430
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Адміністратори Alioth"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:422
#, fuzzy
#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Проекти розробки"
-#: ../../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 для дітей від 1 до 99"
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian для медичної практики та досліджень"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian для освіти"
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian в адвокатурах"
-#: ../../english/intro/organization.data:475
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian для людей з обмеженими можливостями"
-#: ../../english/intro/organization.data:479
+#: ../../english/intro/organization.data:465
#, fuzzy
#| msgid "Debian for medical practice and research"
msgid "Debian for science and related research"
msgstr "Debian для медичної практики та досліджень"
-#~ msgid ""
-#~ "This is not yet an official Debian internal project but it has announced "
-#~ "the intention to be integrated."
-#~ msgstr ""
-#~ "Це ще не є офіційний внутрішній проект Debian, але оголошення про "
-#~ "прагнення інтеграції."
+#~ msgid "Release Assistants"
+#~ msgstr "Помічники керівника випуском"
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "Мультимедійний дистрибутив Debian"
+#~ msgid "Release Manager for ``stable''"
+#~ msgstr "Керівник випуском „stable“"
-#~ msgid "Debian GNU/Linux for Enterprise Computing"
-#~ msgstr "Debian для підприємств"
+#~ msgid "Vendors"
+#~ msgstr "Постачальники"
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian для некомерційних організацій"
+#~ msgid "APT Team"
+#~ msgstr "Команда APT"
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Універсальна операційна система як робочій стіл"
+#~ msgid "Mailing List Archives"
+#~ msgstr "Архіви списків розсилки"
-#~ msgid "Accountant"
-#~ msgstr "Рахівник"
+#~ msgid "Security Testing Team"
+#~ msgstr "Команда безпеки тестового дистрибутиву"
#~ msgid "Key Signing Coordination"
#~ msgstr "Координація підписування ключів"
-#~ msgid "Security Testing Team"
-#~ msgstr "Команда безпеки тестового дистрибутиву"
+#~ msgid "Accountant"
+#~ msgstr "Рахівник"
-#~ msgid "Mailing List Archives"
-#~ msgstr "Архіви списків розсилки"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Універсальна операційна система як робочій стіл"
-#~ msgid "APT Team"
-#~ msgstr "Команда APT"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian для некомерційних організацій"
-#~ msgid "Vendors"
-#~ msgstr "Постачальники"
+#~ msgid "Debian GNU/Linux for Enterprise Computing"
+#~ msgstr "Debian для підприємств"
-#~ msgid "Release Manager for ``stable''"
-#~ msgstr "Керівник випуском „stable“"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "Мультимедійний дистрибутив Debian"
-#~ msgid "Release Assistants"
-#~ msgstr "Помічники керівника випуском"
+#~ msgid ""
+#~ "This is not yet an official Debian internal project but it has announced "
+#~ "the intention to be integrated."
+#~ msgstr ""
+#~ "Це ще не є офіційний внутрішній проект Debian, але оголошення про "
+#~ "прагнення інтеграції."
+
+#~ msgid "Security Audit Project"
+#~ msgstr "Проект перевірки безпеки"
+
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "Команда безпеки"
diff --git a/ukrainian/po/others.uk.po b/ukrainian/po/others.uk.po
index 384b0accd1c..9183ad2005a 100644
--- a/ukrainian/po/others.uk.po
+++ b/ukrainian/po/others.uk.po
@@ -168,26 +168,6 @@ msgstr ""
msgid "same as the above"
msgstr ""
-#: ../../english/misc/hardware.def:12 ../../english/misc/hardware.def:17
-msgid "Wanted:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
-msgstr ""
-
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
-msgstr ""
-
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr "Товари"
@@ -232,24 +212,36 @@ msgstr "значки"
msgid "basketball goals"
msgstr "баскетбольні корзини"
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr "сережки"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr "чемодани"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/misc/merchandise.def:48
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:55
+#: ../../english/misc/merchandise.def:51
#, fuzzy
#| msgid "suitcases"
msgid "pillowcases"
msgstr "чемодани"
+#: ../../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 ""
diff --git a/ukrainian/po/ports.uk.po b/ukrainian/po/ports.uk.po
index b2ba661e8c3..de6ece4c8cc 100644
--- a/ukrainian/po/ports.uk.po
+++ b/ukrainian/po/ports.uk.po
@@ -119,32 +119,32 @@ msgstr "Debian для PowerPC"
msgid "Debian for Sparc"
msgstr "Debian для Sparc"
-#~ msgid "Debian for Sparc64"
-#~ msgstr "Debian для Sparc64"
-
-#~ msgid "Debian for S/390"
-#~ msgstr "Debian для S/390"
+#~ msgid "Debian for Laptops"
+#~ msgstr "Debian для лептопів"
-#~ msgid "Debian for MIPS"
-#~ msgstr "Debian для MIPS"
+#~ msgid "Debian for AMD64"
+#~ msgstr "Debian для AMD64"
-#~ msgid "Debian for Motorola 680x0"
-#~ msgstr "Debian для Motorola 680x0"
+#~ msgid "Debian for ARM"
+#~ msgstr "Debian для ARM"
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "Debian GNU/FreeBSD"
+#~ msgid "Debian for Beowulf"
+#~ msgstr "Debian для Beowulf"
#~ msgid "Main"
#~ msgstr "Головна сторінка"
-#~ msgid "Debian for Beowulf"
-#~ msgstr "Debian для Beowulf"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "Debian GNU/FreeBSD"
-#~ msgid "Debian for ARM"
-#~ msgstr "Debian для ARM"
+#~ msgid "Debian for Motorola 680x0"
+#~ msgstr "Debian для Motorola 680x0"
-#~ msgid "Debian for AMD64"
-#~ msgstr "Debian для AMD64"
+#~ msgid "Debian for MIPS"
+#~ msgstr "Debian для MIPS"
-#~ msgid "Debian for Laptops"
-#~ msgstr "Debian для лептопів"
+#~ msgid "Debian for S/390"
+#~ msgstr "Debian для S/390"
+
+#~ msgid "Debian for Sparc64"
+#~ msgstr "Debian для Sparc64"
diff --git a/ukrainian/po/templates.uk.po b/ukrainian/po/templates.uk.po
index 6c5eefb88b0..5a5dd9b185c 100644
--- a/ukrainian/po/templates.uk.po
+++ b/ukrainian/po/templates.uk.po
@@ -74,7 +74,7 @@ msgstr ""
"Повернутися на <a href=\"m4_HOME/\">головну сторінку проекту Debian</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 "На&nbsp;початок"
@@ -115,7 +115,7 @@ msgid "Support"
msgstr "Підтримка"
#: ../../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 "Куток розробника"
@@ -152,7 +152,7 @@ msgid "Miscellaneous"
msgstr "Різне"
#: ../../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 "Отримання Debian"
@@ -208,7 +208,7 @@ msgstr "у випуску 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
#, fuzzy
#| msgid ""
#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
@@ -227,24 +227,24 @@ msgstr ""
"Додаткову інформацію дивиться на сторінці <a href=\"m4_HOME/contact\">з "
"контактною інформацією</a>."
-#: ../../english/template/debian/footer.wml:99
+#: ../../english/template/debian/footer.wml:100
msgid "Last Modified"
msgstr "Остання модифікація"
-#: ../../english/template/debian/footer.wml:102
+#: ../../english/template/debian/footer.wml:103
msgid "Copyright"
msgstr "Авторські права"
-#: ../../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 ""
-#: ../../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 ""
"Дивіться <a href=\"m4_HOME/license\" rel=\"copyright\">умови ліцензії</a>"
-#: ../../english/template/debian/footer.wml:111
+#: ../../english/template/debian/footer.wml:112
#, fuzzy
#| msgid ""
#| "Debian is a registered trademark of Software in the Public Interest, Inc."
@@ -313,140 +313,150 @@ msgid "Debian Books"
msgstr "Книги про Debian"
#: ../../english/template/debian/links.tags.wml:37
+#, fuzzy
+#| msgid "Help Debian"
+msgid "Debian Wiki"
+msgstr "Як допомогти Debian"
+
+#: ../../english/template/debian/links.tags.wml:40
msgid "Mailing List Archives"
msgstr "Архіви списків розсилки"
-#: ../../english/template/debian/links.tags.wml:40
+#: ../../english/template/debian/links.tags.wml:43
msgid "Mailing Lists"
msgstr "Списки розсилки"
-#: ../../english/template/debian/links.tags.wml:46
+#: ../../english/template/debian/links.tags.wml:49
msgid "Social Contract"
msgstr "Суспільний договір"
-#: ../../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 "Відвідайте нашого спонсора"
-#: ../../english/template/debian/links.tags.wml:52
+#: ../../english/template/debian/links.tags.wml:58
msgid "Debian 5.0 - The universal operating system"
msgstr ""
-#: ../../english/template/debian/links.tags.wml:55
+#: ../../english/template/debian/links.tags.wml:61
msgid "Site map for Debian web pages"
msgstr "Мапа сайту Debian"
-#: ../../english/template/debian/links.tags.wml:58
+#: ../../english/template/debian/links.tags.wml:64
msgid "Developer Database"
msgstr "База даних розробників"
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:67
#, fuzzy
#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Книги про Debian"
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:70
msgid "Debian Policy Manual"
msgstr "Посібник по політиці Debian"
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:73
msgid "Developers' Reference"
msgstr "Довідник розробника"
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:76
msgid "New Maintainers' Guide"
msgstr "Посібник нового розробника"
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:79
msgid "Release Critical Bugs"
msgstr "Помилки, критичні для випуску"
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:82
msgid "Lintian Reports"
msgstr "Звіти Lintian"
-#: ../../english/template/debian/links.tags.wml:80
+#: ../../english/template/debian/links.tags.wml:86
msgid "Archives for users' mailing lists"
msgstr "Архіви списків розсилки для користувачів"
-#: ../../english/template/debian/links.tags.wml:83
+#: ../../english/template/debian/links.tags.wml:89
msgid "Archives for developers' mailing lists"
msgstr "Архіви списків розсилки для розробників"
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:92
msgid "Archives for i18n/l10n mailing lists"
msgstr "Архіви списків розсилки по інтернаціоналізації та локалізації"
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:95
msgid "Archives for ports' mailing lists"
msgstr "Архіви списків розсилки по перенесенню на різні архітектури"
-#: ../../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 "Архіви списків розсилки системи відслідковування помилок"
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:101
msgid "Archives for miscellaneous mailing lists"
msgstr "Архіви інших списків розсилки"
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:104
msgid "Free Software"
msgstr "Вільне програмне забезпечення"
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:110
msgid "Development"
msgstr "Розробка"
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/links.tags.wml:113
msgid "Help Debian"
msgstr "Як допомогти Debian"
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:116
msgid "Bug reports"
msgstr "Звіти про помилки"
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:119
msgid "Ports/Architectures"
msgstr "Перенесення&nbsp;на&nbsp;інші&nbsp;архітектури"
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:122
msgid "Installation manual"
msgstr "Посібник по встановленню"
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:125
msgid "CD vendors"
msgstr "Постачальники CD"
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:128
msgid "CD/USB ISO images"
msgstr "ISO образи CD/USB"
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:131
msgid "Network install"
msgstr "Встановлення через мережу"
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:134
msgid "Pre-installed"
msgstr "Передвстановлення"
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:137
msgid "Debian-Edu project"
msgstr "Проект Debian-Edu"
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:140
msgid "Alioth &ndash; Debian GForge"
msgstr "Alioth&nbsp;&mdash; Debian GForge"
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:143
msgid "Quality Assurance"
msgstr "Контроль якості"
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:146
msgid "Package Tracking System"
msgstr "Система відслідковування пакунків"
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:149
msgid "Debian Developer's Packages Overview"
msgstr "Огляд пакунків для розробників Debian"
@@ -532,425 +542,425 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Повернутися на <a href=\"./\">сторінку користувачів Debian</a>."
-#~ msgid "More information"
-#~ msgstr "Додаткова інформація"
-
-#~ msgid "Upcoming Attractions"
-#~ msgstr "Майбутні події"
-
-#~ msgid "link may no longer be valid"
-#~ msgstr "посилання може бути більше не діяти"
+#~ msgid "Select a server near you"
+#~ msgstr "Виберіть найближчий сервер"
-#~ msgid "When"
-#~ msgstr "Коли"
+#~ msgid "More information:"
+#~ msgstr "Додаткова інформація:"
-#~ msgid "Where"
-#~ msgstr "Де"
+#~ msgid "Taken by:"
+#~ msgstr "Відповідальний:"
-#~ msgid "More Info"
-#~ msgstr "Додаткова інформація"
+#~ msgid "Nobody"
+#~ msgstr "Ніхто"
-#~ msgid "Debian Involvement"
-#~ msgstr "Участь Debian"
+#~ msgid "Rating:"
+#~ msgstr "Рейтинг:"
-#~ msgid "Main Coordinator"
-#~ msgstr "Головний координатор"
+#~ msgid "List of Consultants"
+#~ msgstr "Список консультантів"
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>Координатор</th><th>проекту</th>"
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "Повернутися на <a href=\"./\">сторінку консультантів Debian</a>."
-#~ msgid "Related Links"
-#~ msgstr "Пов'язані посилання"
+#~ msgid "&middot;"
+#~ msgstr "&middot;"
-#~ msgid "Latest News"
-#~ msgstr "Останні новини"
+#~ msgid "Download with Jigdo"
+#~ msgstr "Завантажити за допомогою Jigdo"
-#~ msgid "Download calendar entry"
-#~ msgstr "Завантажити календарний запис"
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "Завантажити через HTTP/FTP"
-#~ msgid ""
-#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
-#~ "\">Debian Project homepage</a>."
-#~ msgstr ""
-#~ "Повернутися до: інших <a href=\"./\">новин Debian</a> || <a href="
-#~ "\"m4_HOME/\">головну сторінку проекту Debian</a>."
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "Купити CD або DVD"
-#~ msgid "<get-var url /> (dead link)"
-#~ msgstr "<get-var url /> (мертве посилання)"
+#~ msgid "Network Install"
+#~ msgstr "Встановлення через мережу"
-#, 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>."
-#~ msgstr ""
-#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
-#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
+#~ msgid "<void id=\"dc_download\" />Download"
+#~ msgstr "<void id=\"dc_download\" />Завантажити"
-#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-#~ msgstr "Також наявні <a href=\"../../\">минулі випуски</a>."
+#~ msgid "<void id=\"dc_misc\" />Misc"
+#~ msgstr "<void id=\"dc_misc\" />Різне"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~| "dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-#~ "debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
+#~ msgstr "<void id=\"dc_mirroring\" />Відображення"
-#, 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>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Щотижневі новини Debian випускають <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
+#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-дзеркала"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
-#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
-#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Цей випуск щотижневих новин випустив <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
+#~ msgstr "<void id=\"dc_torrent\" />Завантажити через Torrent"
-#, fuzzy
-#~| msgid ""
-#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~| "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Debian CD team"
+#~ msgstr "Команда CD Debian"
-#~ msgid "<void id=\"singular\" />It was translated by %s."
-#~ msgstr "<void id=\"singular\" />Переклав %s."
+#~ msgid "debian_on_cd"
+#~ msgstr "Debian на CD"
-#~ msgid "<void id=\"plural\" />It was translated by %s."
-#~ msgstr "<void id=\"plural\" />Переклали %s."
+#~ msgid "<void id=\"faq-bottom\" />faq"
+#~ msgstr "<void id=\"faq-bottom\" />FAQ"
-#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"singularfemale\" />Переклала %s."
+#~ msgid "jigdo"
+#~ msgstr "jidgo"
-#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
-#~ msgstr "<void id=\"pluralfemale\" />Переклали %s."
+#~ msgid "http_ftp"
+#~ msgstr "http_ftp"
-#~ msgid "List of Speakers"
-#~ msgstr "Список доповідачів"
+#~ msgid "buy"
+#~ msgstr "купити"
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Повернутися на <a href=\"./\">сторінку доповідачів Debian</a>."
+#~ msgid "net_install"
+#~ msgstr "встановлення через мережу"
-#~ 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 ""
-#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
-#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
+#~ msgid "<void id=\"misc-bottom\" />misc"
+#~ msgstr "<void id=\"misc-bottom\" />різне"
#~ msgid ""
-#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
+#~ "list</a> for CDs/DVDs:"
#~ msgstr ""
-#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ "Англомовний <a href=\"/MailingLists/disclaimer\">список розсилки</a> "
+#~ "присвячений CD/DVD:"
-#~ msgid ""
-#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Щотижневі новини Debian випускають <a href=\"mailto:"
-#~ "dwn@debian.org\">%s</a>."
+#~ msgid "Date"
+#~ msgstr "Дата"
-#~ msgid ""
-#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"singular\" />Цей випуск щотижневих новин випустив <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Platforms"
+#~ msgstr "Платформи"
-#~ msgid ""
-#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
-#~ "href=\"mailto:dwn@debian.org\">%s</a>."
-#~ msgstr ""
-#~ "<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href="
-#~ "\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Text"
+#~ msgstr "Текст"
-#~ msgid "No requests for adoption"
-#~ msgstr "Запитів про „усиновлення“ не поступали"
+#~ msgid "Ballot"
+#~ msgstr "Бюлетень"
-#~ msgid "No orphaned packages"
-#~ msgstr "Немає „осиротілих“ пакунків"
+#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
+#~ msgstr "Очікує&nbsp;спонсорів"
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "Немає пакунків, що очікують на „усиновлення“"
+#~ msgid "In&nbsp;Discussion"
+#~ msgstr "Розглядається"
-#~ msgid "No packages waiting to be packaged"
-#~ msgstr "Немає пакунків, по яким ведеться робота"
+#~ msgid "Voting&nbsp;Open"
+#~ msgstr "Голосування&nbsp;відкрите"
-#~ msgid "No Requested packages"
-#~ msgstr "Немає запитів на створення пакунків"
+#~ msgid "Decided"
+#~ msgstr "Прийняте"
-#~ msgid "No help requested"
-#~ msgstr "Немає запитів про допомогу"
+#~ msgid "Withdrawn"
+#~ msgstr "Відхилене"
-#~ msgid "in adoption since today."
-#~ msgstr "„усиновлення“ почалося сьогодні."
+#~ msgid "Other"
+#~ msgstr "Інше"
-#~ msgid "in adoption since yesterday."
-#~ msgstr "„усиновлення“ почалося вчора."
+#~ msgid "Home&nbsp;Vote&nbsp;Page"
+#~ msgstr "На&nbsp;сторінку&nbsp;голосувань"
-#~ msgid "%s days in adoption."
-#~ msgstr "„усиновлення“ почалося %s днів тому."
+#~ msgid "How&nbsp;To"
+#~ msgstr "Як"
-#~ msgid "in preparation since today."
-#~ msgstr "робота почалась сьогодні."
+#~ msgid "Submit&nbsp;a&nbsp;Proposal"
+#~ msgstr "Внести&nbsp;пропозицію"
-#~ msgid "in preparation since yesterday."
-#~ msgstr "робота почалась вчора."
+#~ msgid "Amend&nbsp;a&nbsp;Proposal"
+#~ msgstr "Внести&nbsp;поправку"
-#~ msgid "%s days in preparation."
-#~ msgstr "робота почалась %s днів тому."
+#~ msgid "Follow&nbsp;a&nbsp;Proposal"
+#~ msgstr "Підтримати&nbsp;пропозицію"
-#~ msgid "requested today."
-#~ msgstr "запит отриманий сьогодні."
+#~ msgid "Read&nbsp;a&nbsp;Result"
+#~ msgstr "Взнати&nbsp;результат"
-#~ msgid "requested yesterday."
-#~ msgstr "запит отриманий вчора."
+#~ msgid "Vote"
+#~ msgstr "Проголосувати"
-#~ msgid "requested %s days ago."
-#~ msgstr "запит отриманий %s днів тому."
+#~ msgid ""
+#~ "See the <a href=\"./\">license information</a> page for an overview of "
+#~ "the Debian License Summaries (DLS)."
+#~ msgstr ""
+#~ "Дивіться сторінку <a href=\"./\">інформації про ліцензії</a> для огляду "
+#~ "резюме Debian по ліцензіям (Debian License Summaries&nbsp;&mdash; DLS)."
-#~ msgid "package info"
-#~ msgstr "інформація про пакунок"
+#~ msgid "Not Redistributable"
+#~ msgstr "З обмеженнями на розповсюдження"
-#~ msgid "License Information"
-#~ msgstr "Інформація про ліцензії"
+#~ msgid "Non-Free"
+#~ msgstr "Невільні"
-#~ msgid "DLS Index"
-#~ msgstr "Індекс DLS"
+#~ msgid "Free"
+#~ msgstr "Вільні"
-#~ msgid "DFSG"
-#~ msgstr "DFSG"
+#~ msgid "not redistributable"
+#~ msgstr "з обмеженнями на розповсюдження"
-#~ msgid "DFSG FAQ"
-#~ msgstr "FAQ по DFSG"
+#~ msgid "non-free"
+#~ msgstr "невільна"
-#~ msgid "Debian-Legal Archive"
-#~ msgstr "Архів Debian-Legal"
+#~ msgid "free"
+#~ msgstr "вільна"
-#~ msgid "%s &ndash; %s: %s"
-#~ msgstr "%s&nbsp;&mdash; %s: %s"
+#~ msgid "License text"
+#~ msgstr "Текст ліцензії"
-#~ msgid "%s &ndash; %s, Version %s: %s"
-#~ msgstr "%s&nbsp;&mdash; %s, версія %s: %s"
+#~ msgid "License text (translated)"
+#~ msgstr "Текст ліцензії (перекладений)"
-#~ msgid "Date published"
-#~ msgstr "Дата публікації"
+#~ msgid "This summary was prepared by <summary-author/>."
+#~ msgstr "Підготував це резюме <summary-author/>."
-#~ msgid "License"
-#~ msgstr "Ліцензія"
+#~ msgid ""
+#~ "The original summary by <summary-author/> can be found in the <a href="
+#~ "\"<summary-url/>\">list archives</a>."
+#~ msgstr ""
+#~ "Автор початкового резюме: <summary-author/>. Резюме може бути знайдене в "
+#~ "<a href=\"<summary-url/>\">списку розсилки</a>."
-#~ msgid "Version"
-#~ msgstr "Версія"
+#~ msgid "Original Summary"
+#~ msgstr "Початкове резюме"
-#~ msgid "Summary"
-#~ msgstr "Резюме"
+#~ msgid "Discussion"
+#~ msgstr "Обговорення"
#~ msgid "Justification"
#~ msgstr "Обґрунтування"
-#~ msgid "Discussion"
-#~ msgstr "Обговорення"
+#~ msgid "Summary"
+#~ msgstr "Резюме"
-#~ msgid "Original Summary"
-#~ msgstr "Початкове резюме"
+#~ msgid "Version"
+#~ msgstr "Версія"
-#~ msgid ""
-#~ "The original summary by <summary-author/> can be found in the <a href="
-#~ "\"<summary-url/>\">list archives</a>."
-#~ msgstr ""
-#~ "Автор початкового резюме: <summary-author/>. Резюме може бути знайдене в "
-#~ "<a href=\"<summary-url/>\">списку розсилки</a>."
+#~ msgid "License"
+#~ msgstr "Ліцензія"
-#~ msgid "This summary was prepared by <summary-author/>."
-#~ msgstr "Підготував це резюме <summary-author/>."
+#~ msgid "Date published"
+#~ msgstr "Дата публікації"
-#~ msgid "License text (translated)"
-#~ msgstr "Текст ліцензії (перекладений)"
+#~ msgid "%s &ndash; %s, Version %s: %s"
+#~ msgstr "%s&nbsp;&mdash; %s, версія %s: %s"
-#~ msgid "License text"
-#~ msgstr "Текст ліцензії"
+#~ msgid "%s &ndash; %s: %s"
+#~ msgstr "%s&nbsp;&mdash; %s: %s"
-#~ msgid "free"
-#~ msgstr "вільна"
+#~ msgid "Debian-Legal Archive"
+#~ msgstr "Архів Debian-Legal"
-#~ msgid "non-free"
-#~ msgstr "невільна"
+#~ msgid "DFSG FAQ"
+#~ msgstr "FAQ по DFSG"
-#~ msgid "not redistributable"
-#~ msgstr "з обмеженнями на розповсюдження"
+#~ msgid "DFSG"
+#~ msgstr "DFSG"
-#~ msgid "Free"
-#~ msgstr "Вільні"
+#~ msgid "DLS Index"
+#~ msgstr "Індекс DLS"
-#~ msgid "Non-Free"
-#~ msgstr "Невільні"
+#~ msgid "License Information"
+#~ msgstr "Інформація про ліцензії"
-#~ msgid "Not Redistributable"
-#~ msgstr "З обмеженнями на розповсюдження"
+#~ msgid "package info"
+#~ msgstr "інформація про пакунок"
-#~ msgid ""
-#~ "See the <a href=\"./\">license information</a> page for an overview of "
-#~ "the Debian License Summaries (DLS)."
-#~ msgstr ""
-#~ "Дивіться сторінку <a href=\"./\">інформації про ліцензії</a> для огляду "
-#~ "резюме Debian по ліцензіям (Debian License Summaries&nbsp;&mdash; DLS)."
+#~ msgid "requested %s days ago."
+#~ msgstr "запит отриманий %s днів тому."
-#~ msgid "Vote"
-#~ msgstr "Проголосувати"
+#~ msgid "requested yesterday."
+#~ msgstr "запит отриманий вчора."
-#~ msgid "Read&nbsp;a&nbsp;Result"
-#~ msgstr "Взнати&nbsp;результат"
+#~ msgid "requested today."
+#~ msgstr "запит отриманий сьогодні."
-#~ msgid "Follow&nbsp;a&nbsp;Proposal"
-#~ msgstr "Підтримати&nbsp;пропозицію"
+#~ msgid "%s days in preparation."
+#~ msgstr "робота почалась %s днів тому."
-#~ msgid "Amend&nbsp;a&nbsp;Proposal"
-#~ msgstr "Внести&nbsp;поправку"
+#~ msgid "in preparation since yesterday."
+#~ msgstr "робота почалась вчора."
-#~ msgid "Submit&nbsp;a&nbsp;Proposal"
-#~ msgstr "Внести&nbsp;пропозицію"
+#~ msgid "in preparation since today."
+#~ msgstr "робота почалась сьогодні."
-#~ msgid "How&nbsp;To"
-#~ msgstr "Як"
+#~ msgid "%s days in adoption."
+#~ msgstr "„усиновлення“ почалося %s днів тому."
-#~ msgid "Home&nbsp;Vote&nbsp;Page"
-#~ msgstr "На&nbsp;сторінку&nbsp;голосувань"
+#~ msgid "in adoption since yesterday."
+#~ msgstr "„усиновлення“ почалося вчора."
-#~ msgid "Other"
-#~ msgstr "Інше"
+#~ msgid "in adoption since today."
+#~ msgstr "„усиновлення“ почалося сьогодні."
-#~ msgid "Withdrawn"
-#~ msgstr "Відхилене"
+#~ msgid "No help requested"
+#~ msgstr "Немає запитів про допомогу"
-#~ msgid "Decided"
-#~ msgstr "Прийняте"
+#~ msgid "No Requested packages"
+#~ msgstr "Немає запитів на створення пакунків"
-#~ msgid "Voting&nbsp;Open"
-#~ msgstr "Голосування&nbsp;відкрите"
+#~ msgid "No packages waiting to be packaged"
+#~ msgstr "Немає пакунків, по яким ведеться робота"
-#~ msgid "In&nbsp;Discussion"
-#~ msgstr "Розглядається"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "Немає пакунків, що очікують на „усиновлення“"
-#~ msgid "Waiting&nbsp;for&nbsp;Sponsors"
-#~ msgstr "Очікує&nbsp;спонсорів"
+#~ msgid "No orphaned packages"
+#~ msgstr "Немає „осиротілих“ пакунків"
-#~ msgid "Ballot"
-#~ msgstr "Бюлетень"
+#~ msgid "No requests for adoption"
+#~ msgstr "Запитів про „усиновлення“ не поступали"
-#~ msgid "Text"
-#~ msgstr "Текст"
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Platforms"
-#~ msgstr "Платформи"
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+#~ "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Цей випуск щотижневих новин випустив <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "Date"
-#~ msgstr "Дата"
+#~ msgid ""
+#~ "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Щотижневі новини Debian випускають <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgid ""
-#~ "English-language <a href=\"/MailingLists/disclaimer\">public mailing "
-#~ "list</a> for CDs/DVDs:"
+#~ "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
#~ msgstr ""
-#~ "Англомовний <a href=\"/MailingLists/disclaimer\">список розсилки</a> "
-#~ "присвячений CD/DVD:"
+#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"misc-bottom\" />misc"
-#~ msgstr "<void id=\"misc-bottom\" />різне"
+#~ 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 ""
+#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
+#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
-#~ msgid "net_install"
-#~ msgstr "встановлення через мережу"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Повернутися на <a href=\"./\">сторінку доповідачів Debian</a>."
-#~ msgid "buy"
-#~ msgstr "купити"
+#~ msgid "List of Speakers"
+#~ msgstr "Список доповідачів"
-#~ msgid "http_ftp"
-#~ msgstr "http_ftp"
+#~ msgid "<void id=\"pluralfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"pluralfemale\" />Переклали %s."
-#~ msgid "jigdo"
-#~ msgstr "jidgo"
+#~ msgid "<void id=\"singularfemale\" />It was translated by %s."
+#~ msgstr "<void id=\"singularfemale\" />Переклала %s."
-#~ msgid "<void id=\"faq-bottom\" />faq"
-#~ msgstr "<void id=\"faq-bottom\" />FAQ"
+#~ msgid "<void id=\"plural\" />It was translated by %s."
+#~ msgstr "<void id=\"plural\" />Переклали %s."
-#~ msgid "debian_on_cd"
-#~ msgstr "Debian на CD"
+#~ msgid "<void id=\"singular\" />It was translated by %s."
+#~ msgstr "<void id=\"singular\" />Переклав %s."
-#~ msgid "Debian CD team"
-#~ msgstr "Команда CD Debian"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a "
+#~| "href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+#~ "href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_torrent\" />Download with Torrent"
-#~ msgstr "<void id=\"dc_torrent\" />Завантажити через Torrent"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />This issue of Debian Weekly News was edited by "
+#~| "<a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />This issue of Debian Project News was edited by "
+#~ "<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Цей випуск щотижневих новин випустив <a href="
+#~ "\"mailto:dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
-#~ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-дзеркала"
+#, 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>."
+#~ msgstr ""
+#~ "<void id=\"plural\" />Щотижневі новини Debian випускають <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_mirroring\" />Mirroring"
-#~ msgstr "<void id=\"dc_mirroring\" />Відображення"
+#, fuzzy
+#~| msgid ""
+#~| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+#~| "dwn@debian.org\">%s</a>."
+#~ msgid ""
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "debian-publicity@lists.debian.org\">%s</a>."
+#~ msgstr ""
+#~ "<void id=\"singular\" />Щотижневі новини Debian випускає <a href=\"mailto:"
+#~ "dwn@debian.org\">%s</a>."
-#~ msgid "<void id=\"dc_misc\" />Misc"
-#~ msgstr "<void id=\"dc_misc\" />Різне"
+#~ msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#~ msgstr "Також наявні <a href=\"../../\">минулі випуски</a>."
-#~ msgid "<void id=\"dc_download\" />Download"
-#~ msgstr "<void id=\"dc_download\" />Завантажити"
+#, 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>."
+#~ msgstr ""
+#~ "Щоб кожен тиждень отримувати новини поштою, <a href=\"http://lists.debian."
+#~ "org/debian-news/\">підпишіться на список розсилки debian-news</a>."
-#~ msgid "Network Install"
-#~ msgstr "Встановлення через мережу"
+#~ msgid "<get-var url /> (dead link)"
+#~ msgstr "<get-var url /> (мертве посилання)"
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "Купити CD або DVD"
+#~ msgid ""
+#~ "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/"
+#~ "\">Debian Project homepage</a>."
+#~ msgstr ""
+#~ "Повернутися до: інших <a href=\"./\">новин Debian</a> || <a href="
+#~ "\"m4_HOME/\">головну сторінку проекту Debian</a>."
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "Завантажити через HTTP/FTP"
+#~ msgid "Download calendar entry"
+#~ msgstr "Завантажити календарний запис"
-#~ msgid "Download with Jigdo"
-#~ msgstr "Завантажити за допомогою Jigdo"
+#~ msgid "Latest News"
+#~ msgstr "Останні новини"
-#~ msgid "&middot;"
-#~ msgstr "&middot;"
+#~ msgid "Related Links"
+#~ msgstr "Пов'язані посилання"
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "Повернутися на <a href=\"./\">сторінку консультантів Debian</a>."
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>Координатор</th><th>проекту</th>"
-#~ msgid "List of Consultants"
-#~ msgstr "Список консультантів"
+#~ msgid "Main Coordinator"
+#~ msgstr "Головний координатор"
-#~ msgid "Rating:"
-#~ msgstr "Рейтинг:"
+#~ msgid "Debian Involvement"
+#~ msgstr "Участь Debian"
-#~ msgid "Nobody"
-#~ msgstr "Ніхто"
+#~ msgid "More Info"
+#~ msgstr "Додаткова інформація"
-#~ msgid "Taken by:"
-#~ msgstr "Відповідальний:"
+#~ msgid "Where"
+#~ msgstr "Де"
-#~ msgid "More information:"
-#~ msgstr "Додаткова інформація:"
+#~ msgid "When"
+#~ msgstr "Коли"
-#~ msgid "Select a server near you"
-#~ msgstr "Виберіть найближчий сервер"
+#~ msgid "link may no longer be valid"
+#~ msgstr "посилання може бути більше не діяти"
+
+#~ msgid "Upcoming Attractions"
+#~ msgstr "Майбутні події"
+
+#~ msgid "More information"
+#~ msgstr "Додаткова інформація"
diff --git a/ukrainian/po/vendors.uk.po b/ukrainian/po/vendors.uk.po
index 7f75355b80c..d2ce171a3b6 100644
--- a/ukrainian/po/vendors.uk.po
+++ b/ukrainian/po/vendors.uk.po
@@ -14,149 +14,140 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Постачальник:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL для сторінки Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Дозволяє внесок для Debian"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Країна:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Міжнародна доставка:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "E-mail:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Тип CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Тип DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-msgid "Architectures:"
-msgstr "Архітектури:"
-
-#: ../../english/CD/vendors/vendors.CD.def:26
#, fuzzy
#| msgid "Vendor:"
msgid "Vendor"
msgstr "Постачальник:"
-#: ../../english/CD/vendors/vendors.CD.def:27
+#: ../../english/CD/vendors/vendors.CD.def:15
#, fuzzy
#| msgid "Allows Contribution to Debian:"
msgid "Allows Contributions"
msgstr "Дозволяє внесок для Debian"
-#: ../../english/CD/vendors/vendors.CD.def:28
-msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
+msgid "CD/DVD/BD/USB"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:17
#, fuzzy
#| msgid "Architectures:"
msgid "Architectures"
msgstr "Архітектури:"
-#: ../../english/CD/vendors/vendors.CD.def:30
+#: ../../english/CD/vendors/vendors.CD.def:18
#, fuzzy
#| msgid "Ship International:"
msgid "Ship International"
msgstr "Міжнародна доставка:"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr ""
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:54
+#: ../../english/CD/vendors/vendors.CD.def:44
#, fuzzy
#| msgid "Vendor:"
msgid "Vendor Home"
msgstr "Постачальник:"
-#: ../../english/CD/vendors/vendors.CD.def:73
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr ""
-#: ../../english/CD/vendors/vendors.CD.def:74
+#: ../../english/CD/vendors/vendors.CD.def:71
#, fuzzy
#| msgid "email:"
msgid "email"
msgstr "E-mail:"
-#: ../../english/CD/vendors/vendors.CD.def:115
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "в межах Європи"
-#: ../../english/CD/vendors/vendors.CD.def:119
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "В деякі райони"
-#: ../../english/CD/vendors/vendors.CD.def:123
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "джерельні коди"
-#: ../../english/CD/vendors/vendors.CD.def:127
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "та"
-#~ msgid "updated monthly"
-#~ msgstr "оновлення раз на місяць"
+#~ msgid "Official CD"
+#~ msgstr "Офіційні CD"
-#~ msgid "updated twice weekly"
-#~ msgstr "оновлення два рази на тиждень"
+#~ msgid "Official DVD"
+#~ msgstr "Офіційні DVD"
-#~ msgid "updated weekly"
-#~ msgstr "щотижневі оновлення"
+#~ msgid "Development Snapshot"
+#~ msgstr "Знімок для розробиків"
-#~ msgid "reseller"
-#~ msgstr "реселлер"
+#~ msgid "Vendor Release"
+#~ msgstr "Випуск продавця"
-#~ msgid "reseller of $var"
-#~ msgstr "реселлер $var"
+#~ msgid "Multiple Distribution"
+#~ msgstr "Декілька дистрибутивів"
-#~ msgid "Custom Release"
-#~ msgstr "Власний випуск"
+#~ msgid "non-US included"
+#~ msgstr "з non-US"
-#~ msgid "vendor additions"
-#~ msgstr "додатки продавця"
+#~ msgid "non-free included"
+#~ msgstr "з non-free"
#~ msgid "contrib included"
#~ msgstr "з contrib"
-#~ msgid "non-free included"
-#~ msgstr "з non-free"
+#~ msgid "vendor additions"
+#~ msgstr "додатки продавця"
-#~ msgid "non-US included"
-#~ msgstr "з non-US"
+#~ msgid "Custom Release"
+#~ msgstr "Власний випуск"
-#~ msgid "Multiple Distribution"
-#~ msgstr "Декілька дистрибутивів"
+#~ msgid "reseller of $var"
+#~ msgstr "реселлер $var"
-#~ msgid "Vendor Release"
-#~ msgstr "Випуск продавця"
+#~ msgid "reseller"
+#~ msgstr "реселлер"
-#~ msgid "Development Snapshot"
-#~ msgstr "Знімок для розробиків"
+#~ msgid "updated weekly"
+#~ msgstr "щотижневі оновлення"
-#~ msgid "Official DVD"
-#~ msgstr "Офіційні DVD"
+#~ msgid "updated twice weekly"
+#~ msgstr "оновлення два рази на тиждень"
-#~ msgid "Official CD"
-#~ msgstr "Офіційні CD"
+#~ msgid "updated monthly"
+#~ msgstr "оновлення раз на місяць"
+
+#~ msgid "Architectures:"
+#~ msgstr "Архітектури:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Тип DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Тип CD:"
+
+#~ msgid "email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Міжнародна доставка:"
+
+#~ msgid "Country:"
+#~ msgstr "Країна:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Дозволяє внесок для Debian"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL для сторінки Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Постачальник:"
diff --git a/ukrainian/po/vote.uk.po b/ukrainian/po/vote.uk.po
index 6d0558f6b7d..075e1c5d8db 100644
--- a/ukrainian/po/vote.uk.po
+++ b/ukrainian/po/vote.uk.po
@@ -23,229 +23,245 @@ msgid "Time Line"
msgstr ""
#: ../../english/template/debian/votebar.wml:19
-msgid "Nominations"
+msgid "Summary"
msgstr ""
#: ../../english/template/debian/votebar.wml:22
-msgid "Debate"
+msgid "Nominations"
msgstr ""
#: ../../english/template/debian/votebar.wml:25
+msgid "Debate"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:28
msgid "Platforms"
msgstr "Платформи"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Proposer"
msgstr ""
-#: ../../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
msgid "Minimum Discussion"
msgstr ""
-#: ../../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 "Очікує&nbsp;спонсорів"
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr "Розглядається"
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr "Голосування&nbsp;відкрите"
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr "Прийняте"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr "Відхилене"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr "Інше"
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "На&nbsp;сторінку&nbsp;голосувань"
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr "Як"
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Внести&nbsp;пропозицію"
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Внести&nbsp;поправку"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Підтримати&nbsp;пропозицію"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Взнати&nbsp;результат"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr "Проголосувати"
diff --git a/vietnamese/po/cdimage.vi.po b/vietnamese/po/cdimage.vi.po
index 81f6620a1c5..8e352fde0f2 100644
--- a/vietnamese/po/cdimage.vi.po
+++ b/vietnamese/po/cdimage.vi.po
@@ -15,16 +15,16 @@ msgstr ""
"X-Generator: Gtranslator 2.91.7\n"
#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../english/CD/CD-keys.data:5 ../../english/CD/CD-keys.data:9
-#: ../../english/CD/CD-keys.data:14
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:8
+#: ../../english/CD/CD-keys.data:13
msgid " Key fingerprint"
msgstr " Dấu vân tay của khóa"
-#: ../../english/devel/debian-installer/images.data:92
+#: ../../english/devel/debian-installer/images.data:87
msgid "ISO images"
msgstr "Các ảnh ISO"
-#: ../../english/devel/debian-installer/images.data:93
+#: ../../english/devel/debian-installer/images.data:88
msgid "Jigdo files"
msgstr "Các tập tin jigdo"
diff --git a/vietnamese/po/consultants.vi.po b/vietnamese/po/consultants.vi.po
index 39c8ce0b3fd..1ae3baa2941 100644
--- a/vietnamese/po/consultants.vi.po
+++ b/vietnamese/po/consultants.vi.po
@@ -3,14 +3,6 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr ""
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr ""
-
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr ""
@@ -24,38 +16,51 @@ msgid "Address:"
msgstr ""
#: ../../english/consultants/consultant.defs:15
+msgid "Contact:"
+msgstr ""
+
+#: ../../english/consultants/consultant.defs:19
msgid "Phone:"
msgstr ""
-#: ../../english/consultants/consultant.defs:18
+#: ../../english/consultants/consultant.defs:22
msgid "Fax:"
msgstr ""
-#: ../../english/consultants/consultant.defs:21
+#: ../../english/consultants/consultant.defs:25
msgid "URL:"
msgstr ""
-#: ../../english/consultants/consultant.defs:25
+#: ../../english/consultants/consultant.defs:29
msgid "or"
msgstr ""
-#: ../../english/consultants/consultant.defs:30
+#: ../../english/consultants/consultant.defs:34
msgid "Email:"
msgstr ""
-#: ../../english/consultants/consultant.defs:48
+#: ../../english/consultants/consultant.defs:52
msgid "Rates:"
msgstr ""
-#: ../../english/consultants/consultant.defs:51
+#: ../../english/consultants/consultant.defs:55
msgid "Additional Information"
msgstr ""
-#: ../../english/consultants/consultant.defs:54
+#: ../../english/consultants/consultant.defs:58
msgid "Willing to Relocate"
msgstr ""
-#: ../../english/consultants/consultant.defs:57
-msgid "<total_consultant> Debian consultants listed in <total_country> countries worldwide."
+#: ../../english/consultants/consultant.defs:61
+msgid ""
+"<total_consultant> Debian consultants listed in <total_country> countries "
+"worldwide."
+msgstr ""
+
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
msgstr ""
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr ""
diff --git a/vietnamese/po/distrib.vi.po b/vietnamese/po/distrib.vi.po
index b025fda142e..3d142bbd027 100644
--- a/vietnamese/po/distrib.vi.po
+++ b/vietnamese/po/distrib.vi.po
@@ -3,76 +3,97 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_packages-form.inc:8
#: ../../english/distrib/search_contents-form.inc:9
+#: ../../english/distrib/search_packages-form.inc:8
msgid "Keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:10
#: ../../english/distrib/search_contents-form.inc:11
+#: ../../english/distrib/search_packages-form.inc:10
msgid "Search"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:10
#: ../../english/distrib/search_contents-form.inc:12
+#: ../../english/distrib/search_packages-form.inc:10
msgid "Reset"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr ""
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
+#: ../../english/distrib/search_contents-form.inc:14
+msgid "Display"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
+#: ../../english/distrib/search_contents-form.inc:17
+msgid "paths ending with the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
+#: ../../english/distrib/search_contents-form.inc:20
+msgid "packages that contain files named like this"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:20
-msgid "Only show exact matches"
+#: ../../english/distrib/search_contents-form.inc:23
+msgid "packages that contain files whose names contain the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:23
#: ../../english/distrib/search_contents-form.inc:25
+#: ../../english/distrib/search_packages-form.inc:23
msgid "Distribution"
msgstr ""
+#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:25
msgid "experimental"
msgstr ""
+#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:26
-#: ../../english/distrib/search_contents-form.inc:30
msgid "unstable"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:27
#: ../../english/distrib/search_contents-form.inc:29
+#: ../../english/distrib/search_packages-form.inc:27
msgid "testing"
msgstr ""
+#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:28
-#: ../../english/distrib/search_contents-form.inc:28
msgid "stable"
msgstr ""
+#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:29
-#: ../../english/distrib/search_contents-form.inc:27
msgid "oldstable"
msgstr ""
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr ""
+
+#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:30
#: ../../english/distrib/search_packages-form.inc:37
-#: ../../english/distrib/search_contents-form.inc:34
msgid "any"
msgstr ""
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:20
+msgid "Only show exact matches"
+msgstr ""
+
#: ../../english/distrib/search_packages-form.inc:32
msgid "Section"
msgstr ""
@@ -89,76 +110,82 @@ msgstr ""
msgid "non-free"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:14
-msgid "Display"
-msgstr ""
-
-#: ../../english/distrib/search_contents-form.inc:17
-msgid "paths ending with the keyword"
+#: ../../english/releases/arches.data:8
+msgid "Alpha"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:20
-msgid "packages that contain files named like this"
+#: ../../english/releases/arches.data:9
+msgid "64-bit PC (amd64)"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:23
-msgid "packages that contain files whose names contain the keyword"
+#: ../../english/releases/arches.data:10
+msgid "ARM"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:32
-msgid "Architecture"
+#: ../../english/releases/arches.data:11
+msgid "64-bit ARM (AArch64)"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:35
-msgid "Intel x86"
+#: ../../english/releases/arches.data:12
+msgid "EABI ARM"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:36
-msgid "Motorola 680x0"
+#: ../../english/releases/arches.data:13
+msgid "Hard Float ABI ARM"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:37
-msgid "Alpha"
+#: ../../english/releases/arches.data:14
+msgid "HP PA-RISC"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:38
-msgid "AMD64"
+#: ../../english/releases/arches.data:15
+msgid "Hurd 32-bit PC (i386)"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:39
-msgid "SPARC"
+#: ../../english/releases/arches.data:16
+msgid "32-bit PC (i386)"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:40
-msgid "PowerPC"
+#: ../../english/releases/arches.data:17
+msgid "Intel Itanium IA-64"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:41
-msgid "ARM"
+#: ../../english/releases/arches.data:18
+msgid "kFreeBSD 32-bit PC (i386)"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:42
-msgid "HP PA/RISC"
+#: ../../english/releases/arches.data:19
+msgid "kFreeBSD 64-bit PC (amd64)"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:43
-msgid "Intel IA-64"
+#: ../../english/releases/arches.data:20
+msgid "Motorola 680x0"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:44
+#: ../../english/releases/arches.data:21
msgid "MIPS (big endian)"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:45
+#: ../../english/releases/arches.data:22
msgid "MIPS (little endian)"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:46
+#: ../../english/releases/arches.data:23
+msgid "PowerPC"
+msgstr ""
+
+#: ../../english/releases/arches.data:24
+msgid "POWER Processors"
+msgstr ""
+
+#: ../../english/releases/arches.data:25
msgid "IBM S/390"
msgstr ""
-#. TODO: Hurd should be listed as a separate distribution
-#: ../../english/distrib/search_contents-form.inc:48
-msgid "Hurd (i386)"
+#: ../../english/releases/arches.data:26
+msgid "IBM System z"
msgstr ""
+#: ../../english/releases/arches.data:27
+msgid "SPARC"
+msgstr ""
diff --git a/vietnamese/po/doc.vi.po b/vietnamese/po/doc.vi.po
index 520b911f48e..f2dc289981b 100644
--- a/vietnamese/po/doc.vi.po
+++ b/vietnamese/po/doc.vi.po
@@ -3,78 +3,424 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.def:15
+#: ../../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"
+" l'admin Debian (published by Eyrolles). Accessible to all, this book\n"
+" teaches the essentials to anyone who wants to become an effective and\n"
+" independent Debian GNU/Linux administrator. \n"
+" It covers all the topics that a competent Linux administrator should\n"
+" master, from the installation and the update of the system, up to the\n"
+" creation of packages and the compilation of the kernel, but also\n"
+" monitoring, backup and migration, without forgetting advanced topics\n"
+" like SELinux setup to secure services, automated installations, or\n"
+" virtualization with Xen, KVM or LXC."
+msgstr ""
+
+#: ../../english/doc/books.data: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"
+" current unstable distribution). It is comprehensive with basic support\n"
+" for the user who installs and maintains the system themselves (whether\n"
+" in the home, office, club, or school)."
+msgstr ""
+
+#: ../../english/doc/books.data:88
+msgid "Sarge CD with installer and a selection of packages"
+msgstr ""
+
+#: ../../english/doc/books.data:89
+msgid "Live CD with Knoppix"
+msgstr ""
+
+#: ../../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"
+" intranet and internet servers, and development. It also contains\n"
+" background information on the project and extensive coverage of\n"
+" Debian's unique package management system."
+msgstr ""
+
+#: ../../english/doc/books.data: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: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"
+" illustrating the thinking behind each of the approaches. The goal is\n"
+" not to be a reference book, but to give the reader enough insight\n"
+" into the workings of the project and operating system to learn and\n"
+" embrace the sophisticated and elegant, sometimes at first slightly\n"
+" non-intuitive solutions that have evolved as part of the Debian\n"
+" system over the past decade. While targeted at the well-versed\n"
+" UNIX/Linux administrator, the book can also serve as an excellent\n"
+" resource alongside a standard Linux reference to bootstrap one's\n"
+" Linux experience in Debian's bottom-up philosophy."
+msgstr ""
+
+#: ../../english/doc/books.data: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 -- "
+"from\n"
+" working with text, images, and sound to productivity and networking\n"
+" issues. Like the software the book describes, the book is copylefted\n"
+" and its source data is available."
+msgstr ""
+
+#: ../../english/doc/books.data:140
+msgid "Debian 2.2 ARM architecture"
+msgstr ""
+
+#: ../../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, "
+"Psion5).\n"
+" It also gives generic information, tools and techniques. The GNU\n"
+" toolchain is covered in native and cross-compiler form, as are "
+"bootloaders,\n"
+" kernel patches, RAMdisks, ARM peculiarities and other ARM resources. It "
+"also\n"
+" includes extensive tutorial information on GNU/Linux basics for "
+"developers\n"
+" coming from other platforms.\n"
+" It is not specific to Debian, but the Aleph\n"
+" ARMLinux distribution is closely based on Debian-ARM and it is assumed "
+"you\n"
+" will be working from this distribution and preferably have a Debian based\n"
+" host machine too."
+msgstr ""
+
+#: ../../english/doc/books.data:163
+msgid ""
+"Learning Debian GNU/Linux guides the new user of Linux through the\n"
+" installation and configuration of Debian GNU/Linux.\n"
+" Windows users will gain a gentle introduction to this exciting\n"
+" computing world guided by Bill McCarty in <q>Learning Debian GNU/Linux</q>."
+msgstr ""
+
+#: ../../english/doc/books.data:172
+msgid "Debian 2.1"
+msgstr ""
+
+#: ../../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"
+" publishing, business, fun things, and multimedia. 30 days of free e-mail\n"
+" support included."
+msgstr ""
+
+#: ../../english/doc/books.data:190
+msgid "DVD Debian Squeeze i386/amd64"
+msgstr ""
+
+#: ../../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"
+" to the configuration of network services.\n"
+" Written by two Debian developers, this book can be of interest to many\n"
+" people: the beginner wishing to discover Debian, the advanced user "
+"looking\n"
+" for tips to enhance his mastership of the Debian tools and the\n"
+" administrator who wants to build a reliable network with Debian."
+msgstr ""
+
+#: ../../english/doc/books.data: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:248
+msgid "2 editions: One without a DVD, the other with 2 DVDs (i386)"
+msgstr ""
+
+#: ../../english/doc/books.data:256
+msgid "Debian Squeeze, 6.0.1a, Multi-Arch (i386 and amd64) on DVD"
+msgstr ""
+
+#: ../../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 "
+"the distribution (in its current version 6.0) and provides a practical "
+"manual for all users who want to learn more about Debian and its range of "
+"services."
+msgstr ""
+
+#: ../../english/doc/books.data:287
+msgid ""
+"2 editions: One with no CD, the other with Official CD (i386, contrib and "
+"sources)"
+msgstr ""
+
+#: ../../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"
+" System, window managers and desktop environments (KDE, GNOME) and a\n"
+" selection of important system services. Unix/Linux basics and\n"
+" concepts together with system usage and important components (bash,\n"
+" system services and important commands) are introduced.\n"
+" There is an explanation of Debian's package format and how to create\n"
+" packages in this format. It also includes an overview of standard Linux\n"
+" applications (networking, software development, LaTeX and office\n"
+" suites). Strong emphasis is on networking and system\n"
+" administration issues, like planing and building of a dial-in router or\n"
+" a server for Windows based clients (Samba)."
+msgstr ""
+
+#: ../../english/doc/books.data:333
+msgid "Debian GNU/Linux 3.1 Sarge installer (single-width CD)"
+msgstr ""
+
+#: ../../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:349
+msgid ""
+"Debian GNU/Linux 3.1r0 i386, author's edition (DVD +\n"
+" CD)"
+msgstr ""
+
+#: ../../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"
+" This book covers all aspects of using Debian GNU/Linux 3.1 Sarge, such\n"
+" as installation, desktop environments, system administration, and\n"
+" server configuration. Furthermore, this book also includes commercial\n"
+" font package that decorates your desktop. This book might be useful\n"
+" for all Debian users from beginners to advanced users."
+msgstr ""
+
+#: ../../english/doc/books.data:368
+msgid "Debian 2.2r0 i386 author's edition (3 CDs)"
+msgstr ""
+
+#: ../../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"
+" administration, kernel setup, sharing with Windows, building servers\n"
+" and so on.\n"
+" You will be able to install and start to use Debian GNU/Linux Japanese\n"
+" environment very easily with the customized CDs."
+msgstr ""
+
+#: ../../english/doc/books.data:387
+msgid "1 unofficial Woody, 3 Potato rev0"
+msgstr ""
+
+#: ../../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 "
+"and\n"
+" maintenance of system and networking,\n"
+" X Window System setup, and using multimedia in Debian GNU/Linux.\n"
+" This book also includes a guide for maintainers, which stimulates\n"
+" people in Korea to become official Debian maintainers."
+msgstr ""
+
+#: ../../english/doc/books.data:404
+msgid "Three official potato r3 CDs and an unofficial woody CD"
+msgstr ""
+
+#: ../../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"
+" comprehensive aspects of Debian GNU/Linux system: first-time setup,\n"
+" package installation, setting up X, connecting to Internet, network\n"
+" maintenance, and more. This book provides a handful of tips on setting up\n"
+" Debian for Korean language environment, and it is good for newcomers, too."
+msgstr ""
+
+#: ../../english/doc/books.data:429
+msgid "Debian GNU/Linux 3.1r0 CD1"
+msgstr ""
+
+#: ../../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"
+" database, firewall, mail, ftp and ... on it. Also helps you to start\n"
+" using GNU/Linux and Debian's powerful package management system."
+msgstr ""
+
+#: ../../english/doc/books.data:448
+msgid ""
+"This book is divided into four parts: Basic concepts, Management of\n"
+" GNU/Linux, Administration of the system and Advanced operations. Each "
+"chapter\n"
+" explains in depth the features of the operating system. The first\n"
+" chapters explain the structure of GNU/Linux. These chapters will help\n"
+" the reader to understand how the system uses basic resources such as\n"
+" the processor and memory. A detailed analysis about filesystems such as\n"
+" Ext2, Ext3, and ReiserFS will enable users to make the correct choice\n"
+" for their needs. Many figures throughout the book show aspects about\n"
+" the performance of the system. This book caters for college students\n"
+" and anyone who wants to learn GNU/Linux in depth. This book covers\n"
+" Debian Sarge."
+msgstr ""
+
+#: ../../english/doc/books.data: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 "
+"procedures reviewed and adjusted to fit into the best practices of "
+"technological infrastructure implementation. This easy to read and "
+"comprehensive guide will take you by the hand to achieve specific objectives "
+"with the Debian GNU/Linux operating system."
+msgstr ""
+
+#: ../../english/doc/books.def:38
msgid "Author:"
msgstr ""
-#: ../../english/doc/books.def:18
+#: ../../english/doc/books.def:41
msgid "email:"
msgstr ""
-#: ../../english/doc/books.def:22
+#: ../../english/doc/books.def:45
msgid "Available at:"
msgstr ""
-#: ../../english/doc/books.def:25
-msgid "Language:"
-msgstr ""
-
-#: ../../english/doc/books.def:29
+#: ../../english/doc/books.def:48
msgid "CD Included:"
msgstr ""
-#: ../../english/doc/books.def:32
+#: ../../english/doc/books.def:51
msgid "Publisher:"
msgstr ""
-#: ../../english/doc/manuals.defs:29
+#: ../../english/doc/manuals.defs:28
msgid "Authors:"
msgstr ""
-#: ../../english/doc/manuals.defs:36
+#: ../../english/doc/manuals.defs:35
msgid "Editors:"
msgstr ""
-#: ../../english/doc/manuals.defs:43
+#: ../../english/doc/manuals.defs:42
msgid "Maintainer:"
msgstr ""
-#: ../../english/doc/manuals.defs:50
+#: ../../english/doc/manuals.defs:49
msgid "Status:"
msgstr ""
-#: ../../english/doc/manuals.defs:57
+#: ../../english/doc/manuals.defs:56
msgid "Availability:"
msgstr ""
-#: ../../english/doc/manuals.defs:83
+#: ../../english/doc/manuals.defs:92
msgid "Latest version:"
msgstr ""
-#: ../../english/doc/manuals.defs:97
+#: ../../english/doc/manuals.defs:108
msgid "(version <get-var version />)"
msgstr ""
-#: ../../english/doc/manuals.defs:127
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
msgid "plain text"
msgstr ""
-#. The ddp_pkg_loc variable contains
-#. <a href="http://svn.debian.org/wsvn/ddp/manuals/trunk/manuals.sgml/[package]/">[package]</a>
-#: ../../english/doc/manuals.defs:146
-msgid "Use <a href=\"cvs\">SVN</a> to download the SGML source text for <get-var ddp_pkg_loc />."
+#: ../../english/doc/manuals.defs:154
+msgid ""
+"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 ""
-#: ../../english/doc/manuals.defs:152
-msgid "CVS sources working copy: set <code>CVSROOT</code>\n to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n and check out the <kbd>boot-floppies/documentation</kbd> module."
+#: ../../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:157
+#: ../../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"
+" and check out the <kbd>boot-floppies/documentation</kbd> module."
+msgstr ""
+
+#: ../../english/doc/manuals.defs:193
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:161
-#: ../../english/doc/manuals.defs:165
+#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
msgid "Debian package"
msgstr ""
+#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+msgid "Debian package (archived)"
+msgstr ""
+
+#: ../../english/releases/arches.data:34
+msgid "HTML"
+msgstr ""
+
+#: ../../english/releases/arches.data:35
+msgid "PDF"
+msgstr ""
diff --git a/vietnamese/po/mailinglists.vi.po b/vietnamese/po/mailinglists.vi.po
index 2e88cfd5c47..324c30101f0 100644
--- a/vietnamese/po/mailinglists.vi.po
+++ b/vietnamese/po/mailinglists.vi.po
@@ -132,8 +132,8 @@ msgstr "mở"
msgid "closed"
msgstr "đã đóng"
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "Vui lòng chỉ định bó thư nào bạn muốn đặt xem dài hạn:"
-
#~ msgid "Please select which lists you want to unsubscribe from:"
#~ msgstr "Vui lòng chọn bó nào mà bạn muốn đặt xem dài hạn:"
+
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "Vui lòng chỉ định bó thư nào bạn muốn đặt xem dài hạn:"
diff --git a/vietnamese/po/newsevents.vi.po b/vietnamese/po/newsevents.vi.po
index faaa4570a15..78c41608d77 100644
--- a/vietnamese/po/newsevents.vi.po
+++ b/vietnamese/po/newsevents.vi.po
@@ -3,6 +3,90 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr ""
+
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr ""
+
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr ""
+
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr ""
+
+#: ../../english/events/speakers/speakers.defs:12
+msgid "Name:"
+msgstr ""
+
+#: ../../english/events/speakers/speakers.defs:15
+msgid "Email:"
+msgstr ""
+
+#: ../../english/events/speakers/speakers.defs:20
+msgid "Previous Talks:"
+msgstr ""
+
+#: ../../english/events/speakers/speakers.defs:24
+msgid "Languages:"
+msgstr ""
+
+#: ../../english/events/speakers/speakers.defs:28
+msgid "Location:"
+msgstr ""
+
+#: ../../english/events/speakers/speakers.defs:31
+msgid "Topics:"
+msgstr ""
+
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr ""
+
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr ""
+
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr ""
+
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr ""
+
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr ""
+
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr ""
+
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr ""
+
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr ""
+
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr ""
+
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr ""
+
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr ""
+
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr ""
@@ -48,7 +132,9 @@ msgid "Download calendar entry"
msgstr ""
#: ../../english/template/debian/news.wml:9
-msgid "Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/\">Debian Project homepage</a>."
+msgid ""
+"Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/\">Debian "
+"Project homepage</a>."
msgstr ""
#. '<get-var url />' is replaced by the URL and must not be translated.
@@ -57,16 +143,191 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr ""
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
+#: ../../english/template/debian/projectnews/boilerplates.wml:35
+msgid ""
+"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
+"the Debian community. Topics covered in this issue include:"
msgstr ""
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#: ../../english/template/debian/projectnews/boilerplates.wml:56
+#: ../../english/template/debian/projectnews/boilerplates.wml:77
+msgid ""
+"According to the <a href=\"https://udd.debian.org/bugs.cgi\">Bugs Search "
+"interface of the Ultimate Debian Database</a>, the upcoming release, Debian "
+"<q><get-var release /></q>, is currently affected by <get-var testing /> "
+"Release-Critical bugs. Ignoring bugs which are easily solved or on the way "
+"to being solved, roughly speaking, about <get-var tobefixed /> Release-"
+"Critical bugs remain to be solved for the release to happen."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:57
+msgid ""
+"There are also some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats"
+"\">hints on how to interpret</a> these numbers."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:78
+msgid ""
+"There are also <a href=\"<get-var url />\">more detailed statistics</a> as "
+"well as some <a href=\"https://wiki.debian.org/ProjectNews/RC-Stats\">hints "
+"on how to interpret</a> these numbers."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:102
+msgid ""
+"<a href=\"<get-var link />\">Currently</a> <a href=\"m4_DEVEL/wnpp/orphaned"
+"\"><get-var orphaned /> packages are orphaned</a> and <a href=\"m4_DEVEL/"
+"wnpp/rfa\"><get-var rfa /> packages are up for adoption</a>: please visit "
+"the complete list of <a href=\"m4_DEVEL/wnpp/help_requested\">packages which "
+"need your help</a>."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:114
+msgid ""
+"Please help us create this newsletter. We still need more volunteer writers "
+"to watch the Debian community and report about what is going on. Please see "
+"the <a href=\"https://wiki.debian.org/ProjectNews/HowToContribute"
+"\">contributing page</a> to find out how to help. We're looking forward to "
+"receiving your mail at <a href=\"mailto:debian-publicity@lists.debian.org"
+"\">debian-publicity@lists.debian.org</a>."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:175
+msgid ""
+"Please note that these are a selection of the more important security "
+"advisories of the last weeks. If you need to be kept up to date about "
+"security advisories released by the Debian Security Team, please subscribe "
+"to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
+"\"<get-var url-stable-announce />\">stable updates list</a>) for "
+"announcements."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:176
+msgid ""
+"Please note that these are a selection of the more important security "
+"advisories of the last weeks. If you need to be kept up to date about "
+"security advisories released by the Debian Security Team, please subscribe "
+"to the <a href=\"<get-var url-dsa />\">security mailing list</a> (and the "
+"separate <a href=\"<get-var url-bpo />\">backports list</a>, and <a href="
+"\"<get-var url-stable-announce />\">stable updates list</a> or <a href="
+"\"<get-var url-volatile-announce />\">volatile list</a>, for <q><get-var old-"
+"stable /></q>, the oldstable distribution) for announcements."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:185
+msgid ""
+"Debian's Stable Release Team released an update announcement for the "
+"package: "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:187
+#: ../../english/template/debian/projectnews/boilerplates.wml:200
+#: ../../english/template/debian/projectnews/boilerplates.wml:213
+#: ../../english/template/debian/projectnews/boilerplates.wml:344
+#: ../../english/template/debian/projectnews/boilerplates.wml:358
+msgid ", "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:188
+#: ../../english/template/debian/projectnews/boilerplates.wml:201
+#: ../../english/template/debian/projectnews/boilerplates.wml:214
+#: ../../english/template/debian/projectnews/boilerplates.wml:345
+#: ../../english/template/debian/projectnews/boilerplates.wml:359
+msgid " and "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:189
+#: ../../english/template/debian/projectnews/boilerplates.wml:202
+#: ../../english/template/debian/projectnews/boilerplates.wml:215
+msgid ". "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:189
+#: ../../english/template/debian/projectnews/boilerplates.wml:202
+#: ../../english/template/debian/projectnews/boilerplates.wml:215
+msgid "Please read them carefully and take the proper measures."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:198
+msgid "Debian's Backports Team released advisories for these packages: "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:211
+msgid ""
+"Debian's Security Team recently released advisories for these packages "
+"(among others): "
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:240
+msgid ""
+"<get-var num-newpkg /> packages were added to the unstable Debian archive "
+"recently."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:242
+msgid " <a href=\"<get-var url-newpkg />\">Among many others</a> are:"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:269
+msgid "There are several upcoming Debian-related events:"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:275
+msgid ""
+"You can find more information about Debian-related events and talks on the "
+"<a href=\"<get-var events-section />\">events section</a> of the Debian web "
+"site, or subscribe to one of our events mailing lists for different regions: "
+"<a href=\"<get-var events-ml-eu />\">Europe</a>, <a href=\"<get-var events-"
+"ml-nl />\">Netherlands</a>, <a href=\"<get-var events-ml-ha />\">Hispanic "
+"America</a>, <a href=\"<get-var events-ml-na />\">North America</a>."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:300
+msgid ""
+"Do you want to organise a Debian booth or a Debian install party? Are you "
+"aware of other upcoming Debian-related events? Have you delivered a Debian "
+"talk that you want to link on our <a href=\"<get-var events-talks />\">talks "
+"page</a>? Send an email to the <a href=\"<get-var events-team />\">Debian "
+"Events Team</a>."
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:322
+msgid ""
+"<get-var dd-num /> applicants have been <a href=\"<get-var dd-url />"
+"\">accepted</a> as Debian Developers"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:329
+msgid ""
+"<get-var dm-num /> applicants have been <a href=\"<get-var dm-url />"
+"\">accepted</a> as Debian Maintainers"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:336
+msgid ""
+"<get-var uploader-num /> people have <a href=\"<get-var uploader-url />"
+"\">started to maintain packages</a>"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:381
+msgid ""
+"<get-var eval-newcontributors-text-list /> since the previous issue of the "
+"Debian Project News. Please welcome <get-var eval-newcontributors-name-list /"
+"> into our project!"
+msgstr ""
+
+#: ../../english/template/debian/projectnews/boilerplates.wml:394
+msgid ""
+"The <get-var issue-devel-news /> issue of the <a href=\"<get-var url-devel-"
+"news />\">miscellaneous news for developers</a> has been released and covers "
+"the following topics:"
msgstr ""
#: ../../english/template/debian/projectnews/footer.wml:6
-msgid "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://lists.debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
+msgid ""
+"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
+"org/debian-news/\">subscribe to the debian-news mailing list</a>."
msgstr ""
#: ../../english/template/debian/projectnews/footer.wml:10
@@ -76,101 +337,98 @@ msgstr ""
#. One editor name only
#: ../../english/template/debian/projectnews/footer.wml:15
-msgid "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgid ""
+"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
msgstr ""
#. Two or more editors
#: ../../english/template/debian/projectnews/footer.wml:20
-msgid "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgid ""
+"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
msgstr ""
#. One editor name only
#: ../../english/template/debian/projectnews/footer.wml:25
-msgid "<void id=\"singular\" />This issue of Debian Project News was edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgid ""
+"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
msgstr ""
#. Two or more editors
#: ../../english/template/debian/projectnews/footer.wml:30
-msgid "<void id=\"plural\" />This issue of Debian Project News was edited by <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+msgid ""
+"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
+"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
msgstr ""
#. One translator only
-#: ../../english/template/debian/projectnews/footer.wml:35
#. One translator only
+#: ../../english/template/debian/projectnews/footer.wml:35
#: ../../english/template/debian/weeklynews/footer.wml:35
msgid "<void id=\"singular\" />It was translated by %s."
msgstr ""
#. Two ore more translators
-#: ../../english/template/debian/projectnews/footer.wml:40
#. Two ore more translators
+#: ../../english/template/debian/projectnews/footer.wml:40
#: ../../english/template/debian/weeklynews/footer.wml:40
msgid "<void id=\"plural\" />It was translated by %s."
msgstr ""
#. One female translator only
-#: ../../english/template/debian/projectnews/footer.wml:45
#. One female translator only
+#: ../../english/template/debian/projectnews/footer.wml:45
#: ../../english/template/debian/weeklynews/footer.wml:45
msgid "<void id=\"singularfemale\" />It was translated by %s."
msgstr ""
#. Two ore more female translators
-#: ../../english/template/debian/projectnews/footer.wml:50
#. Two ore more female translators
+#: ../../english/template/debian/projectnews/footer.wml:50
#: ../../english/template/debian/weeklynews/footer.wml:50
msgid "<void id=\"pluralfemale\" />It was translated by %s."
msgstr ""
+#: ../../english/template/debian/speakers.wml:6
+msgid "List of Speakers"
+msgstr ""
+
+#: ../../english/template/debian/speakers.wml:9
+msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+msgstr ""
+
#: ../../english/template/debian/weeklynews/footer.wml:6
-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 weekly in your mailbox, <a href=\"https://lists."
+"debian.org/debian-news/\">subscribe to the debian-news mailing list</a>."
msgstr ""
#. One editor name only
#: ../../english/template/debian/weeklynews/footer.wml:15
-msgid "<void id=\"singular\" />Debian Weekly News is edited by <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>."
msgstr ""
#. Two or more editors
#: ../../english/template/debian/weeklynews/footer.wml:20
-msgid "<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
+msgid ""
+"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
msgstr ""
#. One editor name only
#: ../../english/template/debian/weeklynews/footer.wml:25
-msgid "<void id=\"singular\" />This issue of Debian Weekly News was edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
+msgid ""
+"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
msgstr ""
#. Two or more editors
#: ../../english/template/debian/weeklynews/footer.wml:30
-msgid "<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href=\"mailto:dwn@debian.org\">%s</a>."
-msgstr ""
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:11
-msgid "Name:"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:14
-msgid "Email:"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:19
-msgid "Previous Talks:"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:23
-msgid "Languages:"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:26
-msgid "Location:"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:29
-msgid "Topics:"
+msgid ""
+"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
msgstr ""
-
diff --git a/vietnamese/po/organization.vi.po b/vietnamese/po/organization.vi.po
index 4ff29e37398..77d5a236c32 100644
--- a/vietnamese/po/organization.vi.po
+++ b/vietnamese/po/organization.vi.po
@@ -76,17 +76,17 @@ msgid "Officers"
msgstr "Các nhân viên"
#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:79
+#: ../../english/intro/organization.data:77
msgid "Distribution"
msgstr "Phân phối"
#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:221
+#: ../../english/intro/organization.data:220
msgid "Publicity"
msgstr "Publicity"
#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:243
msgid "Support and Infrastructure"
msgstr "Hỗ trợ và Cơ sở hạ tầng"
@@ -103,191 +103,191 @@ msgstr "Lãnh đạo"
msgid "Technical Committee"
msgstr "Ủy ban kỹ thuật"
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:72
msgid "Secretary"
msgstr "Thư ký"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Development Projects"
msgstr "Các dự án phát triển"
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:81
msgid "FTP Archives"
msgstr "Lưu trữ FTP"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:83
msgid "FTP Masters"
msgstr "Chủ FPT"
-#: ../../english/intro/organization.data:89
+#: ../../english/intro/organization.data:87
msgid "FTP Assistants"
msgstr "Trợ lý FTP"
-#: ../../english/intro/organization.data:97
+#: ../../english/intro/organization.data:95
msgid "FTP Wizards"
msgstr "Thuật sỹ FTP"
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Backports"
msgstr "Chuyển ngược"
-#: ../../english/intro/organization.data:103
+#: ../../english/intro/organization.data:101
msgid "Backports Team"
msgstr "Nhóm chuyển ngược"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "Individual Packages"
msgstr "Các gói riêng lẻ"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:106
msgid "Release Management"
msgstr "Ban quản lý phát hành"
-#: ../../english/intro/organization.data:110
+#: ../../english/intro/organization.data:108
msgid "Release Team"
msgstr "Nhóm phát hành"
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:121
msgid "Quality Assurance"
msgstr "Đảm bảo chất lượng"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Installation System Team"
msgstr "Nhóm Hệ thống cài đặt"
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:123
msgid "Release Notes"
msgstr "Ghi chú phát hành"
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:125
msgid "CD Images"
msgstr "Ảnh CD"
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:127
msgid "Production"
msgstr "Sản xuất"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:135
msgid "Testing"
msgstr "Thử nghiệm"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:137
msgid "Autobuilding infrastructure"
msgstr "Cơ sở hạ tầng tự động biên dịch"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:139
msgid "Wanna-build team"
msgstr "Nhóm Wanna-build"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:147
msgid "Buildd administration"
msgstr "Quản tri Buildd"
-#: ../../english/intro/organization.data:167
+#: ../../english/intro/organization.data:166
msgid "Documentation"
msgstr "Tài liệu"
-#: ../../english/intro/organization.data:172
+#: ../../english/intro/organization.data:171
msgid "Work-Needing and Prospective Packages list"
msgstr "Danh sách các gói cần làm và trong tương lai"
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:174
msgid "Live System Team"
msgstr "Nhóm hệ thống Live"
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:175
msgid "Ports"
msgstr "Bản chuyển đổi"
-#: ../../english/intro/organization.data:211
+#: ../../english/intro/organization.data:210
msgid "Special Configurations"
msgstr "Các cấu hình đặc biệt"
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:213
msgid "Laptops"
msgstr "Máy tính xách tay"
-#: ../../english/intro/organization.data:215
+#: ../../english/intro/organization.data:214
msgid "Firewalls"
msgstr "Tường lửa"
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:215
msgid "Embedded systems"
msgstr "Các hệ thống nhúng"
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:223
msgid "Press Contact"
msgstr "Liên hệ báo chí"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:229
msgid "Partner Program"
msgstr "Chương trình đối tác"
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:232
msgid "Events"
msgstr "Sự kiện"
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:237
msgid "Bits from Debian"
msgstr "Bits từ Debian"
-#: ../../english/intro/organization.data:248
+#: ../../english/intro/organization.data:246
msgid "User support"
msgstr "Hỗ trợ người dùng"
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:313
msgid "Bug Tracking System"
msgstr "Hệ thống theo dõi lỗi"
-#: ../../english/intro/organization.data:320
+#: ../../english/intro/organization.data:318
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Quản trị và Lưu trữ các bó thư"
-#: ../../english/intro/organization.data:328
+#: ../../english/intro/organization.data:326
msgid "New Members Front Desk"
msgstr "Các thành viên Bàn lễ tân mới"
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:332
msgid "Debian Account Managers"
msgstr "Quản lý các tài khoản Debian"
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:337
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Những nhà bảo trì chùm chìa khóa (PGP và GPG)"
-#: ../../english/intro/organization.data:343
+#: ../../english/intro/organization.data:340
msgid "Debian Maintainer (DM) Keyring Maintainers"
msgstr "Những người quản lý chùm chìa khóa Nhà bảo trì Debian (DM)"
-#: ../../english/intro/organization.data:347
+#: ../../english/intro/organization.data:344
msgid "Security Team"
msgstr "Nhóm bảo mật"
-#: ../../english/intro/organization.data:362
+#: ../../english/intro/organization.data:359
msgid "Web Pages"
msgstr "Trang thông tin điện tử"
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:366
msgid "Consultants Page"
msgstr "Trang cố vấn"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:371
msgid "CD Vendors Page"
msgstr "Trang nhà cung cấp CD"
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:374
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:378
msgid "Policy"
msgstr "Chính sách"
-#: ../../english/intro/organization.data:386
+#: ../../english/intro/organization.data:383
msgid "System Administration"
msgstr "Quản trị hệ thống"
-#: ../../english/intro/organization.data:387
+#: ../../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."
@@ -295,7 +295,7 @@ msgstr ""
"Đây là địa chỉ dùng khi gặp trục trặc với một trong số các máy của Debian, "
"bao gồm các vấn đề với mật khẩu hoặc bạn muốn một gói nào đó được cài đặt."
-#: ../../english/intro/organization.data:397
+#: ../../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 "
@@ -305,90 +305,89 @@ msgstr ""
"href=\"https://db.debian.org/machines.cgi\">Các máy Debian</a>, nó chứa "
"thông tin quản trị cho từng máy."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:395
msgid "LDAP Developer Directory Administrator"
msgstr "Nhà quản trị Thư mục Phát triển LDAP"
-#: ../../english/intro/organization.data:399
+#: ../../english/intro/organization.data:396
msgid "Mirrors"
msgstr "Máy bản sao"
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:401
msgid "DNS Maintainer"
msgstr "Quản trị DNS"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:402
msgid "Package Tracking System"
msgstr "Hệ thống theo dõi lỗi"
-#: ../../english/intro/organization.data:407
+#: ../../english/intro/organization.data:404
msgid "Hardware Donations Coordination"
msgstr "Điều phối các quyên góp phần cứng"
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:410
msgid "Auditor"
msgstr "Kiểm soát"
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:413
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Các yêu cầu dùng <a name=\"trademark\" href=\"m4_HOME/trademark\">nhãn hiệu</"
"a>"
-#: ../../english/intro/organization.data:417
-msgid "current Debian Project Leader"
-msgstr "Nhà lãnh đạo dự án Debian hiện tại"
-
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:416
msgid "Alioth administrators"
msgstr "Các quản trị viên Alioth"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:422
msgid "Debian Women Project"
msgstr "Dự án Phụ nữ Debian"
-#: ../../english/intro/organization.data:432
+#: ../../english/intro/organization.data:429
msgid "DebConf chairs"
msgstr "Các ghế DebConf"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:433
msgid "Anti-harassment"
msgstr "Chống quấy rối"
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:436
msgid "Outreach"
msgstr "Hoạt động ngoài lề"
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:446
msgid "Debian for children from 1 to 99"
msgstr "Debian dành cho trẻ em từ 1 đến 99"
-#: ../../english/intro/organization.data:452
+#: ../../english/intro/organization.data:449
msgid "Debian for medical practice and research"
msgstr "Debian dành cho nghiên cứu và thực hành y học"
-#: ../../english/intro/organization.data:455
+#: ../../english/intro/organization.data:452
msgid "Debian for education"
msgstr "Debian dành cho giáo dục"
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:457
msgid "Debian in legal offices"
msgstr "Debian trong các văn phòng luật"
-#: ../../english/intro/organization.data:464
+#: ../../english/intro/organization.data:461
msgid "Debian for people with disabilities"
msgstr "Debian dành cho những người khuyết tật"
-#: ../../english/intro/organization.data:468
+#: ../../english/intro/organization.data:465
msgid "Debian for science and related research"
msgstr "Debian dành cho khoa học và nghiên cứu"
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Bạn phân phối Debian tùy chỉnh"
+#~ msgid "Marketing Team"
+#~ msgstr "Nhóm tiếp cận thị trường"
#~ msgid "Release Team for ``stable''"
#~ msgstr "Nhóm phát hành cho bản ổn định ``stable''"
-#~ msgid "Marketing Team"
-#~ msgstr "Nhóm tiếp cận thị trường"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Bạn phân phối Debian tùy chỉnh"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Nhà lãnh đạo dự án Debian hiện tại"
diff --git a/vietnamese/po/others.vi.po b/vietnamese/po/others.vi.po
index 22bf9d28e4b..119effbc9b2 100644
--- a/vietnamese/po/others.vi.po
+++ b/vietnamese/po/others.vi.po
@@ -51,24 +51,71 @@ msgstr ""
msgid "Unavailable"
msgstr ""
-#: ../../english/devel/website/tc.data:13
-msgid "See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> (only available in French) for more information."
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr ""
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr ""
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr ""
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr ""
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr ""
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr ""
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr ""
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
msgstr ""
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr ""
+
+#: ../../english/devel/website/tc.data:11
+msgid ""
+"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
+"(only available in French) for more information."
+msgstr ""
+
+#: ../../english/devel/website/tc.data:12
+#: ../../english/devel/website/tc.data:14
#: ../../english/devel/website/tc.data:15
-msgid "See <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</a> (only available in Spanish) for more information."
+#: ../../english/devel/website/tc.data:16
+msgid "More information"
msgstr ""
-#: ../../english/distrib/pre-installed.data:40
-msgid "Phone:"
+#: ../../english/devel/website/tc.data:13
+msgid ""
+"See <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</"
+"a> (only available in Spanish) for more information."
+msgstr ""
+
+#: ../../english/distrib/pre-installed.defs:18
+msgid "Phone"
msgstr ""
-#: ../../english/distrib/pre-installed.data:43
-msgid "Fax:"
+#: ../../english/distrib/pre-installed.defs:19
+msgid "Fax"
msgstr ""
-#: ../../english/distrib/pre-installed.data:49
-msgid "Address:"
+#: ../../english/distrib/pre-installed.defs:21
+msgid "Address"
msgstr ""
#: ../../english/logos/index.data:6
@@ -99,6 +146,10 @@ msgstr ""
msgid "[Debian] (mini button)"
msgstr ""
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr ""
+
#: ../../english/misc/merchandise.def:8
msgid "Products"
msgstr ""
@@ -143,116 +194,105 @@ msgstr ""
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:43
+#: ../../english/misc/merchandise.def:42
msgid "earrings"
msgstr ""
-#: ../../english/misc/merchandise.def:47
+#: ../../english/misc/merchandise.def:45
msgid "suitcases"
msgstr ""
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
+#: ../../english/misc/merchandise.def:48
+msgid "umbrellas"
msgstr ""
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
+#: ../../english/misc/merchandise.def:51
+msgid "pillowcases"
msgstr ""
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
+#: ../../english/misc/merchandise.def:54
+msgid "keychains"
msgstr ""
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
+#: ../../english/misc/merchandise.def:57
+msgid "Swiss army knives"
msgstr ""
-#: ../../english/y2k/l10n.data:18
-msgid "??"
+#: ../../english/misc/merchandise.def:61
+msgid "USB-Sticks"
msgstr ""
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
msgstr ""
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
msgstr ""
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:30
-msgid "Status"
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
msgstr ""
-#: ../../english/y2k/l10n.data:33
-msgid "Version"
-msgstr ""
-
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Maintainers' Corner"
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
msgstr ""
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
msgstr ""
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
msgstr ""
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
msgstr ""
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
+#: ../../english/y2k/l10n.data:6
+msgid "OK"
msgstr ""
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
+#: ../../english/y2k/l10n.data:9
+msgid "BAD"
msgstr ""
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
+#: ../../english/y2k/l10n.data:12
+msgid "OK?"
msgstr ""
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
+#: ../../english/y2k/l10n.data:15
+msgid "BAD?"
msgstr ""
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
+#: ../../english/y2k/l10n.data:18
+msgid "??"
msgstr ""
-#: ../../english/misc/hardware.def:12
-#: ../../english/misc/hardware.def:17
-msgid "Wanted:"
+#: ../../english/y2k/l10n.data:21
+msgid "Unknown"
msgstr ""
-#: ../../english/misc/hardware.def:22
-msgid "Who:"
+#: ../../english/y2k/l10n.data:24
+msgid "ALL"
msgstr ""
-#: ../../english/misc/hardware.def:26
-msgid "Architecture:"
+#: ../../english/y2k/l10n.data:27
+msgid "Package"
msgstr ""
-#: ../../english/misc/hardware.def:30
-msgid "Specifications:"
+#: ../../english/y2k/l10n.data:30
+msgid "Status"
msgstr ""
-#: ../../english/misc/hardware.def:35
-msgid "Where:"
+#: ../../english/y2k/l10n.data:33
+msgid "Version"
msgstr ""
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
+#: ../../english/y2k/l10n.data:36
+msgid "URL"
msgstr ""
-
diff --git a/vietnamese/po/ports.vi.po b/vietnamese/po/ports.vi.po
index fb79e183ce3..ca0a4ac5880 100644
--- a/vietnamese/po/ports.vi.po
+++ b/vietnamese/po/ports.vi.po
@@ -3,6 +3,22 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr ""
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr ""
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr ""
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr ""
+
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr ""
@@ -28,84 +44,43 @@ msgid "Installation"
msgstr ""
#: ../../english/ports/menu.defs:35
-msgid "Links"
+msgid "Configuration"
msgstr ""
#: ../../english/ports/menu.defs:39
-msgid "News"
+msgid "Links"
msgstr ""
#: ../../english/ports/menu.defs:43
-msgid "Porting"
+msgid "News"
msgstr ""
#: ../../english/ports/menu.defs:47
-msgid "Ports"
+msgid "Porting"
msgstr ""
#: ../../english/ports/menu.defs:51
-msgid "Problems"
+msgid "Ports"
msgstr ""
#: ../../english/ports/menu.defs:55
-msgid "Software Map"
+msgid "Problems"
msgstr ""
#: ../../english/ports/menu.defs:59
-msgid "Status"
+msgid "Software Map"
msgstr ""
#: ../../english/ports/menu.defs:63
-msgid "Supply"
+msgid "Status"
msgstr ""
#: ../../english/ports/menu.defs:67
-msgid "Systems"
-msgstr ""
-
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr ""
-
-#: ../../english/ports/amd64/menu.inc:6
-msgid "Debian for AMD64"
-msgstr ""
-
-#: ../../english/ports/arm/menu.inc:6
-msgid "Debian for ARM"
-msgstr ""
-
-#: ../../english/ports/beowulf/menu.inc:6
-msgid "Debian for Beowulf"
-msgstr ""
-
-#: ../../english/ports/freebsd/menu.inc:6
-#: ../../english/ports/kfreebsd-gnu/menu.inc:6
-msgid "Main"
-msgstr ""
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr ""
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr ""
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr ""
-
-#: ../../english/ports/kfreebsd-gnu/menu.inc:9
-msgid "Debian GNU/FreeBSD"
-msgstr ""
-
-#: ../../english/ports/m68k/menu.inc:6
-msgid "Debian for Motorola 680x0"
+msgid "Supply"
msgstr ""
-#: ../../english/ports/mips/menu.inc:6
-msgid "Debian for MIPS"
+#: ../../english/ports/menu.defs:71
+msgid "Systems"
msgstr ""
#: ../../english/ports/netbsd/menu.inc:6
@@ -128,19 +103,6 @@ msgstr ""
msgid "Debian for PowerPC"
msgstr ""
-#: ../../english/ports/s390/menu.inc:6
-msgid "Debian for S/390"
-msgstr ""
-
#: ../../english/ports/sparc/menu.inc:6
msgid "Debian for Sparc"
msgstr ""
-
-#: ../../english/ports/sparc64/menu.inc:6
-msgid "Debian for Sparc64"
-msgstr ""
-
-#: ../../english/misc/laptops/menu.inc:8
-msgid "Debian for Laptops"
-msgstr ""
-
diff --git a/vietnamese/po/security.vi.po b/vietnamese/po/security.vi.po
index 104774adbdb..39c632da6c2 100644
--- a/vietnamese/po/security.vi.po
+++ b/vietnamese/po/security.vi.po
@@ -4,6 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: webwml security\n"
+"PO-Revision-Date: 2015-05-23 08:23+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n"
"Language: vi\n"
@@ -12,7 +13,42 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Gtranslator 2.91.6\n"
-"PO-Revision-Date: 2015-05-23 08:23+0700\n"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Bảo mật Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Cố vấn bảo mật Debian"
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Q"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"cố vấn bảo mật <a href=\\\"undated/\\\">chưa biết ngày</a>, được bao gồm cho "
+"hậu thế"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Từ điển CVE Mitre"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Cơ sở dữ liệu Securityfocus Bugtraq"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Cố vấn CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Ghi chú về khả năng bị tấn công US-CERT"
#: ../../english/template/debian/security.wml:11
msgid "Source:"
@@ -95,39 +131,3 @@ msgstr "Ghi chú về khả năng có thể bị tấn công, cố vấn, và s
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr "Hiện tại không có tham khảo bảo mật cơ sở dữ liệu bên ngoài sẵn có."
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "Q"
-
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Bảo mật Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Cố vấn bảo mật Debian"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Từ điển CVE Mitre"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Cơ sở dữ liệu Securityfocus Bugtraq"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Cố vấn CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Ghi chú về khả năng bị tấn công US-CERT"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"cố vấn bảo mật <a href=\\\"undated/\\\">chưa biết ngày</a>, được bao gồm cho "
-"hậu thế"
diff --git a/vietnamese/po/stats.vi.po b/vietnamese/po/stats.vi.po
index e69de29bb2d..c176765f1d8 100644
--- a/vietnamese/po/stats.vi.po
+++ b/vietnamese/po/stats.vi.po
@@ -0,0 +1,221 @@
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr ""
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr ""
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr ""
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr ""
+
+#: ../../stattrans.pl:229 ../../stattrans.pl:233
+msgid "This translation is too out of date"
+msgstr ""
+
+#: ../../stattrans.pl:231 ../../stattrans.pl:427
+msgid "Wrong translation version"
+msgstr ""
+
+#: ../../stattrans.pl:235
+msgid "The original is newer than this translation"
+msgstr ""
+
+#: ../../stattrans.pl:238 ../../stattrans.pl:427
+msgid "The original no longer exists"
+msgstr ""
+
+#: ../../stattrans.pl:403
+msgid "hit count N/A"
+msgstr ""
+
+#: ../../stattrans.pl:403
+msgid "hits"
+msgstr ""
+
+#: ../../stattrans.pl:421 ../../stattrans.pl:422
+msgid "Click to fetch diffstat data"
+msgstr ""
+
+#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
+msgid "Unified diff"
+msgstr ""
+
+#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
+msgid "Colored diff"
+msgstr ""
+
+#: ../../stattrans.pl:541
+msgid "Translation summary for"
+msgstr ""
+
+#: ../../stattrans.pl:544 ../../stattrans.pl:700 ../../stattrans.pl:746
+#: ../../stattrans.pl:789
+msgid "Not translated"
+msgstr ""
+
+#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:544
+msgid "Translated"
+msgstr ""
+
+#: ../../stattrans.pl:544 ../../stattrans.pl:626 ../../stattrans.pl:698
+#: ../../stattrans.pl:744 ../../stattrans.pl:787
+msgid "Up to date"
+msgstr ""
+
+#: ../../stattrans.pl:545 ../../stattrans.pl:546 ../../stattrans.pl:547
+#: ../../stattrans.pl:548
+msgid "files"
+msgstr ""
+
+#: ../../stattrans.pl:551 ../../stattrans.pl:552 ../../stattrans.pl:553
+#: ../../stattrans.pl:554
+msgid "bytes"
+msgstr ""
+
+#: ../../stattrans.pl:561
+msgid ""
+"Note: the lists of pages are sorted by popularity. Hover over the page name "
+"to see the number of hits."
+msgstr ""
+
+#: ../../stattrans.pl:567
+msgid "Outdated translations"
+msgstr ""
+
+#: ../../stattrans.pl:569 ../../stattrans.pl:625
+msgid "File"
+msgstr ""
+
+#: ../../stattrans.pl:571 ../../stattrans.pl:577
+msgid "Diff"
+msgstr ""
+
+#: ../../stattrans.pl:573
+msgid "Comment"
+msgstr ""
+
+#: ../../stattrans.pl:574
+msgid "Diffstat"
+msgstr ""
+
+#: ../../stattrans.pl:579
+msgid "Log"
+msgstr ""
+
+#: ../../stattrans.pl:580
+msgid "Translation"
+msgstr ""
+
+#: ../../stattrans.pl:581
+msgid "Maintainer"
+msgstr ""
+
+#: ../../stattrans.pl:583
+msgid "Status"
+msgstr ""
+
+#: ../../stattrans.pl:584
+msgid "Translator"
+msgstr ""
+
+#: ../../stattrans.pl:585
+msgid "Date"
+msgstr ""
+
+#: ../../stattrans.pl:592
+msgid "General pages not translated"
+msgstr ""
+
+#: ../../stattrans.pl:593
+msgid "Untranslated general pages"
+msgstr ""
+
+#: ../../stattrans.pl:598
+msgid "News items not translated"
+msgstr ""
+
+#: ../../stattrans.pl:599
+msgid "Untranslated news items"
+msgstr ""
+
+#: ../../stattrans.pl:604
+msgid "Consultant/user pages not translated"
+msgstr ""
+
+#: ../../stattrans.pl:605
+msgid "Untranslated consultant/user pages"
+msgstr ""
+
+#: ../../stattrans.pl:610
+msgid "International pages not translated"
+msgstr ""
+
+#: ../../stattrans.pl:611
+msgid "Untranslated international pages"
+msgstr ""
+
+#: ../../stattrans.pl:616
+msgid "Translated pages (up-to-date)"
+msgstr ""
+
+#: ../../stattrans.pl:623 ../../stattrans.pl:771
+msgid "Translated templates (PO files)"
+msgstr ""
+
+#: ../../stattrans.pl:624 ../../stattrans.pl:774
+msgid "PO Translation Statistics"
+msgstr ""
+
+#: ../../stattrans.pl:627 ../../stattrans.pl:788
+msgid "Fuzzy"
+msgstr ""
+
+#: ../../stattrans.pl:628
+msgid "Untranslated"
+msgstr ""
+
+#: ../../stattrans.pl:629
+msgid "Total"
+msgstr ""
+
+#: ../../stattrans.pl:646
+msgid "Total:"
+msgstr ""
+
+#: ../../stattrans.pl:659 ../../stattrans.pl:813
+msgid "Created with"
+msgstr ""
+
+#: ../../stattrans.pl:678
+msgid "Translated web pages"
+msgstr ""
+
+#: ../../stattrans.pl:681
+msgid "Translation Statistics by Page Count"
+msgstr ""
+
+#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
+msgid "Language"
+msgstr ""
+
+#: ../../stattrans.pl:697 ../../stattrans.pl:743
+msgid "Translations"
+msgstr ""
+
+#: ../../stattrans.pl:724
+msgid "Translated web pages (by size)"
+msgstr ""
+
+#: ../../stattrans.pl:727
+msgid "Translation Statistics by Page Size"
+msgstr ""
diff --git a/vietnamese/po/vendors.vi.po b/vietnamese/po/vendors.vi.po
index fdf87baab79..22536f2753b 100644
--- a/vietnamese/po/vendors.vi.po
+++ b/vietnamese/po/vendors.vi.po
@@ -14,103 +14,91 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: ../../english/CD/vendors/vendors.CD.def:6
-msgid "Vendor:"
-msgstr "Nhà cung cấp:"
-
-#: ../../english/CD/vendors/vendors.CD.def:7
-msgid "URL for Debian Page:"
-msgstr "URL cho trang Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:8
-msgid "Allows Contribution to Debian:"
-msgstr "Cho phép các phần đóng góp cho Debian:"
-
-#: ../../english/CD/vendors/vendors.CD.def:9
-msgid "Country:"
-msgstr "Nước:"
-
-#: ../../english/CD/vendors/vendors.CD.def:10
-msgid "Ship International:"
-msgstr "Vận chuyển quốc tế:"
-
-#: ../../english/CD/vendors/vendors.CD.def:11
-msgid "email:"
-msgstr "thư điện tử:"
-
-#: ../../english/CD/vendors/vendors.CD.def:12
-msgid "CD Type:"
-msgstr "Kiểu CD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:13
-msgid "DVD Type:"
-msgstr "Kiểu DVD:"
-
#: ../../english/CD/vendors/vendors.CD.def:14
-#| msgid "CD Type:"
-msgid "BD Type:"
-msgstr "Kiểu BD:"
-
-#: ../../english/CD/vendors/vendors.CD.def:15
-#| msgid "CD Type:"
-msgid "USB Type:"
-msgstr "Kiểu USB:"
-
-#: ../../english/CD/vendors/vendors.CD.def:16
-msgid "Architectures:"
-msgstr "Các kiến trúc:"
-
-#: ../../english/CD/vendors/vendors.CD.def:28
msgid "Vendor"
msgstr "Nhà cung cấp"
-#: ../../english/CD/vendors/vendors.CD.def:29
+#: ../../english/CD/vendors/vendors.CD.def:15
msgid "Allows Contributions"
msgstr "Cho phép các phần đóng góp"
-#: ../../english/CD/vendors/vendors.CD.def:30
-#| msgid "CD/DVD"
+#: ../../english/CD/vendors/vendors.CD.def:16
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD/BD/USB"
-#: ../../english/CD/vendors/vendors.CD.def:31
+#: ../../english/CD/vendors/vendors.CD.def:17
msgid "Architectures"
msgstr "Các kiến trúc"
-#: ../../english/CD/vendors/vendors.CD.def:32
+#: ../../english/CD/vendors/vendors.CD.def:18
msgid "Ship International"
msgstr "Vận chuyển quốc tế"
-#: ../../english/CD/vendors/vendors.CD.def:33
+#: ../../english/CD/vendors/vendors.CD.def:19
msgid "Contact"
msgstr "Liên hệ"
#. ###################
#. Vendor home page link, Debian page link
-#: ../../english/CD/vendors/vendors.CD.def:58
+#: ../../english/CD/vendors/vendors.CD.def:44
msgid "Vendor Home"
msgstr "Trang chủ nhà cung cấp"
-#: ../../english/CD/vendors/vendors.CD.def:84
+#: ../../english/CD/vendors/vendors.CD.def:70
msgid "page"
msgstr "trang"
-#: ../../english/CD/vendors/vendors.CD.def:85
+#: ../../english/CD/vendors/vendors.CD.def:71
msgid "email"
msgstr "thư điện tử"
-#: ../../english/CD/vendors/vendors.CD.def:128
+#: ../../english/CD/vendors/vendors.CD.def:114
msgid "within Europe"
msgstr "bên trong châu Âu"
-#: ../../english/CD/vendors/vendors.CD.def:132
+#: ../../english/CD/vendors/vendors.CD.def:118
msgid "To some areas"
msgstr "Đến một số vùng"
-#: ../../english/CD/vendors/vendors.CD.def:136
+#: ../../english/CD/vendors/vendors.CD.def:122
msgid "source"
msgstr "nguồn"
-#: ../../english/CD/vendors/vendors.CD.def:140
+#: ../../english/CD/vendors/vendors.CD.def:126
msgid "and"
msgstr "và"
+
+#~ msgid "Architectures:"
+#~ msgstr "Các kiến trúc:"
+
+#~| msgid "CD Type:"
+#~ msgid "USB Type:"
+#~ msgstr "Kiểu USB:"
+
+#~| msgid "CD Type:"
+#~ msgid "BD Type:"
+#~ msgstr "Kiểu BD:"
+
+#~ msgid "DVD Type:"
+#~ msgstr "Kiểu DVD:"
+
+#~ msgid "CD Type:"
+#~ msgstr "Kiểu CD:"
+
+#~ msgid "email:"
+#~ msgstr "thư điện tử:"
+
+#~ msgid "Ship International:"
+#~ msgstr "Vận chuyển quốc tế:"
+
+#~ msgid "Country:"
+#~ msgstr "Nước:"
+
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Cho phép các phần đóng góp cho Debian:"
+
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL cho trang Debian:"
+
+#~ msgid "Vendor:"
+#~ msgstr "Nhà cung cấp:"
diff --git a/vietnamese/po/vote.vi.po b/vietnamese/po/vote.vi.po
index f3638dc6152..35e3d42d7f9 100644
--- a/vietnamese/po/vote.vi.po
+++ b/vietnamese/po/vote.vi.po
@@ -12,230 +12,245 @@ msgid "Time Line"
msgstr ""
#: ../../english/template/debian/votebar.wml:19
-msgid "Nominations"
+msgid "Summary"
msgstr ""
#: ../../english/template/debian/votebar.wml:22
-msgid "Debate"
+msgid "Nominations"
msgstr ""
#: ../../english/template/debian/votebar.wml:25
-msgid "Platforms"
+msgid "Debate"
msgstr ""
#: ../../english/template/debian/votebar.wml:28
-msgid "Proposer"
+msgid "Platforms"
msgstr ""
#: ../../english/template/debian/votebar.wml:31
-msgid "Proposal A Proposer"
+msgid "Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:34
-msgid "Proposal B Proposer"
+msgid "Proposal A Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:37
-msgid "Proposal C Proposer"
+msgid "Proposal B Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:40
-msgid "Proposal D Proposer"
+msgid "Proposal C Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:43
-msgid "Proposal E Proposer"
+msgid "Proposal D Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:46
-msgid "Proposal F Proposer"
+msgid "Proposal E Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:49
-msgid "Seconds"
+msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:52
-msgid "Proposal A Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Proposal B Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal C Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal D Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal E Seconds"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal F Seconds"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Opposition"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Text"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Proposal A"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Proposal B"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal C"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal D"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal E"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal F"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Choices"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Amendment Proposer"
+msgid "Choices"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Amendment Seconds"
+msgid "Amendment Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Text"
+msgid "Amendment Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Proposer A"
+msgid "Amendment Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Seconds A"
+msgid "Amendment Proposer A"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Text A"
+msgid "Amendment Seconds A"
msgstr ""
#: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Proposer B"
+msgid "Amendment Text A"
msgstr ""
#: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Seconds B"
+msgid "Amendment Proposer B"
msgstr ""
#: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Text B"
+msgid "Amendment Seconds B"
msgstr ""
#: ../../english/template/debian/votebar.wml:124
-msgid "Amendments"
+msgid "Amendment Text B"
msgstr ""
#: ../../english/template/debian/votebar.wml:127
-msgid "Proceedings"
+msgid "Amendment Proposer C"
msgstr ""
#: ../../english/template/debian/votebar.wml:130
-msgid "Majority Requirement"
+msgid "Amendment Seconds C"
msgstr ""
#: ../../english/template/debian/votebar.wml:133
-msgid "Data and Statistics"
+msgid "Amendment Text C"
msgstr ""
#: ../../english/template/debian/votebar.wml:136
-msgid "Quorum"
+msgid "Amendments"
msgstr ""
#: ../../english/template/debian/votebar.wml:139
-msgid "Minimum Discussion"
+msgid "Proceedings"
msgstr ""
#: ../../english/template/debian/votebar.wml:142
-msgid "Ballot"
+msgid "Majority Requirement"
msgstr ""
#: ../../english/template/debian/votebar.wml:145
-msgid "Forum"
+msgid "Data and Statistics"
msgstr ""
#: ../../english/template/debian/votebar.wml:148
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:151
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:154
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:157
+msgid "Forum"
+msgstr ""
+
+#: ../../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 ""
-#: ../../english/template/debian/votebar.wml:155
+#: ../../english/template/debian/votebar.wml:167
msgid "In&nbsp;Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:158
+#: ../../english/template/debian/votebar.wml:170
msgid "Voting&nbsp;Open"
msgstr ""
-#: ../../english/template/debian/votebar.wml:161
+#: ../../english/template/debian/votebar.wml:173
msgid "Decided"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:176
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:179
msgid "Other"
msgstr ""
-#: ../../english/template/debian/votebar.wml:171
+#: ../../english/template/debian/votebar.wml:183
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr ""
-#: ../../english/template/debian/votebar.wml:174
+#: ../../english/template/debian/votebar.wml:186
msgid "How&nbsp;To"
msgstr ""
-#: ../../english/template/debian/votebar.wml:177
+#: ../../english/template/debian/votebar.wml:189
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:180
+#: ../../english/template/debian/votebar.wml:192
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:195
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:198
msgid "Read&nbsp;a&nbsp;Result"
msgstr ""
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:201
msgid "Vote"
msgstr ""
-
diff --git a/vietnamese/po/wnpp.vi.po b/vietnamese/po/wnpp.vi.po
index 39d8fdf7a0c..efc21dc9dbc 100644
--- a/vietnamese/po/wnpp.vi.po
+++ b/vietnamese/po/wnpp.vi.po
@@ -41,33 +41,87 @@ msgstr ""
msgid "%s days in adoption."
msgstr ""
+#: ../../english/template/debian/wnpp.wml:46
+msgid "%s days in adoption, last activity today."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:50
+msgid "%s days in adoption, last activity yesterday."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:54
+msgid "%s days in adoption, last activity %s days ago."
+msgstr ""
+
#. timespans for being_packaged (ITPs)
-#: ../../english/template/debian/wnpp.wml:47
+#: ../../english/template/debian/wnpp.wml:60
msgid "in preparation since today."
msgstr ""
-#: ../../english/template/debian/wnpp.wml:51
+#: ../../english/template/debian/wnpp.wml:64
msgid "in preparation since yesterday."
msgstr ""
-#: ../../english/template/debian/wnpp.wml:55
+#: ../../english/template/debian/wnpp.wml:68
msgid "%s days in preparation."
msgstr ""
+#: ../../english/template/debian/wnpp.wml:72
+msgid "%s days in preparation, last activity today."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:76
+msgid "%s days in preparation, last activity yesterday."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:80
+msgid "%s days in preparation, last activity %s days ago."
+msgstr ""
+
+#. timespans for request for adoption (RFAs)
+#: ../../english/template/debian/wnpp.wml:85
+msgid "adoption requested since today."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:89
+msgid "adoption requested since yesterday."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:93
+msgid "adoption requested since %s days."
+msgstr ""
+
+#. timespans for orphaned packages (Os)
+#: ../../english/template/debian/wnpp.wml:98
+msgid "orphaned since today."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:102
+msgid "orphaned since yesterday."
+msgstr ""
+
+#: ../../english/template/debian/wnpp.wml:106
+msgid "orphaned since %s days."
+msgstr ""
+
#. time spans for requested (RFPs) and help requested (RFHs)
-#: ../../english/template/debian/wnpp.wml:60
+#: ../../english/template/debian/wnpp.wml:111
msgid "requested today."
msgstr ""
-#: ../../english/template/debian/wnpp.wml:64
+#: ../../english/template/debian/wnpp.wml:115
msgid "requested yesterday."
msgstr ""
-#: ../../english/template/debian/wnpp.wml:68
+#: ../../english/template/debian/wnpp.wml:119
msgid "requested %s days ago."
msgstr ""
-#: ../../english/template/debian/wnpp.wml:82
+#: ../../english/template/debian/wnpp.wml:133
msgid "package info"
msgstr ""
+#. popcon rank for RFH bugs
+#: ../../english/template/debian/wnpp.wml:139
+msgid "rank:"
+msgstr ""

© 2014-2024 Faster IT GmbH | imprint | privacy policy