aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Vidal <zordhak@debian.org>2019-12-24 16:15:43 +0100
committerAlban Vidal <zordhak@debian.org>2019-12-24 16:15:43 +0100
commit372ffdab9c586d4ff25b5dca924d6c96792345f0 (patch)
treebd8333f3940beb720284447800e695b1bb62ab4e
parent42e3d2f06f5e76396576bd9c0ed5d1288ba056eb (diff)
Update PO files from english POT files
-rw-r--r--albanian/po/cdimage.sq.po28
-rw-r--r--albanian/po/consultants.sq.po16
-rw-r--r--albanian/po/countries.sq.po106
-rw-r--r--albanian/po/distrib.sq.po88
-rw-r--r--albanian/po/doc.sq.po180
-rw-r--r--albanian/po/newsevents.sq.po260
-rw-r--r--albanian/po/organization.sq.po115
-rw-r--r--albanian/po/others.sq.po182
-rw-r--r--albanian/po/partners.sq.po2
-rw-r--r--albanian/po/ports.sq.po32
-rw-r--r--albanian/po/security.sq.po68
-rw-r--r--albanian/po/stats.sq.po54
-rw-r--r--albanian/po/templates.sq.po24
-rw-r--r--albanian/po/vote.sq.po122
-rw-r--r--arabic/po/cdimage.ar.po28
-rw-r--r--arabic/po/consultants.ar.po16
-rw-r--r--arabic/po/countries.ar.po107
-rw-r--r--arabic/po/distrib.ar.po109
-rw-r--r--arabic/po/doc.ar.po181
-rw-r--r--arabic/po/newsevents.ar.po306
-rw-r--r--arabic/po/organization.ar.po127
-rw-r--r--arabic/po/others.ar.po198
-rw-r--r--arabic/po/partners.ar.po2
-rw-r--r--arabic/po/ports.ar.po32
-rw-r--r--arabic/po/security.ar.po68
-rw-r--r--arabic/po/stats.ar.po54
-rw-r--r--arabic/po/templates.ar.po25
-rw-r--r--arabic/po/vote.ar.po132
-rw-r--r--armenian/po/cdimage.hy.po28
-rw-r--r--armenian/po/consultants.hy.po16
-rw-r--r--armenian/po/countries.hy.po109
-rw-r--r--armenian/po/distrib.hy.po110
-rw-r--r--armenian/po/doc.hy.po180
-rw-r--r--armenian/po/newsevents.hy.po260
-rw-r--r--armenian/po/organization.hy.po115
-rw-r--r--armenian/po/others.hy.po182
-rw-r--r--armenian/po/partners.hy.po2
-rw-r--r--armenian/po/ports.hy.po32
-rw-r--r--armenian/po/security.hy.po68
-rw-r--r--armenian/po/stats.hy.po54
-rw-r--r--armenian/po/templates.hy.po24
-rw-r--r--armenian/po/vote.hy.po122
-rw-r--r--bulgarian/po/cdimage.bg.po28
-rw-r--r--bulgarian/po/consultants.bg.po16
-rw-r--r--bulgarian/po/countries.bg.po107
-rw-r--r--bulgarian/po/distrib.bg.po113
-rw-r--r--bulgarian/po/doc.bg.po240
-rw-r--r--bulgarian/po/newsevents.bg.po338
-rw-r--r--bulgarian/po/organization.bg.po136
-rw-r--r--bulgarian/po/others.bg.po198
-rw-r--r--bulgarian/po/partners.bg.po2
-rw-r--r--bulgarian/po/ports.bg.po32
-rw-r--r--bulgarian/po/security.bg.po68
-rw-r--r--bulgarian/po/stats.bg.po58
-rw-r--r--bulgarian/po/templates.bg.po33
-rw-r--r--bulgarian/po/vendors.bg.po1
-rw-r--r--bulgarian/po/vote.bg.po132
-rw-r--r--catalan/po/cdimage.ca.po28
-rw-r--r--catalan/po/consultants.ca.po16
-rw-r--r--catalan/po/countries.ca.po107
-rw-r--r--catalan/po/distrib.ca.po108
-rw-r--r--catalan/po/doc.ca.po180
-rw-r--r--catalan/po/newsevents.ca.po342
-rw-r--r--catalan/po/organization.ca.po129
-rw-r--r--catalan/po/others.ca.po198
-rw-r--r--catalan/po/partners.ca.po2
-rw-r--r--catalan/po/ports.ca.po32
-rw-r--r--catalan/po/security.ca.po72
-rw-r--r--catalan/po/stats.ca.po54
-rw-r--r--catalan/po/templates.ca.po24
-rw-r--r--catalan/po/vote.ca.po128
-rw-r--r--chinese/po/cdimage.zh.po28
-rw-r--r--chinese/po/consultants.zh.po16
-rw-r--r--chinese/po/countries.zh.po107
-rw-r--r--chinese/po/distrib.zh.po108
-rw-r--r--chinese/po/doc.zh.po180
-rw-r--r--chinese/po/newsevents.zh.po332
-rw-r--r--chinese/po/organization.zh.po128
-rw-r--r--chinese/po/others.zh.po198
-rw-r--r--chinese/po/partners.zh.po2
-rw-r--r--chinese/po/ports.zh.po32
-rw-r--r--chinese/po/security.zh.po68
-rw-r--r--chinese/po/stats.zh.po58
-rw-r--r--chinese/po/templates.zh.po24
-rw-r--r--chinese/po/vote.zh.po128
-rw-r--r--croatian/po/cdimage.hr.po29
-rw-r--r--croatian/po/consultants.hr.po16
-rw-r--r--croatian/po/countries.hr.po107
-rw-r--r--croatian/po/date.hr.po1
-rw-r--r--croatian/po/distrib.hr.po113
-rw-r--r--croatian/po/doc.hr.po182
-rw-r--r--croatian/po/newsevents.hr.po329
-rw-r--r--croatian/po/organization.hr.po139
-rw-r--r--croatian/po/others.hr.po203
-rw-r--r--croatian/po/partners.hr.po2
-rw-r--r--croatian/po/ports.hr.po32
-rw-r--r--croatian/po/security.hr.po72
-rw-r--r--croatian/po/stats.hr.po54
-rw-r--r--croatian/po/templates.hr.po43
-rw-r--r--croatian/po/vendors.hr.po1
-rw-r--r--croatian/po/vote.hr.po132
-rw-r--r--czech/po/cdimage.cs.po29
-rw-r--r--czech/po/consultants.cs.po16
-rw-r--r--czech/po/countries.cs.po107
-rw-r--r--czech/po/date.cs.po1
-rw-r--r--czech/po/distrib.cs.po113
-rw-r--r--czech/po/doc.cs.po182
-rw-r--r--czech/po/newsevents.cs.po358
-rw-r--r--czech/po/organization.cs.po115
-rw-r--r--czech/po/others.cs.po182
-rw-r--r--czech/po/partners.cs.po2
-rw-r--r--czech/po/ports.cs.po32
-rw-r--r--czech/po/security.cs.po68
-rw-r--r--czech/po/stats.cs.po54
-rw-r--r--czech/po/templates.cs.po33
-rw-r--r--czech/po/vote.cs.po122
-rw-r--r--danish/po/cdimage.da.po28
-rw-r--r--danish/po/consultants.da.po16
-rw-r--r--danish/po/countries.da.po107
-rw-r--r--danish/po/distrib.da.po108
-rw-r--r--danish/po/doc.da.po230
-rw-r--r--danish/po/newsevents.da.po334
-rw-r--r--danish/po/organization.da.po129
-rw-r--r--danish/po/others.da.po202
-rw-r--r--danish/po/partners.da.po3
-rw-r--r--danish/po/ports.da.po32
-rw-r--r--danish/po/security.da.po72
-rw-r--r--danish/po/stats.da.po58
-rw-r--r--danish/po/templates.da.po24
-rw-r--r--danish/po/vote.da.po128
-rw-r--r--dutch/po/cdimage.nl.po28
-rw-r--r--dutch/po/consultants.nl.po16
-rw-r--r--dutch/po/countries.nl.po107
-rw-r--r--dutch/po/distrib.nl.po108
-rw-r--r--dutch/po/doc.nl.po230
-rw-r--r--dutch/po/newsevents.nl.po354
-rw-r--r--dutch/po/organization.nl.po129
-rw-r--r--dutch/po/others.nl.po202
-rw-r--r--dutch/po/partners.nl.po3
-rw-r--r--dutch/po/ports.nl.po32
-rw-r--r--dutch/po/security.nl.po72
-rw-r--r--dutch/po/stats.nl.po58
-rw-r--r--dutch/po/templates.nl.po24
-rw-r--r--dutch/po/vote.nl.po128
-rw-r--r--esperanto/po/cdimage.eo.po29
-rw-r--r--esperanto/po/consultants.eo.po16
-rw-r--r--esperanto/po/countries.eo.po107
-rw-r--r--esperanto/po/distrib.eo.po108
-rw-r--r--esperanto/po/doc.eo.po180
-rw-r--r--esperanto/po/newsevents.eo.po333
-rw-r--r--esperanto/po/organization.eo.po115
-rw-r--r--esperanto/po/others.eo.po182
-rw-r--r--esperanto/po/partners.eo.po2
-rw-r--r--esperanto/po/ports.eo.po32
-rw-r--r--esperanto/po/security.eo.po70
-rw-r--r--esperanto/po/stats.eo.po54
-rw-r--r--esperanto/po/templates.eo.po43
-rw-r--r--esperanto/po/vote.eo.po124
-rw-r--r--finnish/po/blends.fi.po3
-rw-r--r--finnish/po/cdimage.fi.po28
-rw-r--r--finnish/po/consultants.fi.po16
-rw-r--r--finnish/po/countries.fi.po107
-rw-r--r--finnish/po/distrib.fi.po109
-rw-r--r--finnish/po/doc.fi.po213
-rw-r--r--finnish/po/newsevents.fi.po336
-rw-r--r--finnish/po/organization.fi.po139
-rw-r--r--finnish/po/others.fi.po202
-rw-r--r--finnish/po/partners.fi.po2
-rw-r--r--finnish/po/ports.fi.po32
-rw-r--r--finnish/po/security.fi.po72
-rw-r--r--finnish/po/stats.fi.po58
-rw-r--r--finnish/po/templates.fi.po32
-rw-r--r--finnish/po/vote.fi.po129
-rw-r--r--french/po/cdimage.fr.po28
-rw-r--r--french/po/consultants.fr.po16
-rw-r--r--french/po/countries.fr.po107
-rw-r--r--french/po/distrib.fr.po108
-rw-r--r--french/po/doc.fr.po230
-rw-r--r--french/po/newsevents.fr.po362
-rw-r--r--french/po/organization.fr.po129
-rw-r--r--french/po/others.fr.po202
-rw-r--r--french/po/partners.fr.po3
-rw-r--r--french/po/ports.fr.po32
-rw-r--r--french/po/security.fr.po72
-rw-r--r--french/po/stats.fr.po58
-rw-r--r--french/po/templates.fr.po24
-rw-r--r--french/po/vote.fr.po128
-rw-r--r--galician/po/cdimage.gl.po28
-rw-r--r--galician/po/consultants.gl.po16
-rw-r--r--galician/po/countries.gl.po107
-rw-r--r--galician/po/distrib.gl.po113
-rw-r--r--galician/po/doc.gl.po261
-rw-r--r--galician/po/newsevents.gl.po396
-rw-r--r--galician/po/organization.gl.po279
-rw-r--r--galician/po/others.gl.po188
-rw-r--r--galician/po/partners.gl.po91
-rw-r--r--galician/po/ports.gl.po32
-rw-r--r--galician/po/security.gl.po72
-rw-r--r--galician/po/stats.gl.po58
-rw-r--r--galician/po/templates.gl.po63
-rw-r--r--galician/po/vendors.gl.po1
-rw-r--r--galician/po/vote.gl.po154
-rw-r--r--german/po/cdimage.de.po28
-rw-r--r--german/po/consultants.de.po16
-rw-r--r--german/po/countries.de.po107
-rw-r--r--german/po/distrib.de.po108
-rw-r--r--german/po/doc.de.po227
-rw-r--r--german/po/newsevents.de.po338
-rw-r--r--german/po/organization.de.po263
-rw-r--r--german/po/others.de.po194
-rw-r--r--german/po/partners.de.po16
-rw-r--r--german/po/ports.de.po32
-rw-r--r--german/po/security.de.po72
-rw-r--r--german/po/stats.de.po58
-rw-r--r--german/po/templates.de.po38
-rw-r--r--german/po/vote.de.po128
-rw-r--r--greek/po/cdimage.el.po28
-rw-r--r--greek/po/consultants.el.po16
-rw-r--r--greek/po/countries.el.po107
-rw-r--r--greek/po/distrib.el.po110
-rw-r--r--greek/po/doc.el.po234
-rw-r--r--greek/po/newsevents.el.po344
-rw-r--r--greek/po/organization.el.po129
-rw-r--r--greek/po/others.el.po202
-rw-r--r--greek/po/partners.el.po143
-rw-r--r--greek/po/ports.el.po32
-rw-r--r--greek/po/security.el.po72
-rw-r--r--greek/po/stats.el.po58
-rw-r--r--greek/po/templates.el.po24
-rw-r--r--greek/po/vote.el.po128
-rw-r--r--hebrew/po/cdimage.he.po28
-rw-r--r--hebrew/po/consultants.he.po16
-rw-r--r--hebrew/po/countries.he.po109
-rw-r--r--hebrew/po/distrib.he.po88
-rw-r--r--hebrew/po/doc.he.po205
-rw-r--r--hebrew/po/newsevents.he.po267
-rw-r--r--hebrew/po/organization.he.po268
-rw-r--r--hebrew/po/others.he.po191
-rw-r--r--hebrew/po/partners.he.po2
-rw-r--r--hebrew/po/ports.he.po32
-rw-r--r--hebrew/po/security.he.po68
-rw-r--r--hebrew/po/stats.he.po54
-rw-r--r--hebrew/po/templates.he.po58
-rw-r--r--hebrew/po/vote.he.po144
-rw-r--r--hungarian/po/cdimage.hu.po28
-rw-r--r--hungarian/po/consultants.hu.po16
-rw-r--r--hungarian/po/countries.hu.po107
-rw-r--r--hungarian/po/distrib.hu.po116
-rw-r--r--hungarian/po/doc.hu.po222
-rw-r--r--hungarian/po/newsevents.hu.po379
-rw-r--r--hungarian/po/organization.hu.po286
-rw-r--r--hungarian/po/others.hu.po190
-rw-r--r--hungarian/po/partners.hu.po91
-rw-r--r--hungarian/po/ports.hu.po32
-rw-r--r--hungarian/po/security.hu.po72
-rw-r--r--hungarian/po/stats.hu.po54
-rw-r--r--hungarian/po/templates.hu.po76
-rw-r--r--hungarian/po/vendors.hu.po2
-rw-r--r--hungarian/po/vote.hu.po144
-rw-r--r--indonesian/po/blends.id.po3
-rw-r--r--indonesian/po/cdimage.id.po28
-rw-r--r--indonesian/po/consultants.id.po16
-rw-r--r--indonesian/po/countries.id.po107
-rw-r--r--indonesian/po/distrib.id.po116
-rw-r--r--indonesian/po/doc.id.po242
-rw-r--r--indonesian/po/newsevents.id.po378
-rw-r--r--indonesian/po/organization.id.po286
-rw-r--r--indonesian/po/others.id.po197
-rw-r--r--indonesian/po/partners.id.po91
-rw-r--r--indonesian/po/ports.id.po32
-rw-r--r--indonesian/po/security.id.po70
-rw-r--r--indonesian/po/stats.id.po58
-rw-r--r--indonesian/po/templates.id.po69
-rw-r--r--indonesian/po/vote.id.po146
-rw-r--r--indonesian/po/wnpp.id.po6
-rw-r--r--italian/po/blends.it.po6
-rw-r--r--italian/po/cdimage.it.po28
-rw-r--r--italian/po/consultants.it.po16
-rw-r--r--italian/po/distrib.it.po108
-rw-r--r--italian/po/doc.it.po27
-rw-r--r--italian/po/newsevents.it.po392
-rw-r--r--italian/po/organization.it.po121
-rw-r--r--italian/po/others.it.po186
-rw-r--r--italian/po/ports.it.po32
-rw-r--r--italian/po/security.it.po68
-rw-r--r--italian/po/stats.it.po58
-rw-r--r--japanese/po/blends.ja.po3
-rw-r--r--japanese/po/cdimage.ja.po28
-rw-r--r--japanese/po/consultants.ja.po16
-rw-r--r--japanese/po/countries.ja.po107
-rw-r--r--japanese/po/distrib.ja.po109
-rw-r--r--japanese/po/doc.ja.po288
-rw-r--r--japanese/po/newsevents.ja.po386
-rw-r--r--japanese/po/organization.ja.po277
-rw-r--r--japanese/po/others.ja.po186
-rw-r--r--japanese/po/partners.ja.po91
-rw-r--r--japanese/po/ports.ja.po32
-rw-r--r--japanese/po/security.ja.po70
-rw-r--r--japanese/po/stats.ja.po58
-rw-r--r--japanese/po/templates.ja.po61
-rw-r--r--japanese/po/vote.ja.po151
-rw-r--r--korean/po/bugs.ko.po2
-rw-r--r--korean/po/cdimage.ko.po30
-rw-r--r--korean/po/consultants.ko.po18
-rw-r--r--korean/po/countries.ko.po107
-rw-r--r--korean/po/date.ko.po4
-rw-r--r--korean/po/distrib.ko.po98
-rw-r--r--korean/po/doc.ko.po225
-rw-r--r--korean/po/legal.ko.po2
-rw-r--r--korean/po/mailinglists.ko.po2
-rw-r--r--korean/po/newsevents.ko.po348
-rw-r--r--korean/po/organization.ko.po264
-rw-r--r--korean/po/others.ko.po187
-rw-r--r--korean/po/partners.ko.po91
-rw-r--r--korean/po/ports.ko.po32
-rw-r--r--korean/po/security.ko.po68
-rw-r--r--korean/po/stats.ko.po58
-rw-r--r--korean/po/templates.ko.po68
-rw-r--r--korean/po/vendors.ko.po2
-rw-r--r--korean/po/vote.ko.po146
-rw-r--r--korean/po/wnpp.ko.po2
-rw-r--r--lithuanian/po/cdimage.lt.po29
-rw-r--r--lithuanian/po/consultants.lt.po16
-rw-r--r--lithuanian/po/countries.lt.po109
-rw-r--r--lithuanian/po/date.lt.po1
-rw-r--r--lithuanian/po/distrib.lt.po113
-rw-r--r--lithuanian/po/doc.lt.po223
-rw-r--r--lithuanian/po/newsevents.lt.po388
-rw-r--r--lithuanian/po/organization.lt.po282
-rw-r--r--lithuanian/po/others.lt.po193
-rw-r--r--lithuanian/po/partners.lt.po91
-rw-r--r--lithuanian/po/ports.lt.po32
-rw-r--r--lithuanian/po/security.lt.po68
-rw-r--r--lithuanian/po/stats.lt.po54
-rw-r--r--lithuanian/po/templates.lt.po72
-rw-r--r--lithuanian/po/vendors.lt.po1
-rw-r--r--lithuanian/po/vote.lt.po154
-rw-r--r--lithuanian/po/wnpp.lt.po11
-rw-r--r--norwegian/po/cdimage.nb.po28
-rw-r--r--norwegian/po/consultants.nb.po16
-rw-r--r--norwegian/po/countries.nb.po107
-rw-r--r--norwegian/po/distrib.nb.po112
-rw-r--r--norwegian/po/doc.nb.po222
-rw-r--r--norwegian/po/newsevents.nb.po386
-rw-r--r--norwegian/po/organization.nb.po275
-rw-r--r--norwegian/po/others.nb.po190
-rw-r--r--norwegian/po/partners.nb.po91
-rw-r--r--norwegian/po/ports.nb.po32
-rw-r--r--norwegian/po/security.nb.po72
-rw-r--r--norwegian/po/stats.nb.po58
-rw-r--r--norwegian/po/templates.nb.po61
-rw-r--r--norwegian/po/vote.nb.po147
-rw-r--r--persian/po/cdimage.fa.po28
-rw-r--r--persian/po/consultants.fa.po16
-rw-r--r--persian/po/countries.fa.po109
-rw-r--r--persian/po/distrib.fa.po113
-rw-r--r--persian/po/doc.en.po181
-rw-r--r--persian/po/doc.fa.po222
-rw-r--r--persian/po/newsevents.fa.po339
-rw-r--r--persian/po/organization.fa.po260
-rw-r--r--persian/po/others.fa.po194
-rw-r--r--persian/po/partners.fa.po91
-rw-r--r--persian/po/ports.fa.po32
-rw-r--r--persian/po/security.fa.po68
-rw-r--r--persian/po/stats.fa.po54
-rw-r--r--persian/po/templates.fa.po73
-rw-r--r--persian/po/vendors.fa.po1
-rw-r--r--persian/po/vote.fa.po154
-rw-r--r--persian/po/wnpp.fa.po11
-rw-r--r--polish/po/cdimage.pl.po28
-rw-r--r--polish/po/consultants.pl.po16
-rw-r--r--polish/po/countries.pl.po107
-rw-r--r--polish/po/distrib.pl.po113
-rw-r--r--polish/po/doc.pl.po261
-rw-r--r--polish/po/newsevents.pl.po394
-rw-r--r--polish/po/organization.pl.po279
-rw-r--r--polish/po/others.pl.po194
-rw-r--r--polish/po/partners.pl.po91
-rw-r--r--polish/po/ports.pl.po32
-rw-r--r--polish/po/security.pl.po68
-rw-r--r--polish/po/stats.pl.po58
-rw-r--r--polish/po/templates.pl.po63
-rw-r--r--polish/po/vendors.pl.po1
-rw-r--r--polish/po/vote.pl.po154
-rw-r--r--portuguese/po/blends.pt.po3
-rw-r--r--portuguese/po/cdimage.pt.po28
-rw-r--r--portuguese/po/consultants.pt.po16
-rw-r--r--portuguese/po/countries.pt.po107
-rw-r--r--portuguese/po/distrib.pt.po109
-rw-r--r--portuguese/po/doc.pt.po290
-rw-r--r--portuguese/po/newsevents.pt.po406
-rw-r--r--portuguese/po/organization.pt.po276
-rw-r--r--portuguese/po/others.pt.po192
-rw-r--r--portuguese/po/partners.pt.po91
-rw-r--r--portuguese/po/ports.pt.po32
-rw-r--r--portuguese/po/security.pt.po72
-rw-r--r--portuguese/po/stats.pt.po58
-rw-r--r--portuguese/po/templates.pt.po61
-rw-r--r--portuguese/po/vote.pt.po151
-rw-r--r--romanian/po/blends.ro.po3
-rw-r--r--romanian/po/cdimage.ro.po28
-rw-r--r--romanian/po/consultants.ro.po16
-rw-r--r--romanian/po/countries.ro.po107
-rw-r--r--romanian/po/distrib.ro.po109
-rw-r--r--romanian/po/doc.ro.po288
-rw-r--r--romanian/po/newsevents.ro.po386
-rw-r--r--romanian/po/organization.ro.po277
-rw-r--r--romanian/po/others.ro.po190
-rw-r--r--romanian/po/partners.ro.po91
-rw-r--r--romanian/po/ports.ro.po32
-rw-r--r--romanian/po/security.ro.po68
-rw-r--r--romanian/po/stats.ro.po58
-rw-r--r--romanian/po/templates.ro.po63
-rw-r--r--romanian/po/vote.ro.po151
-rw-r--r--russian/po/cdimage.ru.po28
-rw-r--r--russian/po/consultants.ru.po16
-rw-r--r--russian/po/distrib.ru.po108
-rw-r--r--russian/po/doc.ru.po39
-rw-r--r--russian/po/newsevents.ru.po332
-rw-r--r--russian/po/organization.ru.po121
-rw-r--r--russian/po/others.ru.po192
-rw-r--r--russian/po/ports.ru.po32
-rw-r--r--russian/po/security.ru.po72
-rw-r--r--russian/po/stats.ru.po58
-rw-r--r--russian/po/templates.ru.po16
-rw-r--r--slovak/po/cdimage.sk.po28
-rw-r--r--slovak/po/consultants.sk.po16
-rw-r--r--slovak/po/countries.sk.po109
-rw-r--r--slovak/po/distrib.sk.po109
-rw-r--r--slovak/po/doc.sk.po243
-rw-r--r--slovak/po/newsevents.sk.po384
-rw-r--r--slovak/po/organization.sk.po276
-rw-r--r--slovak/po/others.sk.po190
-rw-r--r--slovak/po/partners.sk.po91
-rw-r--r--slovak/po/ports.sk.po32
-rw-r--r--slovak/po/security.sk.po72
-rw-r--r--slovak/po/stats.sk.po58
-rw-r--r--slovak/po/templates.sk.po61
-rw-r--r--slovak/po/vendors.sk.po1
-rw-r--r--slovak/po/vote.sk.po151
-rw-r--r--slovene/po/bugs.sl.po4
-rw-r--r--slovene/po/cdimage.sl.po28
-rw-r--r--slovene/po/consultants.sl.po16
-rw-r--r--slovene/po/countries.sl.po107
-rw-r--r--slovene/po/distrib.sl.po88
-rw-r--r--slovene/po/doc.sl.po223
-rw-r--r--slovene/po/newsevents.sl.po365
-rw-r--r--slovene/po/organization.sl.po268
-rw-r--r--slovene/po/others.sl.po186
-rw-r--r--slovene/po/partners.sl.po91
-rw-r--r--slovene/po/ports.sl.po32
-rw-r--r--slovene/po/security.sl.po72
-rw-r--r--slovene/po/stats.sl.po54
-rw-r--r--slovene/po/templates.sl.po69
-rw-r--r--slovene/po/vote.sl.po147
-rw-r--r--spanish/po/cdimage.es.po28
-rw-r--r--spanish/po/consultants.es.po16
-rw-r--r--spanish/po/distrib.es.po110
-rw-r--r--spanish/po/doc.es.po230
-rw-r--r--spanish/po/newsevents.es.po350
-rw-r--r--spanish/po/organization.es.po8
-rw-r--r--spanish/po/organization.es.temp.po314
-rw-r--r--spanish/po/others.es.po202
-rw-r--r--spanish/po/ports.es.po32
-rw-r--r--spanish/po/security.es.po72
-rw-r--r--spanish/po/stats.es.po58
-rw-r--r--spanish/po/templates.es.po16
-rw-r--r--swedish/po/cdimage.sv.po28
-rw-r--r--swedish/po/consultants.sv.po16
-rw-r--r--swedish/po/distrib.sv.po108
-rw-r--r--swedish/po/doc.sv.po227
-rw-r--r--swedish/po/newsevents.sv.po332
-rw-r--r--swedish/po/organization.sv.po129
-rw-r--r--swedish/po/others.sv.po190
-rw-r--r--swedish/po/partners.sv.po3
-rw-r--r--swedish/po/ports.sv.po32
-rw-r--r--swedish/po/security.sv.po72
-rw-r--r--swedish/po/stats.sv.po58
-rw-r--r--swedish/po/templates.sv.po38
-rw-r--r--tamil/po/bugs.ta.po6
-rw-r--r--tamil/po/cdimage.ta.po35
-rw-r--r--tamil/po/consultants.ta.po16
-rw-r--r--tamil/po/countries.ta.po108
-rw-r--r--tamil/po/date.ta.po1
-rw-r--r--tamil/po/distrib.ta.po113
-rw-r--r--tamil/po/doc.ta.po223
-rw-r--r--tamil/po/newsevents.ta.po402
-rw-r--r--tamil/po/organization.ta.po283
-rw-r--r--tamil/po/others.ta.po194
-rw-r--r--tamil/po/partners.ta.po91
-rw-r--r--tamil/po/ports.ta.po32
-rw-r--r--tamil/po/security.ta.po68
-rw-r--r--tamil/po/stats.ta.po54
-rw-r--r--tamil/po/templates.ta.po75
-rw-r--r--tamil/po/vendors.ta.po1
-rw-r--r--tamil/po/vote.ta.po154
-rw-r--r--tamil/po/wnpp.ta.po11
-rw-r--r--turkish/po/cdimage.tr.po28
-rw-r--r--turkish/po/consultants.tr.po16
-rw-r--r--turkish/po/countries.tr.po107
-rw-r--r--turkish/po/distrib.tr.po110
-rw-r--r--turkish/po/doc.tr.po223
-rw-r--r--turkish/po/newsevents.tr.po406
-rw-r--r--turkish/po/organization.tr.po288
-rw-r--r--turkish/po/others.tr.po205
-rw-r--r--turkish/po/partners.tr.po91
-rw-r--r--turkish/po/ports.tr.po32
-rw-r--r--turkish/po/security.tr.po68
-rw-r--r--turkish/po/stats.tr.po54
-rw-r--r--turkish/po/templates.tr.po79
-rw-r--r--turkish/po/vote.tr.po151
-rw-r--r--turkish/po/wnpp.tr.po11
-rw-r--r--ukrainian/po/cdimage.uk.po29
-rw-r--r--ukrainian/po/consultants.uk.po16
-rw-r--r--ukrainian/po/countries.uk.po107
-rw-r--r--ukrainian/po/date.uk.po1
-rw-r--r--ukrainian/po/distrib.uk.po115
-rw-r--r--ukrainian/po/doc.uk.po222
-rw-r--r--ukrainian/po/newsevents.uk.po405
-rw-r--r--ukrainian/po/organization.uk.po276
-rw-r--r--ukrainian/po/others.uk.po186
-rw-r--r--ukrainian/po/partners.uk.po91
-rw-r--r--ukrainian/po/ports.uk.po32
-rw-r--r--ukrainian/po/security.uk.po72
-rw-r--r--ukrainian/po/stats.uk.po58
-rw-r--r--ukrainian/po/templates.uk.po61
-rw-r--r--ukrainian/po/vote.uk.po151
-rw-r--r--vietnamese/po/cdimage.vi.po28
-rw-r--r--vietnamese/po/consultants.vi.po16
-rw-r--r--vietnamese/po/countries.vi.po107
-rw-r--r--vietnamese/po/distrib.vi.po88
-rw-r--r--vietnamese/po/doc.vi.po221
-rw-r--r--vietnamese/po/newsevents.vi.po390
-rw-r--r--vietnamese/po/organization.vi.po278
-rw-r--r--vietnamese/po/others.vi.po186
-rw-r--r--vietnamese/po/partners.vi.po91
-rw-r--r--vietnamese/po/ports.vi.po32
-rw-r--r--vietnamese/po/security.vi.po72
-rw-r--r--vietnamese/po/stats.vi.po54
-rw-r--r--vietnamese/po/templates.vi.po61
-rw-r--r--vietnamese/po/vote.vi.po144
541 files changed, 30421 insertions, 28815 deletions
diff --git a/albanian/po/cdimage.sq.po b/albanian/po/cdimage.sq.po
index d208f27ec9b..dfa4b1c0188 100644
--- a/albanian/po/cdimage.sq.po
+++ b/albanian/po/cdimage.sq.po
@@ -3,20 +3,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -111,3 +97,17 @@ msgid ""
"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
"a> for CDs/DVDs:"
msgstr ""
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/albanian/po/consultants.sq.po b/albanian/po/consultants.sq.po
index fa9d82e2967..6b937e40d9d 100644
--- a/albanian/po/consultants.sq.po
+++ b/albanian/po/consultants.sq.po
@@ -3,6 +3,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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 ""
@@ -56,11 +64,3 @@ 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/albanian/po/countries.sq.po b/albanian/po/countries.sq.po
index 9ef7b9dcfce..b6870a9ad20 100644
--- a/albanian/po/countries.sq.po
+++ b/albanian/po/countries.sq.po
@@ -212,209 +212,213 @@ msgid "Kenya"
msgstr ""
#: ../../english/template/debian/countries.wml:267
-msgid "Korea"
+msgid "Kyrgyzstan"
msgstr ""
#: ../../english/template/debian/countries.wml:270
-msgid "Kuwait"
+msgid "Korea"
msgstr ""
#: ../../english/template/debian/countries.wml:273
-msgid "Kazakhstan"
+msgid "Kuwait"
msgstr ""
#: ../../english/template/debian/countries.wml:276
-msgid "Sri Lanka"
+msgid "Kazakhstan"
msgstr ""
#: ../../english/template/debian/countries.wml:279
-msgid "Lithuania"
+msgid "Sri Lanka"
msgstr ""
#: ../../english/template/debian/countries.wml:282
-msgid "Luxembourg"
+msgid "Lithuania"
msgstr ""
#: ../../english/template/debian/countries.wml:285
-msgid "Latvia"
+msgid "Luxembourg"
msgstr ""
#: ../../english/template/debian/countries.wml:288
-msgid "Morocco"
+msgid "Latvia"
msgstr ""
#: ../../english/template/debian/countries.wml:291
-msgid "Moldova"
+msgid "Morocco"
msgstr ""
#: ../../english/template/debian/countries.wml:294
-msgid "Montenegro"
+msgid "Moldova"
msgstr ""
#: ../../english/template/debian/countries.wml:297
-msgid "Madagascar"
+msgid "Montenegro"
msgstr ""
#: ../../english/template/debian/countries.wml:300
-msgid "Macedonia, Republic of"
+msgid "Madagascar"
msgstr ""
#: ../../english/template/debian/countries.wml:303
-msgid "Mongolia"
+msgid "Macedonia, Republic of"
msgstr ""
#: ../../english/template/debian/countries.wml:306
-msgid "Malta"
+msgid "Mongolia"
msgstr ""
#: ../../english/template/debian/countries.wml:309
-msgid "Mexico"
+msgid "Malta"
msgstr ""
#: ../../english/template/debian/countries.wml:312
-msgid "Malaysia"
+msgid "Mexico"
msgstr ""
#: ../../english/template/debian/countries.wml:315
-msgid "New Caledonia"
+msgid "Malaysia"
msgstr ""
#: ../../english/template/debian/countries.wml:318
-msgid "Nicaragua"
+msgid "New Caledonia"
msgstr ""
#: ../../english/template/debian/countries.wml:321
-msgid "Netherlands"
+msgid "Nicaragua"
msgstr ""
#: ../../english/template/debian/countries.wml:324
-msgid "Norway"
+msgid "Netherlands"
msgstr ""
#: ../../english/template/debian/countries.wml:327
-msgid "New Zealand"
+msgid "Norway"
msgstr ""
#: ../../english/template/debian/countries.wml:330
-msgid "Panama"
+msgid "New Zealand"
msgstr ""
#: ../../english/template/debian/countries.wml:333
-msgid "Peru"
+msgid "Panama"
msgstr ""
#: ../../english/template/debian/countries.wml:336
-msgid "French Polynesia"
+msgid "Peru"
msgstr ""
#: ../../english/template/debian/countries.wml:339
-msgid "Philippines"
+msgid "French Polynesia"
msgstr ""
#: ../../english/template/debian/countries.wml:342
-msgid "Pakistan"
+msgid "Philippines"
msgstr ""
#: ../../english/template/debian/countries.wml:345
-msgid "Poland"
+msgid "Pakistan"
msgstr ""
#: ../../english/template/debian/countries.wml:348
-msgid "Portugal"
+msgid "Poland"
msgstr ""
#: ../../english/template/debian/countries.wml:351
-msgid "Réunion"
+msgid "Portugal"
msgstr ""
#: ../../english/template/debian/countries.wml:354
-msgid "Romania"
+msgid "Réunion"
msgstr ""
#: ../../english/template/debian/countries.wml:357
-msgid "Serbia"
+msgid "Romania"
msgstr ""
#: ../../english/template/debian/countries.wml:360
-msgid "Russia"
+msgid "Serbia"
msgstr ""
#: ../../english/template/debian/countries.wml:363
-msgid "Saudi Arabia"
+msgid "Russia"
msgstr ""
#: ../../english/template/debian/countries.wml:366
-msgid "Sweden"
+msgid "Saudi Arabia"
msgstr ""
#: ../../english/template/debian/countries.wml:369
-msgid "Singapore"
+msgid "Sweden"
msgstr ""
#: ../../english/template/debian/countries.wml:372
-msgid "Slovenia"
+msgid "Singapore"
msgstr ""
#: ../../english/template/debian/countries.wml:375
-msgid "Slovakia"
+msgid "Slovenia"
msgstr ""
#: ../../english/template/debian/countries.wml:378
-msgid "El Salvador"
+msgid "Slovakia"
msgstr ""
#: ../../english/template/debian/countries.wml:381
-msgid "Thailand"
+msgid "El Salvador"
msgstr ""
#: ../../english/template/debian/countries.wml:384
-msgid "Tajikistan"
+msgid "Thailand"
msgstr ""
#: ../../english/template/debian/countries.wml:387
-msgid "Tunisia"
+msgid "Tajikistan"
msgstr ""
#: ../../english/template/debian/countries.wml:390
-msgid "Turkey"
+msgid "Tunisia"
msgstr ""
#: ../../english/template/debian/countries.wml:393
-msgid "Taiwan"
+msgid "Turkey"
msgstr ""
#: ../../english/template/debian/countries.wml:396
-msgid "Ukraine"
+msgid "Taiwan"
msgstr ""
#: ../../english/template/debian/countries.wml:399
-msgid "United States"
+msgid "Ukraine"
msgstr ""
#: ../../english/template/debian/countries.wml:402
-msgid "Uruguay"
+msgid "United States"
msgstr ""
#: ../../english/template/debian/countries.wml:405
-msgid "Uzbekistan"
+msgid "Uruguay"
msgstr ""
#: ../../english/template/debian/countries.wml:408
-msgid "Venezuela"
+msgid "Uzbekistan"
msgstr ""
#: ../../english/template/debian/countries.wml:411
-msgid "Vietnam"
+msgid "Venezuela"
msgstr ""
#: ../../english/template/debian/countries.wml:414
-msgid "Vanuatu"
+msgid "Vietnam"
msgstr ""
#: ../../english/template/debian/countries.wml:417
-msgid "South Africa"
+msgid "Vanuatu"
msgstr ""
#: ../../english/template/debian/countries.wml:420
+msgid "South Africa"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr ""
diff --git a/albanian/po/distrib.sq.po b/albanian/po/distrib.sq.po
index 8c880dea459..1972a91dc8b 100644
--- a/albanian/po/distrib.sq.po
+++ b/albanian/po/distrib.sq.po
@@ -3,111 +3,111 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
+#: ../../english/distrib/search_packages-form.inc:34
+msgid "Section"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
+#: ../../english/distrib/search_packages-form.inc:36
+msgid "main"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
+#: ../../english/distrib/search_packages-form.inc:37
+msgid "contrib"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
+#: ../../english/distrib/search_packages-form.inc:38
+msgid "non-free"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:34
-msgid "Section"
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:36
-msgid "main"
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:37
-msgid "contrib"
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:38
-msgid "non-free"
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
msgstr ""
#: ../../english/releases/arches.data:8
diff --git a/albanian/po/doc.sq.po b/albanian/po/doc.sq.po
index 8a55e8765fc..966a944e825 100644
--- a/albanian/po/doc.sq.po
+++ b/albanian/po/doc.sq.po
@@ -3,96 +3,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-" Debian 9 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:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-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:83
-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:105
-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:125
-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:146
-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 8) 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:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr ""
@@ -199,6 +109,96 @@ msgstr ""
msgid "Debian package (archived)"
msgstr ""
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/albanian/po/newsevents.sq.po b/albanian/po/newsevents.sq.po
index c8932425456..36bd8d5d494 100644
--- a/albanian/po/newsevents.sq.po
+++ b/albanian/po/newsevents.sq.po
@@ -3,120 +3,161 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
+#: ../../english/template/debian/events_common.wml:8
+msgid "Upcoming Attractions"
msgstr ""
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
+#: ../../english/template/debian/events_common.wml:11
+msgid "link may no longer be valid"
msgstr ""
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
+#: ../../english/template/debian/events_common.wml:14
+msgid "When"
msgstr ""
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
+#: ../../english/template/debian/events_common.wml:17
+msgid "Where"
msgstr ""
-#: ../../english/events/talks.defs:9
-msgid "Title:"
+#: ../../english/template/debian/events_common.wml:20
+msgid "More Info"
msgstr ""
-#: ../../english/events/talks.defs:12
-msgid "Author:"
+#: ../../english/template/debian/events_common.wml:23
+msgid "Debian Involvement"
msgstr ""
-#: ../../english/events/talks.defs:15
-msgid "Language:"
+#: ../../english/template/debian/events_common.wml:26
+msgid "Main Coordinator"
msgstr ""
-#: ../../english/events/talks.defs:19
-msgid "Date:"
+#: ../../english/template/debian/events_common.wml:29
+msgid "<th>Project</th><th>Coordinator</th>"
msgstr ""
-#: ../../english/events/talks.defs:23
-msgid "Event:"
+#: ../../english/template/debian/events_common.wml:32
+msgid "Related Links"
msgstr ""
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
+#: ../../english/template/debian/events_common.wml:35
+msgid "Latest News"
msgstr ""
-#: ../../english/events/talks.defs:29
-msgid "source"
+#: ../../english/template/debian/events_common.wml:38
+msgid "Download calendar entry"
msgstr ""
-#: ../../english/events/talks.defs:32
-msgid "PDF"
+#: ../../english/template/debian/news.wml:9
+msgid ""
+"Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/\">Debian "
+"Project homepage</a>."
msgstr ""
-#: ../../english/events/talks.defs:35
-msgid "HTML"
+#. '<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)>"
+#: ../../english/template/debian/news.wml:17
+msgid "<get-var url /> (dead link)"
msgstr ""
-#: ../../english/events/talks.defs:38
-msgid "MagicPoint"
+#: ../../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 ""
-#: ../../english/events/talks.defs:41
-msgid "Abstract"
+#: ../../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 ""
-#: ../../english/template/debian/events_common.wml:8
-msgid "Upcoming Attractions"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:11
-msgid "link may no longer be valid"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:14
-msgid "When"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:17
-msgid "Where"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:20
-msgid "More Info"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:23
-msgid "Debian Involvement"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:26
-msgid "Main Coordinator"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:29
-msgid "<th>Project</th><th>Coordinator</th>"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:32
-msgid "Related Links"
+#: ../../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 ""
-#: ../../english/template/debian/events_common.wml:35
-msgid "Latest News"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:38
-msgid "Download calendar entry"
+#. 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 ""
-#: ../../english/template/debian/news.wml:9
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:25
msgid ""
-"Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/\">Debian "
-"Project homepage</a>."
+"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
msgstr ""
-#. '<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)>"
-#: ../../english/template/debian/news.wml:17
-msgid "<get-var url /> (dead link)"
+#. 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/template/debian/projectnews/boilerplates.wml:35
@@ -300,103 +341,62 @@ msgid ""
"the following topics:"
msgstr ""
-#: ../../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>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
msgstr ""
-#: ../../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."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
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>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
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>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
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>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
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>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:29
+msgid "source"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
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>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
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>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
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>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
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>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
msgstr ""
diff --git a/albanian/po/organization.sq.po b/albanian/po/organization.sq.po
index d5e29a42b88..b2727ad6f71 100644
--- a/albanian/po/organization.sq.po
+++ b/albanian/po/organization.sq.po
@@ -36,11 +36,11 @@ msgid "manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "SRM"
+msgid "Stable Release Manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "Stable Release Manager"
+msgid "SRM"
msgstr ""
#: ../../english/intro/organization.data:36
@@ -69,27 +69,27 @@ msgid "role"
msgstr ""
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr ""
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr ""
@@ -103,136 +103,131 @@ msgstr ""
msgid "Support and Infrastructure"
msgstr ""
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr ""
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr ""
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr ""
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr ""
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr ""
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr ""
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr ""
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr ""
@@ -391,39 +386,11 @@ msgstr ""
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr ""
-
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr ""
-
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr ""
-
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr ""
-
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr ""
-
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr ""
-
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr ""
-
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr ""
diff --git a/albanian/po/others.sq.po b/albanian/po/others.sq.po
index 4cf5d1d4c14..32ca0cb4ad5 100644
--- a/albanian/po/others.sq.po
+++ b/albanian/po/others.sq.po
@@ -51,42 +51,6 @@ msgstr ""
msgid "Unavailable"
msgstr ""
-#: ../../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> "
@@ -118,6 +82,34 @@ msgstr ""
msgid "Address"
msgstr ""
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr ""
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr ""
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr ""
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr ""
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr ""
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr ""
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr ""
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr ""
@@ -206,109 +198,117 @@ msgstr ""
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
+#: ../../english/y2k/l10n.data:6
+msgid "OK"
msgstr ""
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
+#: ../../english/y2k/l10n.data:9
+msgid "BAD"
msgstr ""
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
+#: ../../english/y2k/l10n.data:12
+msgid "OK?"
msgstr ""
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
+#: ../../english/y2k/l10n.data:15
+msgid "BAD?"
msgstr ""
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
+#: ../../english/y2k/l10n.data:18
+msgid "??"
msgstr ""
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
+#: ../../english/y2k/l10n.data:21
+msgid "Unknown"
msgstr ""
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
+#: ../../english/y2k/l10n.data:24
+msgid "ALL"
msgstr ""
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
+#: ../../english/y2k/l10n.data:27
+msgid "Package"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
+#: ../../english/y2k/l10n.data:30
+msgid "Status"
msgstr ""
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
+#: ../../english/y2k/l10n.data:33
+msgid "Version"
msgstr ""
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
+#: ../../english/y2k/l10n.data:36
+msgid "URL"
msgstr ""
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
msgstr ""
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
msgstr ""
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
msgstr ""
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
msgstr ""
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
msgstr ""
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
msgstr ""
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
msgstr ""
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
msgstr ""
-#: ../../english/y2k/l10n.data:18
-msgid "??"
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
msgstr ""
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
msgstr ""
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
msgstr ""
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
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"
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
msgstr ""
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
msgstr ""
diff --git a/albanian/po/partners.sq.po b/albanian/po/partners.sq.po
index db8c9e99938..644cd23a422 100644
--- a/albanian/po/partners.sq.po
+++ b/albanian/po/partners.sq.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
diff --git a/albanian/po/ports.sq.po b/albanian/po/ports.sq.po
index af60bbe50d1..bcd4a0b54f4 100644
--- a/albanian/po/ports.sq.po
+++ b/albanian/po/ports.sq.po
@@ -3,22 +3,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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 ""
@@ -83,6 +67,22 @@ msgstr ""
msgid "Systems"
msgstr ""
+#: ../../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/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr ""
diff --git a/albanian/po/security.sq.po b/albanian/po/security.sq.po
index 0e790203b95..1a374f9a4ef 100644
--- a/albanian/po/security.sq.po
+++ b/albanian/po/security.sq.po
@@ -3,40 +3,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr ""
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr ""
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr ""
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr ""
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr ""
@@ -114,3 +80,37 @@ msgstr ""
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr ""
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr ""
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/albanian/po/stats.sq.po b/albanian/po/stats.sq.po
index a8bfea2710f..bd3c099a2d8 100644
--- a/albanian/po/stats.sq.po
+++ b/albanian/po/stats.sq.po
@@ -3,22 +3,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -36,11 +20,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -55,15 +39,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -73,6 +48,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -220,3 +204,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/albanian/po/templates.sq.po b/albanian/po/templates.sq.po
index 34c72b82e0a..afd975eed81 100644
--- a/albanian/po/templates.sq.po
+++ b/albanian/po/templates.sq.po
@@ -3,14 +3,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr ""
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -237,6 +229,14 @@ msgstr ""
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr ""
@@ -508,3 +508,11 @@ msgstr ""
#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr ""
+
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr ""
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
diff --git a/albanian/po/vote.sq.po b/albanian/po/vote.sq.po
index 3da99f4cdb7..7ba75e28899 100644
--- a/albanian/po/vote.sq.po
+++ b/albanian/po/vote.sq.po
@@ -60,201 +60,225 @@ msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Seconds"
+msgid "Proposal G Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal A Seconds"
+msgid "Proposal H Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal B Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal C Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal D Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Proposal E Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Proposal F Seconds"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Opposition"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Text"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal A"
+msgid "Proposal G Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal B"
+msgid "Proposal H Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal C"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal D"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Proposal E"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Proposal F"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Choices"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Proposer"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Seconds"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Text"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Proposer A"
+msgid "Proposal G"
msgstr ""
#: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Seconds A"
+msgid "Proposal H"
msgstr ""
#: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Text A"
+msgid "Choices"
msgstr ""
#: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Proposer B"
+msgid "Amendment Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:124
-msgid "Amendment Seconds B"
+msgid "Amendment Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:127
-msgid "Amendment Text B"
+msgid "Amendment Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:130
-msgid "Amendment Proposer C"
+msgid "Amendment Proposer A"
msgstr ""
#: ../../english/template/debian/votebar.wml:133
-msgid "Amendment Seconds C"
+msgid "Amendment Seconds A"
msgstr ""
#: ../../english/template/debian/votebar.wml:136
-msgid "Amendment Text C"
+msgid "Amendment Text A"
msgstr ""
#: ../../english/template/debian/votebar.wml:139
-msgid "Amendments"
+msgid "Amendment Proposer B"
msgstr ""
#: ../../english/template/debian/votebar.wml:142
-msgid "Proceedings"
+msgid "Amendment Seconds B"
msgstr ""
#: ../../english/template/debian/votebar.wml:145
-msgid "Majority Requirement"
+msgid "Amendment Text B"
msgstr ""
#: ../../english/template/debian/votebar.wml:148
-msgid "Data and Statistics"
+msgid "Amendment Proposer C"
msgstr ""
#: ../../english/template/debian/votebar.wml:151
-msgid "Quorum"
+msgid "Amendment Seconds C"
msgstr ""
#: ../../english/template/debian/votebar.wml:154
-msgid "Minimum Discussion"
+msgid "Amendment Text C"
msgstr ""
#: ../../english/template/debian/votebar.wml:157
-msgid "Ballot"
+msgid "Amendments"
msgstr ""
#: ../../english/template/debian/votebar.wml:160
-msgid "Forum"
+msgid "Proceedings"
msgstr ""
#: ../../english/template/debian/votebar.wml:163
+msgid "Majority Requirement"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:166
+msgid "Data and Statistics"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:169
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:172
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:175
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:178
+msgid "Forum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr ""
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr ""
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr ""
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr ""
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr ""
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr ""
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr ""
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr ""
diff --git a/arabic/po/cdimage.ar.po b/arabic/po/cdimage.ar.po
index d60aed4faba..89f5297eaad 100644
--- a/arabic/po/cdimage.ar.po
+++ b/arabic/po/cdimage.ar.po
@@ -12,20 +12,6 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " مفتاح بصمة الأصبع"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -122,3 +108,17 @@ msgid ""
msgstr ""
"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
"a> for CDs/DVDs:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/arabic/po/consultants.ar.po b/arabic/po/consultants.ar.po
index 2bcbba29b26..4fd6a79c036 100644
--- a/arabic/po/consultants.ar.po
+++ b/arabic/po/consultants.ar.po
@@ -14,6 +14,14 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Virtaal 0.7.1\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 "العودة إلى<a href=\"./\">صفحة المستشارين لدبيان</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "الاسم:"
@@ -68,11 +76,3 @@ msgid ""
"worldwide."
msgstr ""
"<total_consultant> مستشارو دبيان المُسردون في <total_country> دولة حول العالم."
-
-#: ../../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 "العودة إلى<a href=\"./\">صفحة المستشارين لدبيان</a>."
diff --git a/arabic/po/countries.ar.po b/arabic/po/countries.ar.po
index 46e613371b9..b6c60d0c7e8 100644
--- a/arabic/po/countries.ar.po
+++ b/arabic/po/countries.ar.po
@@ -223,209 +223,214 @@ msgid "Kenya"
msgstr "كينيا"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "كازاخستان"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "كوريا"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "الكويت"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "كازاخستان"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "سريلانكا"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "ليتوانيا"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "لوكسمبورغ"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "لاتفيا"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "المغرب"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "مولدوفا"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "مونتينيغرو"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "مدغشقر"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "جمهورية مقدونيا"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "منغوليا"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "مالطا"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "المكسيك"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "ماليزيا"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "كاليدونيا الجديدة"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "نيكاراغوا"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "هولندا"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "النرويج"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "نيوزيلندا"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "بنما"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "بيرو"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "بولينزيا الفرنسية"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "الفلبين"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "باكستان"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "بولونيا"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "البرتغال"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "رومانيا"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "صربيا"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "روسيا"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "السعودية"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "السويد"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "سنغافورا"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "سلوفينيا"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "سلوفاكيا"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "السلفادور"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "تايلاند"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "طاجيكستان"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "تونس"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "تركيا"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "تايوان"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "أوكرانيا"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "الولايات المتحدة"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "أوروغواي"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "أوزبكستان"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "فنزويلا"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "فيتنام"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "فانواتو"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "جنوب أفريقيا"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "زمبابوي"
diff --git a/arabic/po/distrib.ar.po b/arabic/po/distrib.ar.po
index 892e00e7cb8..00191991e0b 100644
--- a/arabic/po/distrib.ar.po
+++ b/arabic/po/distrib.ar.po
@@ -14,99 +14,68 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Virtaal 0.7.1\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "كلمة مفتاحية"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "عرض"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "بحث في"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "أي منها"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "أسماء الحزم فقط"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "الحزم التي تحتوي على ملفات أو مجلّدات تسمى هكذا"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "الوصف"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "الحزم التي تحتوي على ملفات أو مجلّدات في أسمائها توجد الكلمات"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "أسماء الحزم المصدرية"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr ""
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "التوزيعة"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "تجريبية"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "غير مستقرة"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "اختبارية"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "مستقرة"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
#, fuzzy
-#| msgid "stable"
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "أي منها"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "بحث"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-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"
-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:21
-msgid "Only show exact matches"
-msgstr ""
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "قِسم"
@@ -123,6 +92,36 @@ msgstr "المساهمات (contrib)"
msgid "non-free"
msgstr "غير حُر"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "بحث"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "تصفير"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "عرض"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "أي منها"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "الحزم التي تحتوي على ملفات أو مجلّدات تسمى هكذا"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "الحزم التي تحتوي على ملفات أو مجلّدات في أسمائها توجد الكلمات"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr ""
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr ""
diff --git a/arabic/po/doc.ar.po b/arabic/po/doc.ar.po
index ea578ae6ec6..3969951b7b7 100644
--- a/arabic/po/doc.ar.po
+++ b/arabic/po/doc.ar.po
@@ -13,103 +13,12 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Virtaal 0.7.1\n"
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-" Debian 9 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:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-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:83
-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:105
-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:125
-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:146
-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 8) 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:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "المؤلف:"
#: ../../english/doc/books.def:41
#, fuzzy
-#| msgid "Debian package"
msgid "Debian Release:"
msgstr "حزمة دبيان"
@@ -214,6 +123,96 @@ msgstr "حزمة دبيان"
msgid "Debian package (archived)"
msgstr ""
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/arabic/po/newsevents.ar.po b/arabic/po/newsevents.ar.po
index 1d726033670..9cdb328cef7 100644
--- a/arabic/po/newsevents.ar.po
+++ b/arabic/po/newsevents.ar.po
@@ -14,66 +14,6 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Virtaal 0.7.1\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/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 "PDF"
-
-#: ../../english/events/talks.defs:35
-msgid "HTML"
-msgstr "HTML"
-
-#: ../../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 "الحفلات القادمة"
@@ -132,6 +72,118 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (رابط ميت)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"لاستلام هذه الرسال الإخبارية الأسبوعية، <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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "<a href=\"../../\">النشرات السابقة</a> لهذه القائمة البريدية متوفرة."
+
+#. 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\" />أخبار دبيان الأسبوعية يحررها <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 Project News is edited by <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\" />حرر هذه النشرة من أخبار دبيان <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\" />حرر هذه النشرة من أخبار دبيان <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\" />ترجمها %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\" />ترجمها %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\" />ترجمتها %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\" />ترجمتها %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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -313,120 +365,64 @@ msgid ""
"the following topics:"
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 in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
msgstr ""
-"لاستلام هذه الرسال الإخبارية الأسبوعية، <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
-msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-msgstr "<a href=\"../../\">النشرات السابقة</a> لهذه القائمة البريدية متوفرة."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+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>."
-msgstr ""
-"<void id=\"singular\" />أخبار دبيان الأسبوعية يحررها <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+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>."
-msgstr ""
-"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+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>."
-msgstr ""
-"<void id=\"singular\" />حرر هذه النشرة من أخبار دبيان <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+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>."
-msgstr ""
-"<void id=\\\"plural\" />حرر هذه النشرة من أخبار دبيان <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "الحدث:"
-#. 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\" />ترجمها %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "الشرائح:"
-#. 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\" />ترجمها %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "المصدر"
-#. 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\" />ترجمتها %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />ترجمتها %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
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>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
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>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
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>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
msgstr ""
#~ msgid "Topics:"
diff --git a/arabic/po/organization.ar.po b/arabic/po/organization.ar.po
index 173cc7f5ecc..fb56057d39a 100644
--- a/arabic/po/organization.ar.po
+++ b/arabic/po/organization.ar.po
@@ -51,11 +51,11 @@ msgid "manager"
msgstr "مدير"
#: ../../english/intro/organization.data:34
-msgid "SRM"
+msgid "Stable Release Manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "Stable Release Manager"
+msgid "SRM"
msgstr ""
#: ../../english/intro/organization.data:36
@@ -65,7 +65,6 @@ msgstr ""
#. we only use the chair tag once, for techctte, I wonder why it's here.
#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "رئيس المجلس"
@@ -86,29 +85,28 @@ msgid "role"
msgstr ""
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "أعضاء"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "توزيعة"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "الدعاية والإعلان"
@@ -122,136 +120,131 @@ msgstr ""
msgid "Support and Infrastructure"
msgstr "دعم فني وبنية تحتية"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "قائد"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "اللجنة التقنية"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "أمين عام"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "مشاريع التطوير"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "أرشيف FTP "
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "مساعد FTP"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "إدارة الإصدارات"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "ضمان الجودة"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "فريق نظام التثبيت"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "ملاحظات الإصدارة"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "ملفات قرص مدمج"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "الإنتاج"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "اختبار"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr ""
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "التوثيق"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "قائمة الحزم التي هي بحاجة إلى مزيد من العمل والمتوقعة"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "تحويلات"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "إعدادات خاصة"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "الحواسب المحمولة"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "الجدران النارية"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "الأجهزة المدمجة"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "جهة الإتصال الصحفي"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "صفحات الإنترنت"
@@ -277,7 +270,6 @@ msgstr "أحداث"
#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "اللجنة التقنية"
@@ -418,46 +410,35 @@ msgstr "نظام تتبع الحزم"
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "مدراء اولاين"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "ديبيان للأطفال من سنة الى 99 سنوات"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "ديبيان للأطفال من سنة الى 99 سنوات"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "دبيان للأغراض الطبية والبحث الطبي"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "دبيان للأغراض الطبية والبحث الطبي"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "دبيان للتعليم"
+#~ msgid "Debian for education"
+#~ msgstr "دبيان للتعليم"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "دبيان في المكاتب القانونية"
+#~ msgid "Debian in legal offices"
+#~ msgstr "دبيان في المكاتب القانونية"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "دبيان لدوي الاحتياجات الخاصة"
-
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr ""
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "دبيان لدوي الاحتياجات الخاصة"
-#: ../../english/intro/organization.data:523
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "دبيان للتعليم"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "دبيان للتعليم"
#~ msgid "Alioth administrators"
#~ msgstr "مدراء اولاين"
diff --git a/arabic/po/others.ar.po b/arabic/po/others.ar.po
index bbdb1f35808..fa8c3017a70 100644
--- a/arabic/po/others.ar.po
+++ b/arabic/po/others.ar.po
@@ -67,42 +67,6 @@ msgstr "<void id=\"d-i\" />مجهول"
msgid "Unavailable"
msgstr "غير متوفر"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "خطوة 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "خطوة 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "خطوة 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "خطوة 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "خطوة 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "خطوة 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "خطوة 7"
-
-#: ../../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> "
@@ -138,6 +102,34 @@ msgstr ""
msgid "Address"
msgstr ""
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "مع &nbsp;``دبيان''"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "بدون &nbsp;``دبيان''"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "Encapsulated PostScript"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[يدعمه دبيان]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[يدعمه دبيان غنو/لينكس]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[يدعمه دبيان]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[دبيان] (زر مصغّر)"
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "المنتجات"
@@ -226,69 +218,6 @@ msgstr ""
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "مع &nbsp;``دبيان''"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "بدون &nbsp;``دبيان''"
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "Encapsulated PostScript"
-
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[يدعمه دبيان]"
-
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[يدعمه دبيان غنو/لينكس]"
-
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[يدعمه دبيان]"
-
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[دبيان] (زر مصغّر)"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "هل أنت مطور لدبيان؟"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "موافق"
@@ -333,6 +262,77 @@ msgstr "الإصدار"
msgid "URL"
msgstr "المسار"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr ""
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "خطوة 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "خطوة 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "خطوة 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "خطوة 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "خطوة 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "خطوة 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "خطوة 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "قائمة متطلبات المتقدمين"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "هل أنت مطور لدبيان؟"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
#~ msgid "Where:"
#~ msgstr "أين:"
diff --git a/arabic/po/partners.ar.po b/arabic/po/partners.ar.po
index db8c9e99938..644cd23a422 100644
--- a/arabic/po/partners.ar.po
+++ b/arabic/po/partners.ar.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
diff --git a/arabic/po/ports.ar.po b/arabic/po/ports.ar.po
index b6505ea9908..e9c29341462 100644
--- a/arabic/po/ports.ar.po
+++ b/arabic/po/ports.ar.po
@@ -18,22 +18,6 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Virtaal 0.7.1\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "دبيان لأنظمة Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "دبيان لأنظمة PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "أقراص Hurd مدمجة"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "دبيان لأنظمة IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "المراسلة"
@@ -98,6 +82,22 @@ msgstr "تزويد"
msgid "Systems"
msgstr "أنظمة"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "دبيان لأنظمة Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "دبيان لأنظمة PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "أقراص Hurd مدمجة"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "دبيان لأنظمة IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "دبيان غنو/NetBSD لأنظمة i386"
diff --git a/arabic/po/security.ar.po b/arabic/po/security.ar.po
index 622beb61f5b..0f0df46cf98 100644
--- a/arabic/po/security.ar.po
+++ b/arabic/po/security.ar.po
@@ -17,40 +17,6 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Virtaal 0.7.1\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "أمن دبيان"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "تنبيهات دبيان الأمنية"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "س"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "قاموس Mitre CVE"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "قاعدة بيانات Securityfocus Bugtraq"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "بيانات CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "ملاحظات نقاط ضعف US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "المصدر:"
@@ -132,3 +98,37 @@ msgstr "نقاط ضعف CERT، إنذارات وملاحظات الحوادث:"
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr "لا توجد مراجع أمن قواعد بيانات خارجيّة متوفّرة حاليًا."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "س"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "أمن دبيان"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "تنبيهات دبيان الأمنية"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "قاموس Mitre CVE"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "قاعدة بيانات Securityfocus Bugtraq"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "بيانات CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "ملاحظات نقاط ضعف US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/arabic/po/stats.ar.po b/arabic/po/stats.ar.po
index cc3d5acdcf3..3531fca5a17 100644
--- a/arabic/po/stats.ar.po
+++ b/arabic/po/stats.ar.po
@@ -12,22 +12,6 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Virtaal 0.7.1\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/arabic/po/templates.ar.po b/arabic/po/templates.ar.po
index 14366a3bfe7..f7c7855b4ee 100644
--- a/arabic/po/templates.ar.po
+++ b/arabic/po/templates.ar.po
@@ -18,14 +18,6 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Poedit 1.8.11\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "موقع دبيان"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "البحث في موقع دبيان."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -165,7 +157,6 @@ msgstr "مدونة دبيان"
#: ../../english/template/debian/common_translation.wml:94
#, fuzzy
-#| msgid "Last Modified"
msgid "Last Updated"
msgstr "آخر تعديل"
@@ -264,6 +255,14 @@ msgstr "هذه الصفحة متوفرة أيضا باللغات التالية
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "كيفية تعيين <a href=m4_HOME/intro/cn>لغة المستند المبدئية</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "دبيان الدولية"
@@ -538,5 +537,13 @@ msgstr "مسار"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "العودة إلى <a href=\"./\">صفحة من يستخدم دبيان ؟</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "موقع دبيان"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "البحث في موقع دبيان."
+
#~ msgid "Visit the site sponsor"
#~ msgstr "زيارة راعي الموقع"
diff --git a/arabic/po/vote.ar.po b/arabic/po/vote.ar.po
index f0c9f8b5075..d15d24a376c 100644
--- a/arabic/po/vote.ar.po
+++ b/arabic/po/vote.ar.po
@@ -36,7 +36,6 @@ msgstr "الترشيحات"
#: ../../english/template/debian/votebar.wml:25
#, fuzzy
-#| msgid "Withdrawn"
msgid "Withdrawals"
msgstr "مسحوب"
@@ -77,207 +76,234 @@ msgid "Proposal F Proposer"
msgstr "مقترح الإقتراح F"
#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "مقترح الإقتراح A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "مقترح الإقتراح A"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "الثواني"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "ثواني الإقتراح A"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "ثواني الإقتراح B"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "ثواني الإقتراح C"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "ثواني الإقتراح D"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "ثواني الإقتراح E"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "ثواني الإقتراح F"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "ثواني الإقتراح A"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "ثواني الإقتراح A"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "المعارضة"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "نص"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "الاقتراح A"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "الاقتراح B"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "الاقتراح C"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "الاقتراح D"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "الاقتراح E"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "الاقتراح F"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "الاقتراح A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "الاقتراح A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "خيارات"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "مُقترح التعديل"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "ثواني التعديل"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "نصّ التعديل"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "مُقترح التعديل أ"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "التعديلات أ"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "نصّ التعديل أ"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "مُقترح التعديل ب"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "التعديلات ب"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "نصّ التعديل ب"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
#, fuzzy
-#| msgid "Amendment Proposer A"
msgid "Amendment Proposer C"
msgstr "مُقترح التعديل أ"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
#, fuzzy
-#| msgid "Amendment Seconds A"
msgid "Amendment Seconds C"
msgstr "التعديلات أ"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
#, fuzzy
-#| msgid "Amendment Text A"
msgid "Amendment Text C"
msgstr "نصّ التعديل أ"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "التعديلات"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "الإجراءات"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "مطلب جماعي"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "بيانات وإحصائيات"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "النِصاب"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "الحدّ الأدنى للمناقشة"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "الاقتراع"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "المنتدى"
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "الناتج"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "انتظار&nbsp;الرّعاة"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "قيد&nbsp;المناقشة"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "التصويت&nbsp;مفتوح"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "مُقرّر"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "مسحوب"
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "أخرى"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "صفحة&nbsp;التصويت&nbsp;الرئيسيّة"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "طريقة&nbsp;عمل"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "إرسال&nbsp;اقتراح"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "إصلاح&nbsp;اقتراح"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "متابعة&nbsp;اقتراح"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "قراءة&nbsp;نتيجة"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "تصويت"
diff --git a/armenian/po/cdimage.hy.po b/armenian/po/cdimage.hy.po
index 4ef986f2279..830a7cb188f 100644
--- a/armenian/po/cdimage.hy.po
+++ b/armenian/po/cdimage.hy.po
@@ -14,20 +14,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.1\n"
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../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:87
-msgid "ISO images"
-msgstr "ISO պատկերներ"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo նիշքեր"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -124,3 +110,17 @@ msgid ""
msgstr ""
"Անգլալեզու <a href=\"/MailingLists/disclaimer\">հրապարակային փոստային ցանկ</"
"a> CD-ների/DVD-ների համար՝"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO պատկերներ"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo նիշքեր"
diff --git a/armenian/po/consultants.hy.po b/armenian/po/consultants.hy.po
index 4e1cdb09c08..a8876bc616a 100644
--- a/armenian/po/consultants.hy.po
+++ b/armenian/po/consultants.hy.po
@@ -9,6 +9,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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 ""
@@ -62,11 +70,3 @@ 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/armenian/po/countries.hy.po b/armenian/po/countries.hy.po
index 07c79ff1dd9..c798984a429 100644
--- a/armenian/po/countries.hy.po
+++ b/armenian/po/countries.hy.po
@@ -221,217 +221,220 @@ msgid "Kenya"
msgstr ""
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Պակիստան"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Կորեա"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Քուվեիտ"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
#, fuzzy
msgid "Kazakhstan"
msgstr "Պակիստան"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Շիրի Լանկա"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr ""
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Լուկսենբուրգ"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Լատվիա"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Մարոկո"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr ""
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr ""
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Մադագասկար"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr ""
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr ""
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
#, fuzzy
msgid "Malta"
msgstr "Մալազիա"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Մեքսիկա"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Մալազիա"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr ""
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Նիկարագուա"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr ""
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Նորվեգիա"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr ""
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Պանամա"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Պեռու"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr ""
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Ֆիլիպիններ"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Պակիստան"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr ""
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Պորտուգալիա"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Ռումինիա"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr ""
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Ռուսաստան"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr ""
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Շվեդիա"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Սինգապուր"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Սլովենիա"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Սլովակիա"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr ""
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Թաիլանդ"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
#, fuzzy
-#| msgid "Pakistan"
msgid "Tajikistan"
msgstr "Պակիստան"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
#, fuzzy
msgid "Tunisia"
msgstr "Ռուսաստան"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Թուրքիա"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Տաիվան"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ուկրաինիա"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Միացիալ Նահանգներ"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Ուրուգվայ"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
#, fuzzy
-#| msgid "Pakistan"
msgid "Uzbekistan"
msgstr "Պակիստան"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Վենեսուելա"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Վիետնամ"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr ""
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Հարավային Աֆրիկա"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Զիմբաբվե"
diff --git a/armenian/po/distrib.hy.po b/armenian/po/distrib.hy.po
index 5e3a2677faa..b442f88b5ab 100644
--- a/armenian/po/distrib.hy.po
+++ b/armenian/po/distrib.hy.po
@@ -9,98 +9,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Բառը"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Էկրան"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Փնտրել"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr ""
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Միայն փաթեթների անունների մեջ"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "փաթեթներ, որոնք իրենց մեջ պարունակում են այսպիսի անունով ֆայլեր"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Բացատրություններում"
-#: ../../english/distrib/search_contents-form.inc:22
-#, fuzzy
-msgid "packages that contain files whose names contain the keyword"
-msgstr "փաթեթներ, որոնք իրենց մեջ պարունակում են այսպիսի անունով ֆայլեր"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Փաթեթների սկզբնաղբյուրների անուների մեջ"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr ""
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Թողարկման տիպը"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "ցանկացած"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Փնտրել"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-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"
-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:21
-msgid "Only show exact matches"
-msgstr ""
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Բաժինը"
@@ -117,6 +86,37 @@ msgstr ""
msgid "non-free"
msgstr "ոչ ազատ"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Փնտրել"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Մաքրել"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Էկրան"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr ""
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "փաթեթներ, որոնք իրենց մեջ պարունակում են այսպիսի անունով ֆայլեր"
+
+#: ../../english/distrib/search_contents-form.inc:22
+#, fuzzy
+msgid "packages that contain files whose names contain the keyword"
+msgstr "փաթեթներ, որոնք իրենց մեջ պարունակում են այսպիսի անունով ֆայլեր"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Համակառույցը"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr ""
diff --git a/armenian/po/doc.hy.po b/armenian/po/doc.hy.po
index 21d1edafb53..a097dde1b10 100644
--- a/armenian/po/doc.hy.po
+++ b/armenian/po/doc.hy.po
@@ -9,96 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-" Debian 9 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:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-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:83
-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:105
-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:125
-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:146
-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 8) 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:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Հեղինակ՝"
@@ -205,6 +115,96 @@ msgstr ""
msgid "Debian package (archived)"
msgstr ""
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/armenian/po/newsevents.hy.po b/armenian/po/newsevents.hy.po
index 1303f57be40..2e9b6217978 100644
--- a/armenian/po/newsevents.hy.po
+++ b/armenian/po/newsevents.hy.po
@@ -9,120 +9,161 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
+#: ../../english/template/debian/events_common.wml:8
+msgid "Upcoming Attractions"
msgstr ""
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
+#: ../../english/template/debian/events_common.wml:11
+msgid "link may no longer be valid"
msgstr ""
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
+#: ../../english/template/debian/events_common.wml:14
+msgid "When"
msgstr ""
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
+#: ../../english/template/debian/events_common.wml:17
+msgid "Where"
msgstr ""
-#: ../../english/events/talks.defs:9
-msgid "Title:"
+#: ../../english/template/debian/events_common.wml:20
+msgid "More Info"
msgstr ""
-#: ../../english/events/talks.defs:12
-msgid "Author:"
+#: ../../english/template/debian/events_common.wml:23
+msgid "Debian Involvement"
msgstr ""
-#: ../../english/events/talks.defs:15
-msgid "Language:"
+#: ../../english/template/debian/events_common.wml:26
+msgid "Main Coordinator"
msgstr ""
-#: ../../english/events/talks.defs:19
-msgid "Date:"
+#: ../../english/template/debian/events_common.wml:29
+msgid "<th>Project</th><th>Coordinator</th>"
msgstr ""
-#: ../../english/events/talks.defs:23
-msgid "Event:"
+#: ../../english/template/debian/events_common.wml:32
+msgid "Related Links"
msgstr ""
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
+#: ../../english/template/debian/events_common.wml:35
+msgid "Latest News"
msgstr ""
-#: ../../english/events/talks.defs:29
-msgid "source"
+#: ../../english/template/debian/events_common.wml:38
+msgid "Download calendar entry"
msgstr ""
-#: ../../english/events/talks.defs:32
-msgid "PDF"
+#: ../../english/template/debian/news.wml:9
+msgid ""
+"Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/\">Debian "
+"Project homepage</a>."
msgstr ""
-#: ../../english/events/talks.defs:35
-msgid "HTML"
+#. '<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)>"
+#: ../../english/template/debian/news.wml:17
+msgid "<get-var url /> (dead link)"
msgstr ""
-#: ../../english/events/talks.defs:38
-msgid "MagicPoint"
+#: ../../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 ""
-#: ../../english/events/talks.defs:41
-msgid "Abstract"
+#: ../../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 ""
-#: ../../english/template/debian/events_common.wml:8
-msgid "Upcoming Attractions"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:11
-msgid "link may no longer be valid"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:14
-msgid "When"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:17
-msgid "Where"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:20
-msgid "More Info"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:23
-msgid "Debian Involvement"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:26
-msgid "Main Coordinator"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:29
-msgid "<th>Project</th><th>Coordinator</th>"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:32
-msgid "Related Links"
+#: ../../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 ""
-#: ../../english/template/debian/events_common.wml:35
-msgid "Latest News"
+#. 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 ""
-#: ../../english/template/debian/events_common.wml:38
-msgid "Download calendar entry"
+#. 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 ""
-#: ../../english/template/debian/news.wml:9
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:25
msgid ""
-"Back to: other <a href=\"./\">Debian news</a> || <a href=\"m4_HOME/\">Debian "
-"Project homepage</a>."
+"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
msgstr ""
-#. '<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)>"
-#: ../../english/template/debian/news.wml:17
-msgid "<get-var url /> (dead link)"
+#. 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/template/debian/projectnews/boilerplates.wml:35
@@ -306,103 +347,62 @@ msgid ""
"the following topics:"
msgstr ""
-#: ../../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>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
msgstr ""
-#: ../../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."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
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>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
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>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
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>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
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>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:29
+msgid "source"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
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>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
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>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
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>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
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>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
msgstr ""
diff --git a/armenian/po/organization.hy.po b/armenian/po/organization.hy.po
index 1066e5a60a5..d81c1df7c5b 100644
--- a/armenian/po/organization.hy.po
+++ b/armenian/po/organization.hy.po
@@ -42,11 +42,11 @@ msgid "manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "SRM"
+msgid "Stable Release Manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "Stable Release Manager"
+msgid "SRM"
msgstr ""
#: ../../english/intro/organization.data:36
@@ -75,27 +75,27 @@ msgid "role"
msgstr ""
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr ""
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr ""
@@ -109,136 +109,131 @@ msgstr ""
msgid "Support and Infrastructure"
msgstr ""
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr ""
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr ""
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr ""
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr ""
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr ""
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr ""
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr ""
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr ""
@@ -397,39 +392,11 @@ msgstr ""
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr ""
-
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr ""
-
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr ""
-
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr ""
-
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr ""
-
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr ""
-
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr ""
-
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr ""
diff --git a/armenian/po/others.hy.po b/armenian/po/others.hy.po
index ee45903ab7d..4f5065570a3 100644
--- a/armenian/po/others.hy.po
+++ b/armenian/po/others.hy.po
@@ -57,42 +57,6 @@ msgstr ""
msgid "Unavailable"
msgstr ""
-#: ../../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> "
@@ -124,6 +88,34 @@ msgstr ""
msgid "Address"
msgstr ""
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr ""
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr ""
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr ""
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr ""
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr ""
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr ""
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr ""
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr ""
@@ -212,109 +204,117 @@ msgstr ""
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
+#: ../../english/y2k/l10n.data:6
+msgid "OK"
msgstr ""
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
+#: ../../english/y2k/l10n.data:9
+msgid "BAD"
msgstr ""
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
+#: ../../english/y2k/l10n.data:12
+msgid "OK?"
msgstr ""
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
+#: ../../english/y2k/l10n.data:15
+msgid "BAD?"
msgstr ""
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
+#: ../../english/y2k/l10n.data:18
+msgid "??"
msgstr ""
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
+#: ../../english/y2k/l10n.data:21
+msgid "Unknown"
msgstr ""
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
+#: ../../english/y2k/l10n.data:24
+msgid "ALL"
msgstr ""
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
+#: ../../english/y2k/l10n.data:27
+msgid "Package"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
+#: ../../english/y2k/l10n.data:30
+msgid "Status"
msgstr ""
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
+#: ../../english/y2k/l10n.data:33
+msgid "Version"
msgstr ""
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
+#: ../../english/y2k/l10n.data:36
+msgid "URL"
msgstr ""
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
msgstr ""
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
msgstr ""
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
msgstr ""
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
msgstr ""
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
msgstr ""
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
msgstr ""
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
msgstr ""
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
msgstr ""
-#: ../../english/y2k/l10n.data:18
-msgid "??"
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
msgstr ""
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
msgstr ""
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
msgstr ""
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
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"
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
msgstr ""
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
msgstr ""
diff --git a/armenian/po/partners.hy.po b/armenian/po/partners.hy.po
index db8c9e99938..644cd23a422 100644
--- a/armenian/po/partners.hy.po
+++ b/armenian/po/partners.hy.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
diff --git a/armenian/po/ports.hy.po b/armenian/po/ports.hy.po
index 575d7ec9cf6..835550a0827 100644
--- a/armenian/po/ports.hy.po
+++ b/armenian/po/ports.hy.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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 ""
@@ -89,6 +73,22 @@ msgstr ""
msgid "Systems"
msgstr ""
+#: ../../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/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr ""
diff --git a/armenian/po/security.hy.po b/armenian/po/security.hy.po
index 65fb442e11a..726da6abaa2 100644
--- a/armenian/po/security.hy.po
+++ b/armenian/po/security.hy.po
@@ -9,40 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr ""
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr ""
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr ""
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr ""
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr ""
@@ -120,3 +86,37 @@ msgstr ""
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr ""
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr ""
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/armenian/po/stats.hy.po b/armenian/po/stats.hy.po
index c8a22ea2b47..d3ed74c3db2 100644
--- a/armenian/po/stats.hy.po
+++ b/armenian/po/stats.hy.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/armenian/po/templates.hy.po b/armenian/po/templates.hy.po
index 8beb58eee39..5e63bbbb250 100644
--- a/armenian/po/templates.hy.po
+++ b/armenian/po/templates.hy.po
@@ -9,14 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr ""
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -243,6 +235,14 @@ msgstr ""
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr ""
@@ -514,3 +514,11 @@ msgstr ""
#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr ""
+
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr ""
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
diff --git a/armenian/po/vote.hy.po b/armenian/po/vote.hy.po
index e1ef9c1f20e..b9b28dc9dde 100644
--- a/armenian/po/vote.hy.po
+++ b/armenian/po/vote.hy.po
@@ -66,201 +66,225 @@ msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Seconds"
+msgid "Proposal G Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal A Seconds"
+msgid "Proposal H Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal B Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal C Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal D Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Proposal E Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Proposal F Seconds"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Opposition"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Text"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal A"
+msgid "Proposal G Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal B"
+msgid "Proposal H Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal C"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal D"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Proposal E"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Proposal F"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Choices"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Proposer"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Seconds"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Text"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Proposer A"
+msgid "Proposal G"
msgstr ""
#: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Seconds A"
+msgid "Proposal H"
msgstr ""
#: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Text A"
+msgid "Choices"
msgstr ""
#: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Proposer B"
+msgid "Amendment Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:124
-msgid "Amendment Seconds B"
+msgid "Amendment Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:127
-msgid "Amendment Text B"
+msgid "Amendment Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:130
-msgid "Amendment Proposer C"
+msgid "Amendment Proposer A"
msgstr ""
#: ../../english/template/debian/votebar.wml:133
-msgid "Amendment Seconds C"
+msgid "Amendment Seconds A"
msgstr ""
#: ../../english/template/debian/votebar.wml:136
-msgid "Amendment Text C"
+msgid "Amendment Text A"
msgstr ""
#: ../../english/template/debian/votebar.wml:139
-msgid "Amendments"
+msgid "Amendment Proposer B"
msgstr ""
#: ../../english/template/debian/votebar.wml:142
-msgid "Proceedings"
+msgid "Amendment Seconds B"
msgstr ""
#: ../../english/template/debian/votebar.wml:145
-msgid "Majority Requirement"
+msgid "Amendment Text B"
msgstr ""
#: ../../english/template/debian/votebar.wml:148
-msgid "Data and Statistics"
+msgid "Amendment Proposer C"
msgstr ""
#: ../../english/template/debian/votebar.wml:151
-msgid "Quorum"
+msgid "Amendment Seconds C"
msgstr ""
#: ../../english/template/debian/votebar.wml:154
-msgid "Minimum Discussion"
+msgid "Amendment Text C"
msgstr ""
#: ../../english/template/debian/votebar.wml:157
-msgid "Ballot"
+msgid "Amendments"
msgstr ""
#: ../../english/template/debian/votebar.wml:160
-msgid "Forum"
+msgid "Proceedings"
msgstr ""
#: ../../english/template/debian/votebar.wml:163
+msgid "Majority Requirement"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:166
+msgid "Data and Statistics"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:169
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:172
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:175
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:178
+msgid "Forum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr ""
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr ""
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr ""
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr ""
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr ""
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr ""
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr ""
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr ""
diff --git a/bulgarian/po/cdimage.bg.po b/bulgarian/po/cdimage.bg.po
index b3c8af6484a..b43b6568709 100644
--- a/bulgarian/po/cdimage.bg.po
+++ b/bulgarian/po/cdimage.bg.po
@@ -14,20 +14,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "Образи на оптични носители"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Файлова за jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -124,3 +110,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">публични пощенски списъци</a> (на "
"английски) за компактдискове и DVD:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "Образи на оптични носители"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Файлова за jigdo"
diff --git a/bulgarian/po/consultants.bg.po b/bulgarian/po/consultants.bg.po
index 5fd5c800426..cd71d85a65e 100644
--- a/bulgarian/po/consultants.bg.po
+++ b/bulgarian/po/consultants.bg.po
@@ -14,6 +14,14 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Gtranslator 2.91.5\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 "Обратно към <a href=\"./\">страницата за консултантите</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Име:"
@@ -67,11 +75,3 @@ 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"
-msgstr "Списък на консултантите"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Обратно към <a href=\"./\">страницата за консултантите</a>."
diff --git a/bulgarian/po/countries.bg.po b/bulgarian/po/countries.bg.po
index 47bf28dc368..cfcbcacd498 100644
--- a/bulgarian/po/countries.bg.po
+++ b/bulgarian/po/countries.bg.po
@@ -222,210 +222,215 @@ msgid "Kenya"
msgstr "Кения"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Казахстан"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Корея"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Кувейт"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Казахстан"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Шри Ланка"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Литва"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Люксембург"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Латвия"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Мароко"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Молдова"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Черна Гора"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Мадагаскар"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Република Македония"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Монголия"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Малта"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Мексико"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Малайзия"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Нова Каледония"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Никарагуа"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Холандия"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Норвегия"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Нова Зеландия"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Панама"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Перу"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Френска Полинезия"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Филипини"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Пакистан"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Полша"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Португалия"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Румъния"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Сърбия"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Русия"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Саудитска Арабия"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Швеция"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Сингапур"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Словения"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Словакия"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "Ел Салвадор"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Тайланд"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Таджикистан"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tунис"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Турция"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Тайван"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Украйна"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Съединени Щати"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Уругвай"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Узбекистан"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Венецуела"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Виетнам"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Вануату"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "ЮАР"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Зимбабве"
diff --git a/bulgarian/po/distrib.bg.po b/bulgarian/po/distrib.bg.po
index 37ad80b0f3c..5f337aec73c 100644
--- a/bulgarian/po/distrib.bg.po
+++ b/bulgarian/po/distrib.bg.po
@@ -15,97 +15,67 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Ключова дума"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Показване"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Търсене по"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "пътища, завършващи с ключовата дума"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Само в имената на пакетите"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "пакети, които съдържат файлове с това име"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Описания"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "пакети, които съдържат файлове с имена съдържащи ключовата дума"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Имена на пакети с изходен код"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Показване само на точните съвпадения"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Дистрибуция"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "експериментална"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "нестабилна"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "тестова"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "стабилна"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "всички"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Търсене"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-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"
-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:21
-msgid "Only show exact matches"
-msgstr "Показване само на точните съвпадения"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Раздел"
@@ -122,6 +92,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Търсене"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Изчистване"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Показване"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "пътища, завършващи с ключовата дума"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "пакети, които съдържат файлове с това име"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "пакети, които съдържат файлове с имена съдържащи ключовата дума"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Архитектура"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -136,19 +136,16 @@ 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
#, fuzzy
-#| msgid "EABI ARM"
msgid "EABI ARM (armel)"
msgstr "EABI ARM"
#: ../../english/releases/arches.data:13
#, fuzzy
-#| msgid "Hard Float ABI ARM"
msgid "Hard Float ABI ARM (armhf)"
msgstr "ARM с хардуерен процесор за изчисления с плаваща запетая"
@@ -186,7 +183,6 @@ msgstr "MIPS (big endian)"
#: ../../english/releases/arches.data:22
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "MIPS (little endian)"
@@ -204,7 +200,6 @@ msgstr ""
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "MIPS (little endian)"
diff --git a/bulgarian/po/doc.bg.po b/bulgarian/po/doc.bg.po
index 9fd1aa90a11..466f4fc5b5c 100644
--- a/bulgarian/po/doc.bg.po
+++ b/bulgarian/po/doc.bg.po
@@ -15,6 +15,116 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Автор:"
+
+#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Пакет за Дебиан"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "email:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Достъпна на адрес:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "Включва компактдиск:"
+
+#: ../../english/doc/books.def:54
+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:97
+msgid "Latest version:"
+msgstr "Последна версия:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(версия <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "обикновен текст"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+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:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr ""
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr ""
+
+#: ../../english/doc/manuals.defs:177
+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:185
+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:203
+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>потребител</var>@cvs.debian.org:/cvs/debian-boot</kbd>\n"
+" и изтеглете модула <kbd>boot-floppies/documentation</kbd>."
+
+#: ../../english/doc/manuals.defs:208
+msgid "CVS via web"
+msgstr "CVS през уеб"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Пакет за Дебиан"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Пакет за Дебиан (архивен)"
+
#: ../../english/doc/books.data:32
msgid ""
"\n"
@@ -35,19 +145,6 @@ msgstr ""
#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
#: ../../english/doc/books.data:226
#, fuzzy
-#| 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."
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -114,12 +211,6 @@ msgstr ""
#: ../../english/doc/books.data:146
#, fuzzy
-#| 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."
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 "
@@ -147,117 +238,6 @@ msgid ""
" intrusion detection system."
msgstr ""
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Автор:"
-
-#: ../../english/doc/books.def:41
-#, fuzzy
-#| msgid "Debian package"
-msgid "Debian Release:"
-msgstr "Пакет за Дебиан"
-
-#: ../../english/doc/books.def:44
-msgid "email:"
-msgstr "email:"
-
-#: ../../english/doc/books.def:48
-msgid "Available at:"
-msgstr "Достъпна на адрес:"
-
-#: ../../english/doc/books.def:51
-msgid "CD Included:"
-msgstr "Включва компактдиск:"
-
-#: ../../english/doc/books.def:54
-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:97
-msgid "Latest version:"
-msgstr "Последна версия:"
-
-#: ../../english/doc/manuals.defs:113
-msgid "(version <get-var version />)"
-msgstr "(версия <get-var version />)"
-
-#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "обикновен текст"
-
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:193
-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:161 ../../english/doc/manuals.defs:171
-#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
-#: ../../english/doc/manuals.defs:195
-msgid "Web interface: "
-msgstr ""
-
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
-#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
-#: ../../english/doc/manuals.defs:196
-msgid "VCS interface: "
-msgstr ""
-
-#: ../../english/doc/manuals.defs:177
-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:185
-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:203
-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>потребител</var>@cvs.debian.org:/cvs/debian-boot</kbd>\n"
-" и изтеглете модула <kbd>boot-floppies/documentation</kbd>."
-
-#: ../../english/doc/manuals.defs:208
-msgid "CVS via web"
-msgstr "CVS през уеб"
-
-#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
-msgid "Debian package"
-msgstr "Пакет за Дебиан"
-
-#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
-msgid "Debian package (archived)"
-msgstr "Пакет за Дебиан (архивен)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/bulgarian/po/newsevents.bg.po b/bulgarian/po/newsevents.bg.po
index ecac11212dc..1a2221a3569 100644
--- a/bulgarian/po/newsevents.bg.po
+++ b/bulgarian/po/newsevents.bg.po
@@ -16,66 +16,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Gtranslator 2.91.5\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 "p<get-var page />"
-
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-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 "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 "Резюме"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Предстоящи събития"
@@ -134,6 +74,128 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (несъществуваща връзка)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"За да получавате този бюлетин всяка седмица, <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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "<a href=\"../../\">Стари броеве</a> от бюлетина."
+
+#. 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\" />Новините за проекта Дебиан се редактират от <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\" />Новините за проекта Дебиан се редактират от <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\" />Този брой на новините за проекта Дебиан бе "
+"редактиран от <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\" />Този брой на новините за проекта Дебиан бе редактиран "
+"от <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\" />Превод: %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\" />Превод: %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\" />Превод: %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\" />Превод: %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 ""
+"За да получавате този бюлетин всяка седмица, <a href=\"https://lists.debian."
+"org/debian-news/\">запишете се в пощенския списък 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\" />Седмични новини за Дебиан се редактира от <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\" />Седмични новини за Дебиан се радактира от <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\" />Този брой на Седмични новини за Дебиан е редактиран "
+"от <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\" />Този брой на Седмични новини за Дебиан е радактиран от "
+"<a href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -381,131 +443,65 @@ msgstr ""
"Излезе брой <get-var issue-devel-news /> на <a href=\"<get-var url-devel-"
"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 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>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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=\"../../\">Стари броеве</a> от бюлетина."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+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>."
-msgstr ""
-"<void id=\"singular\" />Новините за проекта Дебиан се редактират от <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+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>."
-msgstr ""
-"<void id=\"plural\" />Новините за проекта Дебиан се редактират от <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+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>."
-msgstr ""
-"<void id=\"singular\" />Този брой на новините за проекта Дебиан бе "
-"редактиран от <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+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>."
-msgstr ""
-"<void id=\"plural\" />Този брой на новините за проекта Дебиан бе редактиран "
-"от <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Събитие:"
-#. 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\" />Превод: %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Кадри от презентацията:"
-#. 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\" />Превод: %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "изходен код"
-#. 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\" />Превод: %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Превод: %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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 ""
-"За да получавате този бюлетин всяка седмица, <a href=\"https://lists.debian."
-"org/debian-news/\">запишете се в пощенския списък debian-news</a>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "Презентация — MagicPoint"
-#. 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\" />Седмични новини за Дебиан се редактира от <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+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>."
-msgstr ""
-"<void id=\"plural\" />Седмични новини за Дебиан се радактира от <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+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>."
-msgstr ""
-"<void id=\"singular\" />Този брой на Седмични новини за Дебиан е редактиран "
-"от <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+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 ""
-"<void id=\"plural\" />Този брой на Седмични новини за Дебиан е радактиран от "
-"<a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Вести за Дебиан"
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/bulgarian/po/organization.bg.po b/bulgarian/po/organization.bg.po
index a94c938ae1b..687166a3f46 100644
--- a/bulgarian/po/organization.bg.po
+++ b/bulgarian/po/organization.bg.po
@@ -48,13 +48,13 @@ msgid "manager"
msgstr "отговорник"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "УСИ"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Управител на стабилното издание"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "УСИ"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "магьосник"
@@ -62,7 +62,6 @@ msgstr "магьосник"
#. we only use the chair tag once, for techctte, I wonder why it's here.
#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "председател"
@@ -83,29 +82,28 @@ msgid "role"
msgstr ""
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Официални длъжности"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Дистрибуция"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Публичност"
@@ -119,136 +117,131 @@ msgstr ""
msgid "Support and Infrastructure"
msgstr "Поддръжка и инфраструктура"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr "Дестилати на Дебиан"
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Лидер"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Техническа комисия"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Секретар"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Разработка"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP архиви"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "Магьосник на FTP"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Асистенти"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Магьосници на FTP"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Обновени пакети за стабилното издание"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Екип за поддържане на обновените пакети за стабилното издание"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Управление на изданията"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Екип по изданията"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Контрол на качеството"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Екип по инсталационната система"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Бележки по изданията"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Образи на компактдискове"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Производство"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Тестване"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr ""
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Инфраструктура за автоматично компилиране на пакети"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Екип на wanna-build"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Администриране на buildd"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Документация"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Списък на незавършени и планирани пакети"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Архитектури"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Специални конфигурации"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Преносими компютри"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Защитни стени"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Системи за вграждане"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Контакт с пресата"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Уеб-страници"
@@ -274,7 +267,6 @@ msgstr "Събития"
#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Техническа комисия"
@@ -414,50 +406,44 @@ msgstr "Система за следене на пакетите"
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
#, 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:490
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Администратори на Alioth"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "Дебиан за деца от 1 до 99г."
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Дестилати на Дебиан"
+
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Дебиан за деца от 1 до 99г."
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "Дебиан за медицински практики и разработки"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Дебиан за медицински практики и разработки"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "Дебиан за образователни цели"
+#~ msgid "Debian for education"
+#~ msgstr "Дебиан за образователни цели"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "Дебиан за правни кантори"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Дебиан за правни кантори"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "Дебиан за хора с увреждания"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Дебиан за хора с увреждания"
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr "Дебиан за научни изследвания"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Дебиан за научни изследвания"
-#: ../../english/intro/organization.data:523
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Дебиан за образователни цели"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Дебиан за образователни цели"
#~ msgid "Alioth administrators"
#~ msgstr "Администратори на Alioth"
diff --git a/bulgarian/po/others.bg.po b/bulgarian/po/others.bg.po
index 227e9e0ae27..86f4c8a5dd6 100644
--- a/bulgarian/po/others.bg.po
+++ b/bulgarian/po/others.bg.po
@@ -64,42 +64,6 @@ msgstr "<void id=\"d-i\" />Неясен"
msgid "Unavailable"
msgstr "Недостъпен"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Кът за нови членове"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Стъпка 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Стъпка 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Стъпка 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Стъпка 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Стъпка 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Стъпка 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Стъпка 7"
-
-#: ../../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> "
@@ -135,6 +99,34 @@ msgstr "Факс"
msgid "Address"
msgstr "Адрес"
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "С&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "Без&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "Капсулован PostScrip"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Задвижван от Дебиан]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Задвижван от Дебиан ГНУ/Линукс]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "Задвижван от Дебиан"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Дебиан] (малък бутон)"
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Продукти"
@@ -225,69 +217,6 @@ msgstr ""
"Парични дарения, използвани за организиране на местни събития, свързани със "
"свободен софтуер"
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "С&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "Без&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "Капсулован PostScrip"
-
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Задвижван от Дебиан]"
-
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Задвижван от Дебиан ГНУ/Линукс]"
-
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "Задвижван от Дебиан"
-
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Дебиан] (малък бутон)"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "също като по-горе"
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "От колко време използвате Дебиан?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Член ли сте на проекта Дебиан?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "В кои сфери на Дебиан са интересите ви?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Какво ви подтикна да работите с Дебиан?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr "Имате ли съвети към жените, желаещи да помогнат на Дебиан?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr "Работите ли заедно с други жени в група с техническа насоченост? Кои?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Повече за вас…"
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -332,6 +261,77 @@ msgstr "Версия"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Кът за нови членове"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Стъпка 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Стъпка 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Стъпка 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Стъпка 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Стъпка 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Стъпка 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Стъпка 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Списък със задачи на кандидатстващия"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "също като по-горе"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "От колко време използвате Дебиан?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Член ли сте на проекта Дебиан?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "В кои сфери на Дебиан са интересите ви?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Какво ви подтикна да работите с Дебиан?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr "Имате ли съвети към жените, желаещи да помогнат на Дебиан?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr "Работите ли заедно с други жени в група с техническа насоченост? Кои?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Повече за вас…"
+
#~ msgid "Wanted:"
#~ msgstr "Желани:"
diff --git a/bulgarian/po/partners.bg.po b/bulgarian/po/partners.bg.po
index db8c9e99938..644cd23a422 100644
--- a/bulgarian/po/partners.bg.po
+++ b/bulgarian/po/partners.bg.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
diff --git a/bulgarian/po/ports.bg.po b/bulgarian/po/ports.bg.po
index 688c34444f2..6ccd3604bed 100644
--- a/bulgarian/po/ports.bg.po
+++ b/bulgarian/po/ports.bg.po
@@ -14,22 +14,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Gtranslator 2.91.5\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Дебиан за Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Дебиан за PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Компактдискове с Hurd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Дебиан за IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "За контакти"
@@ -94,6 +78,22 @@ msgstr "Доставка"
msgid "Systems"
msgstr "Системи"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Дебиан за Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Дебиан за PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Компактдискове с Hurd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Дебиан за IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Дебиан ГНУ/NetBSD за i386"
diff --git a/bulgarian/po/security.bg.po b/bulgarian/po/security.bg.po
index ed33967f43d..627357c7086 100644
--- a/bulgarian/po/security.bg.po
+++ b/bulgarian/po/security.bg.po
@@ -13,40 +13,6 @@ msgstr ""
"Content-Transfer-Encoding: binary\n"
"Plural-Forms: \n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Сигурност на Дебиан"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Бюлетини на Дебиан по сигурността"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "В"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr "Бюлетини <a href=\\\"undated/\\\">без дата</a>, включени запълнота"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Речник CVE на Mitre"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "База данни Securityfocus Bugtraq"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Бюлетини на CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Известия за уязвимости от US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Източник:"
@@ -128,3 +94,37 @@ msgstr "Уязвимости в CERT, съвети и бележки:"
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr "В момента няма връзки към други външни бази данни по сигурността."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "В"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Сигурност на Дебиан"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Бюлетини на Дебиан по сигурността"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Речник CVE на Mitre"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "База данни Securityfocus Bugtraq"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Бюлетини на CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Известия за уязвимости от US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr "Бюлетини <a href=\\\"undated/\\\">без дата</a>, включени запълнота"
diff --git a/bulgarian/po/stats.bg.po b/bulgarian/po/stats.bg.po
index bc8c1b778d0..a8d693f1e42 100644
--- a/bulgarian/po/stats.bg.po
+++ b/bulgarian/po/stats.bg.po
@@ -14,22 +14,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Generator: Gtranslator 2.91.5\n"
-#: ../../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 "Има %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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Грешна версия на превода"
@@ -47,13 +31,13 @@ msgid "The original no longer exists"
msgstr "Оригиналният документ вече не съществува"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "не е наличен брой на попаденията"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "попадения"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "не е наличен брой на попаденията"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Извличане на данни за разликите"
@@ -66,15 +50,6 @@ msgstr ""
msgid "Translation summary for"
msgstr "Обобщена информация за превода на"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Няма превод"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Остарял"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Преведено"
@@ -84,6 +59,15 @@ msgstr "Преведено"
msgid "Up to date"
msgstr "Обновен"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Остарял"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Няма превод"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -234,6 +218,22 @@ msgstr "Преведени страници (по размер)"
msgid "Translation Statistics by Page Size"
msgstr "Статистика на преводите по размер на страниците"
+#: ../../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 "Има %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 низа за превод."
+
#~ msgid "Unified diff"
#~ msgstr "Разлики в стандартен формат"
diff --git a/bulgarian/po/templates.bg.po b/bulgarian/po/templates.bg.po
index 9201a2441c9..6081b978bd3 100644
--- a/bulgarian/po/templates.bg.po
+++ b/bulgarian/po/templates.bg.po
@@ -14,14 +14,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Gtranslator 2.91.6\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Сайт на проекта Дебиан"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Търсене в сайта на Дебиан."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -84,7 +76,6 @@ msgstr "Контакти"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Издания"
@@ -164,7 +155,6 @@ msgstr "Блога на Дебиан"
#: ../../english/template/debian/common_translation.wml:94
#, fuzzy
-#| msgid "Last Modified"
msgid "Last Updated"
msgstr "Последна промяна"
@@ -215,12 +205,6 @@ msgstr "във версия 2.2"
#. your language.
#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
-#| "using_cvs\">available</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -271,6 +255,14 @@ msgstr "Тази страница е налична и на следните е
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Настройване на <a href=m4_HOME/intro/cn>езика по подразбиране</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Дебиан Интернационал"
@@ -317,7 +309,6 @@ msgstr "Книги за Дебиан"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Debian"
msgid "Debian Wiki"
msgstr "Дебиан"
@@ -550,6 +541,14 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Обратно към страницата <a href=\"../\">Кой използва Дебиан?</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Сайт на проекта Дебиан"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Търсене в сайта на Дебиан."
+
#~ msgid "Visit the site sponsor"
#~ msgstr "Посетете спонсорите на сайта"
diff --git a/bulgarian/po/vendors.bg.po b/bulgarian/po/vendors.bg.po
index 92c5eb2af37..de80f460739 100644
--- a/bulgarian/po/vendors.bg.po
+++ b/bulgarian/po/vendors.bg.po
@@ -23,7 +23,6 @@ msgstr "Позволява дарения"
#: ../../english/CD/vendors/vendors.CD.def:16
#, fuzzy
-#| msgid "CD/DVD"
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD"
diff --git a/bulgarian/po/vote.bg.po b/bulgarian/po/vote.bg.po
index 7232fa07106..13458a3b98b 100644
--- a/bulgarian/po/vote.bg.po
+++ b/bulgarian/po/vote.bg.po
@@ -31,7 +31,6 @@ msgstr "Номинации"
#: ../../english/template/debian/votebar.wml:25
#, fuzzy
-#| msgid "Withdrawn"
msgid "Withdrawals"
msgstr "Изтеглен"
@@ -72,207 +71,234 @@ msgid "Proposal F Proposer"
msgstr "Автор на предложение Е"
#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Автор на предложение А"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Автор на предложение А"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Подкрепа"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Подкрепящи предложение А"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Подкрепящи предложение Б"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Подкрепящи предложение В"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Подкрепщи предложение Г"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Подкреоящи предложение Д"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Подкрепящи предложение Е"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Подкрепящи предложение А"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Подкрепящи предложение А"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Опозиция"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Текст"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Предложение А"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Предложение Б"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Предложение В"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Предложение Г"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Предложение Д"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Предложение Е"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Предложение А"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Предложение А"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Възможности"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Автор на поправката"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Подкрепа за поправката"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Текст на поправката"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Автор на поправка A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Подкрепящи поправка A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Текст на поправка A"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Автор на поправка Б"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Подкрепящи поправка Б"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Текст на поправка Б"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
#, fuzzy
-#| msgid "Amendment Proposer A"
msgid "Amendment Proposer C"
msgstr "Автор на поправка A"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
#, fuzzy
-#| msgid "Amendment Seconds A"
msgid "Amendment Seconds C"
msgstr "Подкрепящи поправка A"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
#, fuzzy
-#| msgid "Amendment Text A"
msgid "Amendment Text C"
msgstr "Текст на поправка A"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Поправки"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Протоколи"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Изискване за мнозинство"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Данни и Статистики"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Кворум"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Минимален период за дискусия"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Бюлетина"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Форум"
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Решение"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Чака&nbsp;за&nbsp;подкрепа"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "В&nbsp;дискусия"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Гласуване"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Решен"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Изтеглен"
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Друг"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Главна страница за гласуване"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Стъпка по стъпка"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Изпращане на предложение"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Изпращане на поправка"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Проследяване на предложение"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Разчитане на резултата"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Гласуване"
diff --git a/catalan/po/cdimage.ca.po b/catalan/po/cdimage.ca.po
index bc9456b5ae6..fdb07953695 100644
--- a/catalan/po/cdimage.ca.po
+++ b/catalan/po/cdimage.ca.po
@@ -14,20 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Empremta digital"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "Imatges ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Fitxers Jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -124,3 +110,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Llista de correu publica</a> en anglès "
"per a CDs/DVDs:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "Imatges ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Fitxers Jigdo"
diff --git a/catalan/po/consultants.ca.po b/catalan/po/consultants.ca.po
index b90dafef6d0..2bf3890f904 100644
--- a/catalan/po/consultants.ca.po
+++ b/catalan/po/consultants.ca.po
@@ -14,6 +14,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Llista de consultors"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Tornar a la <a href=\"./\">pàgina de consultors de Debian</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Nom:"
@@ -69,11 +77,3 @@ msgid ""
msgstr ""
"<total_consultant> consultors de Debian llistats en <total_country> països "
"per tot el món."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Llista de consultors"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Tornar a la <a href=\"./\">pàgina de consultors de Debian</a>."
diff --git a/catalan/po/countries.ca.po b/catalan/po/countries.ca.po
index 71a1a569dee..c3b7e321f53 100644
--- a/catalan/po/countries.ca.po
+++ b/catalan/po/countries.ca.po
@@ -223,210 +223,215 @@ msgid "Kenya"
msgstr "Kenya"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazakhstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Corea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuwait"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazakhstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Lituània"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxemburg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Letònia"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Marroc"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldàvia"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Montenegro"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagascar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "República de Macedònia"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongòlia"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mèxic"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malàisia"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Nova Caledònia"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Països Baixos"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Noruega"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Nova Zelanda"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panamà"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Perú"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Polinèsia Francesa"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipines"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polònia"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugal"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "Illa de la Reunió"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Romania"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Sèrbia"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rússia"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Aràbia Saudita"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Suècia"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapur"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Eslovènia"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Eslovàquia"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "El Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Tailàndia"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tadjikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunísia"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turquia"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taiwan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ucraïna"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Estats Units"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguai"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Veneçuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Sud-àfrica"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/catalan/po/distrib.ca.po b/catalan/po/distrib.ca.po
index 4e8aab790d8..675783b87d9 100644
--- a/catalan/po/distrib.ca.po
+++ b/catalan/po/distrib.ca.po
@@ -15,97 +15,67 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Paraula clau"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Mostra"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Cerca a"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "camins acabats amb la paraula clau"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Només noms de paquet"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "paquets que contenen fitxers anomenats d'aquesta manera"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Descripció"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "paquets que contenen fitxers on els seus noms contenen la paraula clau"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Noms de paquet font"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Només mostra concordances exactes"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribució"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Arquitectura"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "qualsevol"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Cerca"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Esborra"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Cerca a"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Només noms de paquet"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Descripció"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Noms de paquet font"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Només mostra concordances exactes"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Secció"
@@ -122,6 +92,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Cerca"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Esborra"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Mostra"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "camins acabats amb la paraula clau"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "paquets que contenen fitxers anomenats d'aquesta manera"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "paquets que contenen fitxers on els seus noms contenen la paraula clau"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Arquitectura"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
diff --git a/catalan/po/doc.ca.po b/catalan/po/doc.ca.po
index 839240b5c0c..28bc1b1a9eb 100644
--- a/catalan/po/doc.ca.po
+++ b/catalan/po/doc.ca.po
@@ -13,96 +13,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-" Debian 9 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:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-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:83
-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:105
-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:125
-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:146
-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 8) 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:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Autor:"
@@ -212,6 +122,96 @@ msgstr "Paquet Debian"
msgid "Debian package (archived)"
msgstr "Paquet Debian (arxivat)"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/catalan/po/newsevents.ca.po b/catalan/po/newsevents.ca.po
index 7419cc26a74..c7e9fa4ecbd 100644
--- a/catalan/po/newsevents.ca.po
+++ b/catalan/po/newsevents.ca.po
@@ -14,66 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Notícies de Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Darreres notícies de 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 ""
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Títol:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Llenguatge:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Data:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Esdeveniment:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Presentació:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "codi font"
-
-#: ../../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 "Abstracte"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Properes atraccions"
@@ -132,6 +72,133 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (enllaç trencat)"
+#: ../../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 a rebre aquest butlletí en la vostra bústia, <a href=\"https://lists."
+"debian.org/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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr ""
+"Els <a href=\"../../\">números anteriors</a> d'aquest butlletí estan "
+"disponibles."
+
+#. 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\" />L'editor de les notícies del projecte Debian és <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\" />Els editors de les notícies del projecte Debian són <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\" />L'editor d'aquest número de les notícies del "
+"projecte Debian és <a href=\"mailto: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\" />Els editors d'aquest número de les notícies del "
+"projecte Debian són <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\" />Ha estat traduït per %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\" />Ha estat traduït per %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\" />Ha estat traduït per %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\" />Ha estat traduït per %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 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>"
+
+#. 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\" />L'editor de les notícies setmanals de Debian és <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\" />Els editors de les notícies setmanals de Debian són <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\" />L'editor d'aquest número de les notícies setmanals "
+"de Debian és <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\" />Els editors d'aquest número de les notícies setmanals "
+"de Debian són <a href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -313,132 +380,65 @@ msgid ""
"the following topics:"
msgstr ""
-#: ../../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 a rebre aquest butlletí en la vostra bústia, <a href=\"https://lists."
-"debian.org/debian-news/\">subscriviu-vos a la llista de correu debian-news.</"
-"a>"
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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 ""
-"Els <a href=\"../../\">números anteriors</a> d'aquest butlletí estan "
-"disponibles."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Títol:"
-#. 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\" />L'editor de les notícies del projecte Debian és <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Autor:"
-#. 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\" />Els editors de les notícies del projecte Debian són <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Llenguatge:"
-#. 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\" />L'editor d'aquest número de les notícies del "
-"projecte Debian és <a href=\"mailto:mailto:debian-publicity@lists.debian.org"
-"\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Data:"
-#. 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\" />Els editors d'aquest número de les notícies del "
-"projecte Debian són <a href=\"mailto:debian-publicity@lists.debian.org\">%s</"
-"a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Esdeveniment:"
-#. 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\" />Ha estat traduït per %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Presentació:"
-#. 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\" />Ha estat traduït per %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "codi font"
-#. 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\" />Ha estat traduït per %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Ha estat traduït per %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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 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/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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\" />L'editor de les notícies setmanals de Debian és <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Abstracte"
-#. 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\" />Els editors de les notícies setmanals de Debian són <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Notícies de 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\" />L'editor d'aquest número de les notícies setmanals "
-"de Debian és <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Darreres notícies de 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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
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 "Name:"
#~ msgstr "Nom:"
diff --git a/catalan/po/organization.ca.po b/catalan/po/organization.ca.po
index 4e7ad61c766..241b71994be 100644
--- a/catalan/po/organization.ca.po
+++ b/catalan/po/organization.ca.po
@@ -47,13 +47,13 @@ msgid "manager"
msgstr "gestor"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Administrador de llançament de la versió estable"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "mag"
@@ -80,27 +80,27 @@ msgid "role"
msgstr ""
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Directors"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribució"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Comunicació i divulgació"
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr "Equip de protecció de dades"
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Equip de publicitat"
@@ -114,136 +114,131 @@ msgstr ""
msgid "Support and Infrastructure"
msgstr "Suport i infraestructura"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr "Barreges pures de Debian"
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Líder"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Comitè tècnic"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Secretari"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Projectes de desenvolupament"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Arxius FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "Mestres de FTP"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Assistents de FTP"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Mags de FTP"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Gestió de llançaments"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Equip de llançament"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Control de qualitat"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Equip del sistema d'instal·lació"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr "Equip del sistema autònom de Debian"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Notes de la versió"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Imatges de CD"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Producció"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Proves"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr "Equip en núvol"
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infraestructura d'autocompilació"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Equip de wanna-build"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Administració dels dimonis de compilació"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Documentació"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Llista de paquets en perspectiva o en falta de feina"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Arquitectures"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Configuracions especials"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Portàtils"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Tallafocs"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Sistemes empotats"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Contacte de premsa"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Pàgines web"
@@ -410,44 +405,40 @@ msgstr "Sistema de seguiment de paquets"
msgid "Treasurer"
msgstr "Tresorers"
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Peticions d'us de la <a name=\"trademark\" href=\"m4_HOME/trademark\">marca "
"comercial</a>"
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Administració de Salsa"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "Debian per a nens de 1 a 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Barreges pures de Debian"
+
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian per a nens de 1 a 99"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "Debian per a la pràctica i recerca medica"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian per a la pràctica i recerca medica"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "Debian per a l'educació"
+#~ msgid "Debian for education"
+#~ msgstr "Debian per a l'educació"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "Debian a les oficines de dret"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian a les oficines de dret"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "Debian per a gent amb discapacitats"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian per a gent amb discapacitats"
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr "Debian per a la ciència i recerca relacionada"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian per a la ciència i recerca relacionada"
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr "Debian per a l'astronomia"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian per a l'astronomia"
#~ msgid "Live System Team"
#~ msgstr "Equip del sistema autònom"
diff --git a/catalan/po/others.ca.po b/catalan/po/others.ca.po
index 5a544eed48a..7da792a83ec 100644
--- a/catalan/po/others.ca.po
+++ b/catalan/po/others.ca.po
@@ -62,42 +62,6 @@ msgstr "<void id=\"d-i\" />Desconegut"
msgid "Unavailable"
msgstr "No està disponible"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Racó dels nous membres"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Primera passa"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Segona passa"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Tercera passa"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Quarta passa"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Cinquena passa"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Sisena passa"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Setena passa"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Llista de tasques del sol·licitant"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -133,6 +97,34 @@ msgstr "Fax"
msgid "Address"
msgstr "Adreça"
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "Amb «Debian»"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "Sense «Debian»"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "PostScript encapsulat"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Funciona amb Debian]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Funciona amb Debian GNU/Linux]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Funciona amb Debian]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (botó petit)"
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Productes"
@@ -221,69 +213,6 @@ msgstr ""
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "Amb «Debian»"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "Sense «Debian»"
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "PostScript encapsulat"
-
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Funciona amb Debian]"
-
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Funciona amb Debian GNU/Linux]"
-
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Funciona amb Debian]"
-
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (botó petit)"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "igual que l'anterior"
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "Bé"
@@ -328,6 +257,77 @@ msgstr "Versió"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Racó dels nous membres"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Primera passa"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Segona passa"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Tercera passa"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Quarta passa"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Cinquena passa"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Sisena passa"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Setena passa"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Llista de tasques del sol·licitant"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "igual que l'anterior"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
#~ msgid "p<get-var page />"
#~ msgstr "p<get-var page />"
diff --git a/catalan/po/partners.ca.po b/catalan/po/partners.ca.po
index 869d4463585..ebe16f8097a 100644
--- a/catalan/po/partners.ca.po
+++ b/catalan/po/partners.ca.po
@@ -85,7 +85,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
diff --git a/catalan/po/ports.ca.po b/catalan/po/ports.ca.po
index 6608d2d523c..e35df579394 100644
--- a/catalan/po/ports.ca.po
+++ b/catalan/po/ports.ca.po
@@ -14,22 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian per a Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian per a PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "CD de Hurd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian per a IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Contacte"
@@ -94,6 +78,22 @@ msgstr "Subministrament"
msgid "Systems"
msgstr "Sistemes"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian per a Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian per a PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "CD de Hurd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian per a IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD per a i386"
diff --git a/catalan/po/security.ca.po b/catalan/po/security.ca.po
index af06e971a7f..f78b57fae46 100644
--- a/catalan/po/security.ca.po
+++ b/catalan/po/security.ca.po
@@ -14,42 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Seguretat de Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Avisos de seguretat de Debian"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "P"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"avisos de seguretat <a href=\\\"undated/\\\">sense data</a>, inclosos per a "
-"la posteritat"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Diccionari CVE de Mitre"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Base de dades Bugtraq de Securityfocus"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Avisos del CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Notes de les vulnerabilitats del US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Font:"
@@ -133,3 +97,39 @@ msgid "No other external database security references currently available."
msgstr ""
"Actualment no hi ha referències disponibles a altres bases de dades de "
"seguretat. "
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "P"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Seguretat de Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Avisos de seguretat de Debian"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Diccionari CVE de Mitre"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Base de dades Bugtraq de Securityfocus"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Avisos del CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Notes de les vulnerabilitats del US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"avisos de seguretat <a href=\\\"undated/\\\">sense data</a>, inclosos per a "
+"la posteritat"
diff --git a/catalan/po/stats.ca.po b/catalan/po/stats.ca.po
index 06efe1b362a..e6dd2f469e6 100644
--- a/catalan/po/stats.ca.po
+++ b/catalan/po/stats.ca.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Estadístiques de traducció del lloc web de Debian"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Hi ha %d pàgines a traduir."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Hi ha %d bytes a traduir."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Hi ha %d cadenes a traduir."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "La versió de la traducció no és valida"
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr "L'original ja no existeix"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr "Creat amb <transstatslink>"
msgid "Translation summary for"
msgstr "Resum de traducció per a"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "No s'ha traduït"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Antiga"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Traduïda"
@@ -82,6 +57,15 @@ msgstr "Traduïda"
msgid "Up to date"
msgstr "Al dia"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Antiga"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "No s'ha traduït"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr "Pàgines web traduïdes (per mida)"
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr "Pàgines web traduïdes (per mida de pàgina)"
+
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Estadístiques de traducció del lloc web de Debian"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Hi ha %d pàgines a traduir."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Hi ha %d bytes a traduir."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Hi ha %d cadenes a traduir."
diff --git a/catalan/po/templates.ca.po b/catalan/po/templates.ca.po
index 4e5fedbc45b..f142a9c040e 100644
--- a/catalan/po/templates.ca.po
+++ b/catalan/po/templates.ca.po
@@ -14,14 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Lloc web de Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Cercar el lloc web de Debian."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -267,6 +259,14 @@ msgstr ""
"Com configurar <a href=m4_HOME/intro/cn>l'idioma per defecte als documents</"
"a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian internacionalment"
@@ -546,6 +546,14 @@ 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>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Lloc web de Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Cercar el lloc web de Debian."
+
#~ msgid "More information"
#~ msgstr "Més informació"
diff --git a/catalan/po/vote.ca.po b/catalan/po/vote.ca.po
index 38572d4b842..5f9d9cc270e 100644
--- a/catalan/po/vote.ca.po
+++ b/catalan/po/vote.ca.po
@@ -71,201 +71,231 @@ msgid "Proposal F Proposer"
msgstr "Proponent de la proposta F"
#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Proponent de la proposta A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Proponent de la proposta A"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Els que secunden"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Els que secunden la proposta A"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Els que secunden la proposta B"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Els que secunden la proposta C"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Els que secunden la proposta D"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Els que secunden la proposta E"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Els que secunden la proposta F"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Els que secunden la proposta A"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Els que secunden la proposta A"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Oposició"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Text"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Proposta A"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Proposta B"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Proposta C"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Proposta D"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Proposta E"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Proposta F"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Proposta A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Proposta A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Opcions"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Proponent de l'esmena"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Els que secunden l'esmena"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Text de l'esmena"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Proponent de l'esmena A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Els que secunden l'esmena A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Text de l'esmena A"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Proponent de l'esmena B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Els que secunden l'esmena B"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Text de l'esmena B"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "Proponent de l'esmena C"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "Els que secunden l'esmena C"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "Text de l'esmena C"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Esmenes"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Actes"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Requeriments de majoria"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Dades i estadístiques"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Quòrum"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Discussió mínima"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Butlleta"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Fòrum"
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Resultat"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "En&nbsp;espera&nbsp;de&nbsp;patrocinadors"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "En&nbsp;discussió"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Votació&nbsp;en&nbsp;curs"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Decidida"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Retirada"
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Altres"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Pàgina&nbsp;principal&nbsp;de&nbsp;votacions"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Com"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Enviar&nbsp;proposta"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Esmenar&nbsp;una&nbsp;proposta"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Donar&nbsp;suport&nbsp;a&nbsp;una&nbsp;proposta"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Llegir un resultat"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Votar"
diff --git a/chinese/po/cdimage.zh.po b/chinese/po/cdimage.zh.po
index aca30da189b..d67ec50ec96 100644
--- a/chinese/po/cdimage.zh.po
+++ b/chinese/po/cdimage.zh.po
@@ -14,20 +14,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Gtranslator 2.91.7\n"
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../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:87
-msgid "ISO images"
-msgstr "ISO 映像"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo 文件"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -122,3 +108,17 @@ msgid ""
"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
"a> for CDs/DVDs:"
msgstr "CD/DVD <a href=\"/MailingLists/disclaimer\">公開郵件列表</a>(英文):"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO 映像"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo 文件"
diff --git a/chinese/po/consultants.zh.po b/chinese/po/consultants.zh.po
index 5848cd55c99..743a591a00e 100644
--- a/chinese/po/consultants.zh.po
+++ b/chinese/po/consultants.zh.po
@@ -14,6 +14,14 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Gtranslator 2.91.7\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 "返回 <a href=\"./\">Debian 顾问页面</a>。"
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "姓名:"
@@ -69,11 +77,3 @@ msgid ""
msgstr ""
"以下的名單中共有來自世界 <total_country> 個國家的 <total_consultant> 個 "
"Debian 顧問。"
-
-#: ../../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 "返回 <a href=\"./\">Debian 顾问页面</a>。"
diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index 203f2a5ea9d..ce5acc3f81f 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -224,210 +224,215 @@ msgid "Kenya"
msgstr "[CN:肯尼亚:][HK:肯雅:][TW:肯亞:]"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "[CN:哈萨克斯坦:][HKTW:哈薩克:]"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "韓國"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "科威特"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "[CN:哈萨克斯坦:][HKTW:哈薩克:]"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "斯里蘭卡"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "立陶宛"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "盧森堡"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "拉脫維亞"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "摩洛哥"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "摩爾多瓦"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "[CNHK:黑山:][TW:蒙特內哥羅:]"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "马达加斯加"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "馬其頓共和國"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "蒙古"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "[CN:马耳他:][HKTW:馬爾他:]"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "墨西哥"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "馬來西亞"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "新喀里多尼亞"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "尼加拉瓜"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "荷蘭"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "挪威"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "新西蘭"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "巴拿馬"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "秘魯"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "[CNHK:法属波利尼西亚:][TW:法屬玻里尼西亞:]"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "菲律賓"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "巴基斯坦"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "波蘭"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "葡萄牙"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "留尼旺"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "羅馬尼亞"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "塞爾維亞"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "俄罗斯"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "[CNHK:沙特阿拉伯:][TW:沙烏地阿拉伯:]"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "瑞典"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "新加坡"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "斯洛文尼亞"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "斯洛伐克"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "薩爾瓦多"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "泰國"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "[CN:塔吉克斯坦:][HKTW:塔吉克:]"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "[CN:突尼斯:][HKTW:突尼西亞:]"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "土耳其"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "台灣"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "烏克蘭"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "美國"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "烏拉圭"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "[CN:乌兹别克斯坦:][HKTW:烏茲別克:]"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "委內瑞拉"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "越南"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "[CNHK:瓦努阿图:][TW:萬那杜:]"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "南非"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "津巴布韦"
diff --git a/chinese/po/distrib.zh.po b/chinese/po/distrib.zh.po
index e92af7ec20a..fa7fcb6df63 100644
--- a/chinese/po/distrib.zh.po
+++ b/chinese/po/distrib.zh.po
@@ -15,97 +15,67 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 2.2.1\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "關鍵字"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "顯示"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "僅搜尋"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "路徑結尾是關鍵字"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "套件名稱"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "套件包含檔案"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "套件描述"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "套件檔案中包含關鍵字"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "源套件名稱"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "僅顯示完全吻合結果"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "發行版"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "硬體架構"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "any"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "搜尋"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-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"
-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:21
-msgid "Only show exact matches"
-msgstr "僅顯示完全吻合結果"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Section"
@@ -122,6 +92,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "搜尋"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "重設"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "顯示"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "路徑結尾是關鍵字"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "套件包含檔案"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "套件檔案中包含關鍵字"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "硬體架構"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
diff --git a/chinese/po/doc.zh.po b/chinese/po/doc.zh.po
index 87491f1d25b..72668668286 100644
--- a/chinese/po/doc.zh.po
+++ b/chinese/po/doc.zh.po
@@ -15,96 +15,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0\n"
"X-Generator: Gtranslator 3.30.1\n"
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-" Debian 9 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:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-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:83
-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:105
-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:125
-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:146
-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 8) 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:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "作者:"
@@ -220,6 +130,96 @@ msgstr "Debian 套件"
msgid "Debian package (archived)"
msgstr "Debian 套件(已归档)"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/chinese/po/newsevents.zh.po b/chinese/po/newsevents.zh.po
index 32afa915e5b..5cdfe921368 100644
--- a/chinese/po/newsevents.zh.po
+++ b/chinese/po/newsevents.zh.po
@@ -15,66 +15,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 2.2.1\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Debian 新闻"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "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 "Debian 社区通讯"
-
-#: ../../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 "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 "摘要"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "即将到来的事件"
@@ -133,6 +73,127 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (連結失效)"
+#: ../../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 ""
+"要以電子郵件方式接收快訊,請<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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "您亦可翻閱<a href=\"../../\">過往的報導</a>。"
+
+#. 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 計劃快訊 (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\" />Debian 計劃快訊 (Debian Project News) 由 <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\" />這次 Debian 計劃快訊 (Debian Weekly 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\" />這次 Debian 計劃快訊 (Debian Weekly News) 由 <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\" />由 %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\" />由 %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\" />由 %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\" />由 %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 ""
+"想以電子郵件方式接收快訊嗎?請<a href=\"https://lists.debian.org/debian-news/"
+"\">訂閱</a> debian-news 郵件列表。"
+
+#. 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 每周快訊 (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\" />Debian 每周快訊 (Debian Weekly News) 由 <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\" />Debian 每周快訊 (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\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
+"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -336,126 +397,65 @@ msgid ""
"the following topics:"
msgstr ""
-#: ../../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 ""
-"要以電子郵件方式接收快訊,請<a href=\"https://lists.debian.org/debian-news/"
-"\">訂閱 debian-news 郵件列表</a>。"
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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=\"../../\">過往的報導</a>。"
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+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>."
-msgstr ""
-"<void id=\"singular\" />Debian 計劃快訊 (Debian Project News) 由 <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+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>."
-msgstr ""
-"<void id=\"plural\" />Debian 計劃快訊 (Debian Project News) 由 <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+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>."
-msgstr ""
-"<void id=\"singular\" />這次 Debian 計劃快訊 (Debian Weekly News) 由 <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+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>."
-msgstr ""
-"<void id=\"plural\" />這次 Debian 計劃快訊 (Debian Weekly News) 由 <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> 負責編輯。"
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "事件:"
-#. 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\" />由 %s 負責翻譯。"
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "幻灯片:"
-#. 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\" />由 %s 負責翻譯。"
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "源代码"
-#. 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\" />由 %s 負責翻譯。"
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />由 %s 負責翻譯。"
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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 ""
-"想以電子郵件方式接收快訊嗎?請<a href=\"https://lists.debian.org/debian-news/"
-"\">訂閱</a> debian-news 郵件列表。"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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 每周快訊 (Debian Weekly News) 由 <a href="
-"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+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>."
-msgstr ""
-"<void id=\"plural\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
-"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "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\" />Debian 每周快訊 (Debian Weekly News) 由 <a href="
-"\"mailto:dwn@debian.org\">%s</a> 負責編輯。"
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "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\" />Debian 每周快訊 (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 "Debian 社区通讯"
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/chinese/po/organization.zh.po b/chinese/po/organization.zh.po
index bc82dde10b7..c4e16774a7f 100644
--- a/chinese/po/organization.zh.po
+++ b/chinese/po/organization.zh.po
@@ -45,13 +45,13 @@ msgid "manager"
msgstr "管理員"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr ""
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "稳定版釋出管理员"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr ""
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "巫師"
@@ -78,27 +78,27 @@ msgid "role"
msgstr ""
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "總管"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "發行版"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr "数据保护团队"
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "宣传团队"
@@ -112,136 +112,131 @@ msgstr ""
msgid "Support and Infrastructure"
msgstr "支援以及下級組織"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "領袖"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "技術委員會"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "秘書"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "各項開發計劃"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP 庫存"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "FTP 總管"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "FTP 助理"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "釋出管理"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "釋出團隊"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "品質管理"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "安裝系統小組"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "釋出公告"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "光碟映像"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "產品"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "測試"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr "云服务团队"
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "自动构建架构"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Wanna-build 团队"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Buildd 管理"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "文档"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "需要幫助的套件清單"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "移植"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "特別[CN:配置:][HKTW:組態設定:]"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "筆記型電腦"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "防火牆"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "嵌入式系統"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "網頁"
@@ -405,44 +400,37 @@ msgstr "套件追蹤系統"
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Salsa 管理员"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "給 1 到 99 歲小孩使用的 Debian"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "給 1 到 99 歲小孩使用的 Debian"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "給醫藥界使用的 Debian"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "給醫藥界使用的 Debian"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "給教育界使用的 Debian"
+#~ msgid "Debian for education"
+#~ msgstr "給教育界使用的 Debian"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "給法律界使用的 Debian"
+#~ msgid "Debian in legal offices"
+#~ msgstr "給法律界使用的 Debian"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "給殘障人士使用的 Debian"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "給殘障人士使用的 Debian"
-#: ../../english/intro/organization.data:520
#, fuzzy
-#| msgid "Debian for medical practice and research"
-msgid "Debian for science and related research"
-msgstr "給醫藥界使用的 Debian"
+#~| msgid "Debian for medical practice and research"
+#~ msgid "Debian for science and related research"
+#~ msgstr "給醫藥界使用的 Debian"
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr "給天文界使用的 Debian"
+#~ msgid "Debian for astronomy"
+#~ msgstr "給天文界使用的 Debian"
#~ msgid "Alioth administrators"
#~ msgstr "Alioth 管理"
diff --git a/chinese/po/others.zh.po b/chinese/po/others.zh.po
index b8bbec2201c..8c446922ac4 100644
--- a/chinese/po/others.zh.po
+++ b/chinese/po/others.zh.po
@@ -60,42 +60,6 @@ msgstr "<void id=\"d-i\" />未知"
msgid "Unavailable"
msgstr "未提供"
-#: ../../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> "
@@ -131,6 +95,34 @@ msgstr "傳真"
msgid "Address"
msgstr "地址"
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "包含&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "不包含&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "精簡 PostScript"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Powered by Debian]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Powered by Debian GNU/Linux]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Debian powered]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (mini button)"
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "產品"
@@ -219,69 +211,6 @@ msgstr "向 Debian 捐献"
msgid "Money is used to organize local free software events"
msgstr "财物将被用来组织本地的自由软件活动"
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "包含&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "不包含&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "精簡 PostScript"
-
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Powered by Debian]"
-
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Powered by Debian GNU/Linux]"
-
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Debian powered]"
-
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (mini button)"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "同上"
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "您使用 Debian 多长时间了?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "您是否为 Debian 开发者?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "您参与了 Debian 中的那些方面?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "您为什么对在 Debian 中工作产生了兴趣?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr "您是否有鼓励女性更多参与到 Debian 中的建议?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr "您是否认识其它位于技术团体中的女性?您能否给出名称?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "关于您的更多信息..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "合格"
@@ -326,6 +255,77 @@ msgstr "版本"
msgid "URL"
msgstr "網址"
+#: ../../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/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "同上"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "您使用 Debian 多长时间了?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "您是否为 Debian 开发者?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "您参与了 Debian 中的那些方面?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "您为什么对在 Debian 中工作产生了兴趣?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr "您是否有鼓励女性更多参与到 Debian 中的建议?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr "您是否认识其它位于技术团体中的女性?您能否给出名称?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "关于您的更多信息..."
+
#~ msgid "Name:"
#~ msgstr "姓名:"
diff --git a/chinese/po/partners.zh.po b/chinese/po/partners.zh.po
index db8c9e99938..644cd23a422 100644
--- a/chinese/po/partners.zh.po
+++ b/chinese/po/partners.zh.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
diff --git a/chinese/po/ports.zh.po b/chinese/po/ports.zh.po
index fe9b8fa4e03..acea6eb22c1 100644
--- a/chinese/po/ports.zh.po
+++ b/chinese/po/ports.zh.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.3\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "給 Alpha 用的 Debian"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "給 PA-RISC 用的 Debian"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd 光碟"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "給 IA-64 用的 Debian"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "聯絡方式"
@@ -92,6 +76,22 @@ msgstr "支援"
msgid "Systems"
msgstr "系統"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "給 Alpha 用的 Debian"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "給 PA-RISC 用的 Debian"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd 光碟"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "給 IA-64 用的 Debian"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "給 i386 用的 Debian GNU/NetBSD"
diff --git a/chinese/po/security.zh.po b/chinese/po/security.zh.po
index 41380b45aec..51e9ab76e4c 100644
--- a/chinese/po/security.zh.po
+++ b/chinese/po/security.zh.po
@@ -12,40 +12,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.9\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Debian 安全"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "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 "非常舊的、<a href=\\\"undated/\\\">沒有日期记载的</a>安全警"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre CVE dictionary"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus Bugtraq database"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT Advisories"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT vulnerabilities Notes"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "來源:"
@@ -127,3 +93,37 @@ msgstr "CERT 的弱點報告:"
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr "目前沒有其他安全分析資料庫可以參考。"
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Q"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Debian 安全"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Debian 安全報告"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitre CVE dictionary"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus Bugtraq database"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT Advisories"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT vulnerabilities Notes"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr "非常舊的、<a href=\\\"undated/\\\">沒有日期记载的</a>安全警"
diff --git a/chinese/po/stats.zh.po b/chinese/po/stats.zh.po
index 7f78ef4a261..f26ee17c93d 100644
--- a/chinese/po/stats.zh.po
+++ b/chinese/po/stats.zh.po
@@ -11,22 +11,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.1\n"
-#: ../../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 [CN:字節:][HKTW:位元组:]需要翻譯。"
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "一共有 %d 個[CN:字符串:][HKTW:字串:]需要翻譯。"
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "譯文版本錯誤"
@@ -44,13 +28,13 @@ msgid "The original no longer exists"
msgstr "原文不再存在"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "命中计数 N/A"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "命中"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "命中计数 N/A"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "点击以获取 diffstat 数据"
@@ -63,15 +47,6 @@ msgstr "使用 <transstatslink> 创建"
msgid "Translation summary for"
msgstr "翻譯概要 for"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "未翻譯"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "過時"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "已翻譯"
@@ -81,6 +56,15 @@ msgstr "已翻譯"
msgid "Up to date"
msgstr "最新"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "過時"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "未翻譯"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -231,6 +215,22 @@ msgstr "已翻譯網頁(按[CN:文件:][HKTW:檔案:]大小)"
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 [CN:字節:][HKTW:位元组:]需要翻譯。"
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "一共有 %d 個[CN:字符串:][HKTW:字串:]需要翻譯。"
+
#~ msgid "Unified diff"
#~ msgstr "合并差异"
diff --git a/chinese/po/templates.zh.po b/chinese/po/templates.zh.po
index 137b37137f5..2db769a1e76 100644
--- a/chinese/po/templates.zh.po
+++ b/chinese/po/templates.zh.po
@@ -17,14 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0\n"
"X-Generator: Gtranslator 3.30.1\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Debian 网站"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "搜索 Debian 网站。"
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -265,6 +257,14 @@ msgstr "本頁其他語言版本如下"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "<a href=m4_HOME/intro/cn>如何設置[CN:默认:][HKTW:預設:]語言</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian 國際化"
@@ -539,6 +539,14 @@ msgstr "網址"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "返回<a href=\"./\">谁在使用 Debian?页面</a>。"
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Debian 网站"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "搜索 Debian 网站。"
+
#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
#~ msgstr "返回 <a href=\"./\">Debian consultants page</a>."
diff --git a/chinese/po/vote.zh.po b/chinese/po/vote.zh.po
index 75f8e885298..2a38d3ae741 100644
--- a/chinese/po/vote.zh.po
+++ b/chinese/po/vote.zh.po
@@ -69,201 +69,231 @@ msgid "Proposal F Proposer"
msgstr "提案 F 提名人"
#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "提案 A 提名人"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "提案 A 提名人"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "支持者"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "提案 A 支持者"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "提案 B 支持者"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "提案 C 支持者"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "提案 D 支持者"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "提案 E 支持者"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "提案 F 支持者"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "提案 A 支持者"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "提案 A 支持者"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "反對"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "內文"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "提案 A"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "提案 B"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "提案 C"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "提案 D"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "提案 E"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "提案 F"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "提案 A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "提案 A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "選擇"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "修正案提名人"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "修正案支持者"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "修正案內文"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "修正案 A 提名人"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "修正案 A 支持者"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "修正案 A 內文"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "修正案 B 提名人"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "修正案 B 支持者"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "修正案 B 內文"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "修正案 C 提名人"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "修正案 C 支持者"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "修正案 C 內文"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "修正案"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "會議記錄"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "主要要求"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "資料與統計"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "最低人數"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "最少量討論"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "投票"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "討論區"
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "結果"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "有待贊助"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "討論中"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "接受投票中"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "已決定"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "撤銷"
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "其他"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "投票主頁"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "How&nbsp;To"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "提出議案"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "修正議案"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "跟隨議案的進展"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "查看結果"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "投票"
diff --git a/croatian/po/cdimage.hr.po b/croatian/po/cdimage.hr.po
index 63e461400ff..60238117c69 100644
--- a/croatian/po/cdimage.hr.po
+++ b/croatian/po/cdimage.hr.po
@@ -9,20 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -70,7 +56,6 @@ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync mirrori"
#: ../../english/template/debian/cdimage.wml:43
#, fuzzy
-#| msgid "<void id=\"dc_misc\" />Misc"
msgid "<void id=\"dc_verify\" />Verify"
msgstr "<void id=\"dc_misc\" />Razno"
@@ -121,3 +106,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Javna mailing lista</a> na engleskom "
"jeziku za CD-e/DVD-e:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/croatian/po/consultants.hr.po b/croatian/po/consultants.hr.po
index 39810bc98a9..d2c7a07edb0 100644
--- a/croatian/po/consultants.hr.po
+++ b/croatian/po/consultants.hr.po
@@ -9,6 +9,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Popis konzultanata"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Natrag na stranicu <a href=\"./\">Debian konzultanti</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Ime:"
@@ -70,11 +78,3 @@ msgstr ""
"<total_country> \" . ((<total_country> % 10 == 0 or <total_country> % 10 > 4 "
"or (<total_country> > 10 and <total_country> < 20)) ? \"zemalja\" : \"zemlje"
"\") . \" širom svijeta.\" . \"\\n\"; :>"
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Popis konzultanata"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Natrag na stranicu <a href=\"./\">Debian konzultanti</a>."
diff --git a/croatian/po/countries.hr.po b/croatian/po/countries.hr.po
index 39120d8936d..5a1368656c5 100644
--- a/croatian/po/countries.hr.po
+++ b/croatian/po/countries.hr.po
@@ -218,210 +218,215 @@ msgid "Kenya"
msgstr "Kenija"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazahstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Koreja"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuvajt"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazahstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Šri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Litva"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luksemburg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Latvija"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Maroko"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr ""
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Crna Gora"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Makedonija"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr ""
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Meksiko"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malezija"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Nova Kaledonija"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nikaragva"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Nizozemska"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norveška"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Novi Zeland"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Francuska Polinezija"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipini"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Poljska"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugal"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Rumunjska"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Srbija"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusija"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Saudijska Arabija"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Švedska"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapur"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovenija"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovačka"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Tajland"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tadžikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunis"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turska"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Tajvan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukrajina"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Sjedinjene Države"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Urugvaj"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venecuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vijetnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Južna Afrika"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabve"
diff --git a/croatian/po/date.hr.po b/croatian/po/date.hr.po
index 761c788a3e4..d50da07fb2c 100644
--- a/croatian/po/date.hr.po
+++ b/croatian/po/date.hr.po
@@ -193,7 +193,6 @@ msgstr "q{[%]d. [%]s}, $mday, $mon_str"
#. replace all % by [%]
#: ../../english/template/debian/ctime.wml:99
#, fuzzy
-#| msgid "q{[%]02d [%]s [%]d}, $mday, $mon_str, $year"
msgid "q{[%]s [%]s}, $mon_str, $year"
msgstr "q{[%]d. [%]s [%]d.}, $mday, $mon_str, $year"
diff --git a/croatian/po/distrib.hr.po b/croatian/po/distrib.hr.po
index eb7ebf539fb..1fcd832c017 100644
--- a/croatian/po/distrib.hr.po
+++ b/croatian/po/distrib.hr.po
@@ -9,97 +9,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Ključna riječ"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Prikaži"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Pretraživanje u"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "putanje koje završavaju ključnom riječi"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Imenima paketa"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "pakete koji sadrže datoteke s ovakvim imenom"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Opisima"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "pakete koji sadrže datoteke čija imena sadrže ključnu riječ"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Imenima izvornika paketa"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Prikaži samo precizne nalaze"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribucija"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Arhitektura"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "bilo koja"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Potraži"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Poništi"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Pretraživanje u"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Imenima paketa"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Opisima"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Imenima izvornika paketa"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Prikaži samo precizne nalaze"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Dio"
@@ -116,6 +86,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Potraži"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Poništi"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Prikaži"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "putanje koje završavaju ključnom riječi"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "pakete koji sadrže datoteke s ovakvim imenom"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "pakete koji sadrže datoteke čija imena sadrže ključnu riječ"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Arhitektura"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -142,13 +142,11 @@ msgstr ""
#: ../../english/releases/arches.data:14
#, fuzzy
-#| msgid "HP PA/RISC"
msgid "HP PA-RISC"
msgstr "HP PA/RISC"
#: ../../english/releases/arches.data:15
#, fuzzy
-#| msgid "Hurd (i386)"
msgid "Hurd 32-bit PC (i386)"
msgstr "Hurd (i386)"
@@ -158,7 +156,6 @@ msgstr ""
#: ../../english/releases/arches.data:17
#, fuzzy
-#| msgid "Intel IA-64"
msgid "Intel Itanium IA-64"
msgstr "Intel IA-64"
@@ -180,7 +177,6 @@ msgstr "MIPS (big endian)"
#: ../../english/releases/arches.data:22
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "MIPS (little endian)"
@@ -198,7 +194,6 @@ msgstr ""
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "MIPS (little endian)"
diff --git a/croatian/po/doc.hr.po b/croatian/po/doc.hr.po
index 80688d7d98e..4fda15a25ef 100644
--- a/croatian/po/doc.hr.po
+++ b/croatian/po/doc.hr.po
@@ -9,103 +9,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-" Debian 9 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:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-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:83
-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:105
-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:125
-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:146
-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 8) 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:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Autor:"
#: ../../english/doc/books.def:41
#, fuzzy
-#| msgid "Debian package"
msgid "Debian Release:"
msgstr "Debian paket"
@@ -209,10 +118,99 @@ msgstr "Debian paket"
#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
#, fuzzy
-#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Debian paket"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/croatian/po/newsevents.hr.po b/croatian/po/newsevents.hr.po
index 78040f5eb76..51b2c4475d2 100644
--- a/croatian/po/newsevents.hr.po
+++ b/croatian/po/newsevents.hr.po
@@ -9,68 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr ""
-
-#: ../../english/News/news.rdf.in:19
-#, fuzzy
-#| msgid "Latest News"
-msgid "Debian Latest News"
-msgstr "Najnovije vijesti"
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "str. <get-var page />"
-
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-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 "Nadolazeće atrakcije"
@@ -129,6 +67,130 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (mrtav link)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "<a href=\"../../\">Prijašnja izdanja</a> ovih vijesti su dostupna."
+
+#. 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 Project News uređuje <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 Project News uređuju <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\" />Ovo izdanje Debian Project News je uredio <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\" />Ovo izdanje Debian Project News su uredili <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\" />Preveo %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\" />Preveli %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\" />Prevela %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\" />Prevele %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 ""
+"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>"
+
+#. 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 uređuje <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 uređuju <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\" />Ovo izdanje Debian Weekly News je uredio <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\" />Ovo izdanje Debian Weekly News su uredili <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -310,133 +372,66 @@ msgid ""
"the following topics:"
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 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>"
-
-#: ../../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=\"../../\">Prijašnja izdanja</a> ovih vijesti su dostupna."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "str. <get-var page />"
-#. 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>."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
msgstr ""
-"<void id=\"singular\" />Debian Project News uređuje <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>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
msgstr ""
-"<void id=\"plural\" />Debian Project News uređuju <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>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
msgstr ""
-"<void id=\"singular\" />Ovo izdanje Debian Project News je uredio <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>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
msgstr ""
-"<void id=\"plural\" />Ovo izdanje Debian Project News su uredili <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\" />Preveo %s."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr ""
-#. 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\" />Preveli %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr ""
-#. 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\" />Prevela %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr ""
-#. 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\" />Prevele %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+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>."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
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>"
-#. 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>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
msgstr ""
-"<void id=\"singular\" />Debian Weekly News uređuje <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>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
msgstr ""
-"<void id=\"plural\" />Debian Weekly News uređuju <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>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
msgstr ""
-"<void id=\"singular\" />Ovo izdanje Debian Weekly News je uredio <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>."
+#: ../../english/News/news.rdf.in:19
+#, fuzzy
+msgid "Debian Latest News"
+msgstr "Najnovije vijesti"
+
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
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://"
diff --git a/croatian/po/organization.hr.po b/croatian/po/organization.hr.po
index 0410866009f..fced31e1b16 100644
--- a/croatian/po/organization.hr.po
+++ b/croatian/po/organization.hr.po
@@ -42,15 +42,14 @@ msgid "manager"
msgstr "upravitelj"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr ""
-
-#: ../../english/intro/organization.data:34
#, fuzzy
-#| msgid "Release Management"
msgid "Stable Release Manager"
msgstr "Nadgledanje izdanja"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr ""
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "čarobnjak"
@@ -58,7 +57,6 @@ msgstr "čarobnjak"
#. we only use the chair tag once, for techctte, I wonder why it's here.
#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "predsjedavatelj"
@@ -79,29 +77,28 @@ msgid "role"
msgstr ""
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Službenici"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribucija"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Publicitet"
@@ -115,142 +112,134 @@ msgstr ""
msgid "Support and Infrastructure"
msgstr "Podrška i infrastruktura"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Vođa"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Tehnički odbor"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Tajnik"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Razvojni projekti"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP arhive"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
#, fuzzy
-#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP Master"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "FTP Assistants"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Nadgledanje izdanja"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Tim za izdanja"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Osiguranje kvalitete"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Tim za instalacijski sustav"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Napomene izdanja"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD snimke"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Izrada"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testiranje"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr ""
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
#, fuzzy
-#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Podrška i infrastruktura"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
#, fuzzy
-#| msgid "Buildd Administration"
msgid "Buildd administration"
msgstr "Administracija buildda"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentacija"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Popis paketa koji zahtijevaju rad i paketi u prospektu"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Portovi"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Posebne konfiguracije"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Laptopi"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Firewalli"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "<i>Embedded</i> sustavi"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Kontakt za tisak"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "WWW stranice"
@@ -276,7 +265,6 @@ msgstr "Događaji"
#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Tehnički odbor"
@@ -342,7 +330,6 @@ msgstr "Administracija mailing lista i arhiva mailing lista"
#: ../../english/intro/organization.data:422
#, fuzzy
-#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Front-desk za nove održavatelje"
@@ -419,48 +406,40 @@ msgstr "Sustav praćenja paketa"
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Administratori Aliotha"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "Debian za djecu od 1 do 99"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian za djecu od 1 do 99"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "Debian za medicinsku praksu i istraživanje"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian za medicinsku praksu i istraživanje"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "Debian za obrazovanje"
+#~ msgid "Debian for education"
+#~ msgstr "Debian za obrazovanje"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "Debian u pravnim uredima"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian u pravnim uredima"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "Debian za ljude sa invaliditetom"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian za ljude sa invaliditetom"
-#: ../../english/intro/organization.data:520
#, fuzzy
-#| msgid "Debian for medical practice and research"
-msgid "Debian for science and related research"
-msgstr "Debian za medicinsku praksu i istraživanje"
+#~| msgid "Debian for medical practice and research"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian za medicinsku praksu i istraživanje"
-#: ../../english/intro/organization.data:523
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian za obrazovanje"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian za obrazovanje"
#~ msgid "Alioth administrators"
#~ msgstr "Administratori Aliotha"
diff --git a/croatian/po/others.hr.po b/croatian/po/others.hr.po
index 2d719269f0c..f2cb4f767a3 100644
--- a/croatian/po/others.hr.po
+++ b/croatian/po/others.hr.po
@@ -57,42 +57,6 @@ msgstr "<void id=\"d-i\" />Nepoznat"
msgid "Unavailable"
msgstr "Nedostupan"
-#: ../../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> "
@@ -106,7 +70,6 @@ msgstr ""
#: ../../english/devel/website/tc.data:15
#: ../../english/devel/website/tc.data:16
#, fuzzy
-#| msgid "Additional Information"
msgid "More information"
msgstr "Dodatne informacije"
@@ -120,22 +83,47 @@ msgstr ""
#: ../../english/distrib/pre-installed.defs:18
#, fuzzy
-#| msgid "Phone:"
msgid "Phone"
msgstr "Telefon:"
#: ../../english/distrib/pre-installed.defs:19
#, fuzzy
-#| msgid "Fax:"
msgid "Fax"
msgstr "Telefaks:"
#: ../../english/distrib/pre-installed.defs:21
#, fuzzy
-#| msgid "Address:"
msgid "Address"
msgstr "Adresa:"
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "Uz&nbsp;tekst&nbsp;&#x201E;Debian&#x201D;"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "Bez&nbsp;teksta&nbsp;&#x201E;Debian&#x201D;"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "Encapsulated PostScript"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Powered by Debian]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Powered by Debian GNU/Linux]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Debian powered]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (malo dugme)"
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Proizvodi"
@@ -194,7 +182,6 @@ msgstr ""
#: ../../english/events/merchandise.def:53
#, fuzzy
-#| msgid "suitcases"
msgid "pillowcases"
msgstr "torbe"
@@ -226,69 +213,6 @@ msgstr ""
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "Uz&nbsp;tekst&nbsp;&#x201E;Debian&#x201D;"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "Bez&nbsp;teksta&nbsp;&#x201E;Debian&#x201D;"
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "Encapsulated PostScript"
-
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Powered by Debian]"
-
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Powered by Debian GNU/Linux]"
-
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Debian powered]"
-
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (malo dugme)"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "DA"
@@ -333,6 +257,77 @@ msgstr "Verzija"
msgid "URL"
msgstr "URL"
+#: ../../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/mirror/submit.inc:7
+msgid "same as the above"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
#~ msgid "p<get-var page />"
#~ msgstr "str. <get-var page />"
diff --git a/croatian/po/partners.hr.po b/croatian/po/partners.hr.po
index db8c9e99938..644cd23a422 100644
--- a/croatian/po/partners.hr.po
+++ b/croatian/po/partners.hr.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
diff --git a/croatian/po/ports.hr.po b/croatian/po/ports.hr.po
index 85162de8aa6..d54baf36663 100644
--- a/croatian/po/ports.hr.po
+++ b/croatian/po/ports.hr.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian za Alphu"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian za PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd CDi"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian za IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Kontakt"
@@ -89,6 +73,22 @@ msgstr "Nabava"
msgid "Systems"
msgstr "Sustavi"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian za Alphu"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian za PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd CDi"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian za IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD za i386"
diff --git a/croatian/po/security.hr.po b/croatian/po/security.hr.po
index 93935503676..c9cf45ac6c3 100644
--- a/croatian/po/security.hr.po
+++ b/croatian/po/security.hr.po
@@ -9,42 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Debian Sigurnost"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Debian sigurnosni naputci"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "P"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"<a href=\\\"undated/\\\">nedatirani</a> sigurnosni naputci, ostavljeni "
-"potomstvu"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre CVE rječnik"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus Bugtraq baza podataka"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT naputci"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT ranjivosti bilješke"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Izvorni kôd:"
@@ -127,3 +91,39 @@ msgstr "CERT-ove ranjivosti, naputci i zapisi o incidentima:"
msgid "No other external database security references currently available."
msgstr ""
"Druge reference na vanjske baze podataka o sigurnosti trenutno nisu dostupne."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "P"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Debian Sigurnost"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Debian sigurnosni naputci"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitre CVE rječnik"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus Bugtraq baza podataka"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT naputci"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT ranjivosti bilješke"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"<a href=\\\"undated/\\\">nedatirani</a> sigurnosni naputci, ostavljeni "
+"potomstvu"
diff --git a/croatian/po/stats.hr.po b/croatian/po/stats.hr.po
index e8ca844a13a..4d1f953845a 100644
--- a/croatian/po/stats.hr.po
+++ b/croatian/po/stats.hr.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/croatian/po/templates.hr.po b/croatian/po/templates.hr.po
index 93cba952f00..3282f775c8b 100644
--- a/croatian/po/templates.hr.po
+++ b/croatian/po/templates.hr.po
@@ -9,20 +9,9 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-#, fuzzy
-#| msgid "Debian Project"
-msgid "Debian website"
-msgstr "Debian Projekt"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian"
msgstr "Pomozite Debianu"
@@ -44,10 +33,6 @@ msgstr "Debian Projekt"
#: ../../english/template/debian/common_translation.wml:13
#, fuzzy
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -88,7 +73,6 @@ msgstr "Kontaktirajte nas"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Informacije o izdanjima"
@@ -164,13 +148,11 @@ msgstr "Nabavka Debiana"
#: ../../english/template/debian/common_translation.wml:91
#, fuzzy
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "Knjige o Debianu"
#: ../../english/template/debian/common_translation.wml:94
#, fuzzy
-#| msgid "Last Modified"
msgid "Last Updated"
msgstr "Zadnji put promijenjeno"
@@ -221,11 +203,6 @@ msgstr "u verziji 2.2"
#. your language.
#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -278,6 +255,14 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
"Kako postaviti <a href=m4_HOME/intro/cn>predodređeni jezik dokumenata</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian međunarodno"
@@ -324,7 +309,6 @@ msgstr "Knjige o Debianu"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian Wiki"
msgstr "Pomozite Debianu"
@@ -358,7 +342,6 @@ msgstr "Baza podataka o razvijateljima"
#: ../../english/template/debian/links.tags.wml:64
#, fuzzy
-#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Knjige o Debianu"
@@ -468,7 +451,6 @@ msgstr "Pregled paketa Debian razvijatelja"
#: ../../english/template/debian/navbar.wml:10
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "Debian Projekt"
@@ -560,6 +542,15 @@ 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>."
+#: ../../english/search.xml.in:7
+#, fuzzy
+msgid "Debian website"
+msgstr "Debian Projekt"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
#~ msgid "List of Consultants"
#~ msgstr "Popis konzultanata"
diff --git a/croatian/po/vendors.hr.po b/croatian/po/vendors.hr.po
index 60ae808f1b4..e7cd8cfa65f 100644
--- a/croatian/po/vendors.hr.po
+++ b/croatian/po/vendors.hr.po
@@ -19,7 +19,6 @@ msgstr "Omogućava priloge (donacije):"
#: ../../english/CD/vendors/vendors.CD.def:16
#, fuzzy
-#| msgid "CD/DVD"
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD"
diff --git a/croatian/po/vote.hr.po b/croatian/po/vote.hr.po
index 8894080c299..0a07a348946 100644
--- a/croatian/po/vote.hr.po
+++ b/croatian/po/vote.hr.po
@@ -27,7 +27,6 @@ msgstr "Nominacije"
#: ../../english/template/debian/votebar.wml:25
#, fuzzy
-#| msgid "Withdrawn"
msgid "Withdrawals"
msgstr "Povučeno"
@@ -68,207 +67,234 @@ msgid "Proposal F Proposer"
msgstr "Predlagač prijedloga F"
#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Predlagač prijedloga A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Predlagač prijedloga A"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Podržavaju"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Prijedlog A podržavaju"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Prijedlog B podržavaju"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Prijedlog C podržavaju"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Prijedlog D podržavaju"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Prijedlog E podržavaju"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Prijedlog F podržavaju"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Prijedlog A podržavaju"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Prijedlog A podržavaju"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Protivljenje"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Tekst"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Prijedlog A"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Prijedlog B"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Prijedlog C"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Prijedlog D"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Prijedlog E"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Prijedlog F"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Prijedlog A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Prijedlog A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Izbor"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Predlagač amandmana"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Amandman podržavaju"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Tekst amandmana"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Amandman A predlaže"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Amandman A podržavaju"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Tekst amandmana A"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Amandman B predlaže"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Amandman B podržavaju"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Tekst amandmana B"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
#, fuzzy
-#| msgid "Amendment Proposer A"
msgid "Amendment Proposer C"
msgstr "Amandman A predlaže"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
#, fuzzy
-#| msgid "Amendment Seconds A"
msgid "Amendment Seconds C"
msgstr "Amandman A podržavaju"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
#, fuzzy
-#| msgid "Amendment Text A"
msgid "Amendment Text C"
msgstr "Tekst amandmana A"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Amandmani"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Postupak"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Zahtjevi za većinu"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Podaci i statistike"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Kvorum"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Minimalna rasprava"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Glasački list"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Rezultat"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Čeka&nbsp;na&nbsp;pokrovitelje"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "U&nbsp;raspravi"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Glasovanje&nbsp;otvoreno"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Odlučeno"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Povučeno"
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Ostalo"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Početna&nbsp;stranica&nbsp;glasovanja"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Kako"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Predati&nbsp;prijedlog"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Ispraviti&nbsp;prijedlog"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Slijediti&nbsp;prijedlog"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Pročitati&nbsp;rezultat"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Glasovati"
diff --git a/czech/po/cdimage.cs.po b/czech/po/cdimage.cs.po
index 61ab517088b..c02db22db3c 100644
--- a/czech/po/cdimage.cs.po
+++ b/czech/po/cdimage.cs.po
@@ -16,20 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Fingerprint klíèe"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -77,7 +63,6 @@ msgstr "<void id=\"dc_rsyncmirrors\" />Zrcadla Rsync"
#: ../../english/template/debian/cdimage.wml:43
#, fuzzy
-#| msgid "<void id=\"dc_misc\" />Misc"
msgid "<void id=\"dc_verify\" />Verify"
msgstr "<void id=\"dc_misc\" />Ostatní"
@@ -128,3 +113,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">veřejná konference</a> v angličtině "
"věnující se CD a DVD:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/czech/po/consultants.cs.po b/czech/po/consultants.cs.po
index 8d5168b3a42..382ca43e732 100644
--- a/czech/po/consultants.cs.po
+++ b/czech/po/consultants.cs.po
@@ -15,6 +15,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Seznam konzultantů"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Zpět na stránku <a href=\"./\">konzultanti Debianu</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Jméno:"
@@ -70,11 +78,3 @@ msgid ""
msgstr ""
"<total_consultant> konzultantů Debianu v <total_country> zemích po celém "
"světě."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Seznam konzultantů"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Zpět na stránku <a href=\"./\">konzultanti Debianu</a>."
diff --git a/czech/po/countries.cs.po b/czech/po/countries.cs.po
index aa6c223a3eb..0d77084769e 100644
--- a/czech/po/countries.cs.po
+++ b/czech/po/countries.cs.po
@@ -223,210 +223,215 @@ msgid "Kenya"
msgstr "Keňa"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazachstán"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Korea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuvajt"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazachstán"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Srí Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Litva"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Lucembursko"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Lotyšsko"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Maroko"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldavsko"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Černá Hora"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Makedonie, republika"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongolsko"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mexiko"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malajsie"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Nová Kaledonie"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nikaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Nizozemí"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norsko"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Nový Zéland"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Francouzská Polynésie"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipíny"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pákistán"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polsko"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugalsko"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Rumunsko"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Srbsko"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusko"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Saudská Arábie"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Švédsko"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapur"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovinsko"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovensko"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Thajsko"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tádžikistán"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunisko"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turecko"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Tchai-wan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukrajina"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Spojené státy"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Uzbekistán"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Jižní Afrika"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/czech/po/date.cs.po b/czech/po/date.cs.po
index 16165f6c9be..6e4cfaad3aa 100644
--- a/czech/po/date.cs.po
+++ b/czech/po/date.cs.po
@@ -198,7 +198,6 @@ msgstr "q{[%]d. [%]s}, $mday, $mon_str"
#. replace all % by [%]
#: ../../english/template/debian/ctime.wml:99
#, fuzzy
-#| msgid "q{[%]02d [%]s [%]d}, $mday, $mon_str, $year"
msgid "q{[%]s [%]s}, $mon_str, $year"
msgstr "q{[%]02d. [%]s [%]d}, $mday, $mon_str, $year"
diff --git a/czech/po/distrib.cs.po b/czech/po/distrib.cs.po
index 9ca93024d69..b3e34d72d8d 100644
--- a/czech/po/distrib.cs.po
+++ b/czech/po/distrib.cs.po
@@ -14,97 +14,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Klíčové slovo"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Zobrazit"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Vyhledat"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "cesty končící klíčovým slovem"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Pouze v názvech balíčků"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "balíčky s takto nazvanými soubory"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "V popisech"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "balíčky se soubory jejichž názvy obsahuje klíčové slovo"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "V názvech zdrojových balíčků"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Zobrazit pouze při přesné shodě"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribuce"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Architektura"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "jakákoliv"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Hledat"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Vyprázdnit"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Vyhledat"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Pouze v názvech balíčků"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "V popisech"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "V názvech zdrojových balíčků"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Zobrazit pouze při přesné shodě"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Sekce"
@@ -121,6 +91,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Hledat"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Vyprázdnit"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Zobrazit"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "cesty končící klíčovým slovem"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "balíčky s takto nazvanými soubory"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "balíčky se soubory jejichž názvy obsahuje klíčové slovo"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Architektura"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -135,19 +135,16 @@ 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
#, fuzzy
-#| msgid "EABI ARM"
msgid "EABI ARM (armel)"
msgstr "ARM EABI"
#: ../../english/releases/arches.data:13
#, fuzzy
-#| msgid "Hard Float ABI ARM"
msgid "Hard Float ABI ARM (armhf)"
msgstr "ARM s hardwarovým FPU"
@@ -185,7 +182,6 @@ msgstr "MIPS (big endian)"
#: ../../english/releases/arches.data:22
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "MIPS (little endian)"
@@ -203,7 +199,6 @@ msgstr ""
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "MIPS (little endian)"
diff --git a/czech/po/doc.cs.po b/czech/po/doc.cs.po
index aa423381d7e..bb842c9d223 100644
--- a/czech/po/doc.cs.po
+++ b/czech/po/doc.cs.po
@@ -13,103 +13,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-" Debian 9 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:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-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:83
-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:105
-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:125
-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:146
-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 8) 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:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Autor:"
#: ../../english/doc/books.def:41
#, fuzzy
-#| msgid "Debian package"
msgid "Debian Release:"
msgstr "Balíček Debianu"
@@ -212,10 +121,99 @@ msgstr "Balíček Debianu"
#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
#, fuzzy
-#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Balíček Debianu"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/czech/po/newsevents.cs.po b/czech/po/newsevents.cs.po
index 4b036f7b21b..b8b816266a6 100644
--- a/czech/po/newsevents.cs.po
+++ b/czech/po/newsevents.cs.po
@@ -14,66 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Novinky Debianu"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Poslední novinky Debianu"
-
-#: ../../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 "Občasník pro komunitu okolo Debianu"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Název:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Jazyk:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Datum:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Událost:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Prezentace:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "zdroj"
-
-#: ../../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 ""
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Nadcházející akce"
@@ -132,6 +72,134 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (mrtvý odkaz)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"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>."
+
+#: ../../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 "Dostupná jsou i <a href=\"../../\">starší vydání</a> týdeníku."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+#, fuzzy
+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 týdeník vydává <a href=\"mailto:dwn@debian.org"
+"\">%s</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+#, fuzzy
+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 týdeník vydávají <a href=\"mailto:dwn@debian.org"
+"\">%s</a>."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:25
+#, 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\" />Toto vydání Debian týdeníku vydal <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:30
+#, 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\" />Toto vydání Debian týdeníku vydali <a href=\"mailto:"
+"dwn@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\" />Přeložil %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\" />Přeložili %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\" />Přeložila %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\" />Přeložily %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 ""
+"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>."
+
+#. 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 týdeník vydává <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 týdeník vydávají <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\" />Toto vydání Debian týdeníku vydal <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\" />Toto vydání Debian týdeníku vydali <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -315,149 +383,65 @@ msgid ""
"the following topics:"
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 in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
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>."
-#: ../../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 "Dostupná jsou i <a href=\"../../\">starší vydání</a> týdeníku."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Název:"
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
-#, 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 týdeník vydává <a href=\"mailto:dwn@debian.org"
-"\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Autor:"
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-#, 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 týdeník vydávají <a href=\"mailto:dwn@debian.org"
-"\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Jazyk:"
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:25
-#, 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\" />Toto vydání Debian týdeníku vydal <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Datum:"
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:30
-#, 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\" />Toto vydání Debian týdeníku vydali <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Událost:"
-#. 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\" />Přeložil %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Prezentace:"
-#. 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\" />Přeložili %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "zdroj"
-#. 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\" />Přeložila %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Přeložily %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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 ""
-"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>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
msgstr ""
-"<void id=\"singular\" />Debian týdeník vydává <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 týdeník vydávají <a href=\"mailto:dwn@debian.org"
-"\">%s</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Novinky Debianu"
-#. 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\" />Toto vydání Debian týdeníku vydal <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Poslední novinky Debianu"
-#. 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\" />Toto vydání Debian týdeníku vydali <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Občasník pro komunitu okolo Debianu"
#, fuzzy
#~| msgid ""
diff --git a/czech/po/organization.cs.po b/czech/po/organization.cs.po
index 09a470195e7..256139e33f1 100644
--- a/czech/po/organization.cs.po
+++ b/czech/po/organization.cs.po
@@ -42,11 +42,11 @@ msgid "manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "SRM"
+msgid "Stable Release Manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "Stable Release Manager"
+msgid "SRM"
msgstr ""
#: ../../english/intro/organization.data:36
@@ -75,27 +75,27 @@ msgid "role"
msgstr ""
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr ""
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr ""
@@ -109,136 +109,131 @@ msgstr ""
msgid "Support and Infrastructure"
msgstr ""
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr ""
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr ""
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr ""
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr ""
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr ""
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr ""
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr ""
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr ""
@@ -397,39 +392,11 @@ msgstr ""
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr ""
-
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr ""
-
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr ""
-
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr ""
-
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr ""
-
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr ""
-
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr ""
-
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr ""
diff --git a/czech/po/others.cs.po b/czech/po/others.cs.po
index 6ddd1641f21..44073c8dd24 100644
--- a/czech/po/others.cs.po
+++ b/czech/po/others.cs.po
@@ -57,42 +57,6 @@ msgstr ""
msgid "Unavailable"
msgstr ""
-#: ../../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> "
@@ -124,6 +88,34 @@ msgstr ""
msgid "Address"
msgstr ""
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr ""
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr ""
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr ""
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr ""
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr ""
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr ""
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr ""
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr ""
@@ -212,109 +204,117 @@ msgstr ""
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
+#: ../../english/y2k/l10n.data:6
+msgid "OK"
msgstr ""
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
+#: ../../english/y2k/l10n.data:9
+msgid "BAD"
msgstr ""
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
+#: ../../english/y2k/l10n.data:12
+msgid "OK?"
msgstr ""
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
+#: ../../english/y2k/l10n.data:15
+msgid "BAD?"
msgstr ""
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
+#: ../../english/y2k/l10n.data:18
+msgid "??"
msgstr ""
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
+#: ../../english/y2k/l10n.data:21
+msgid "Unknown"
msgstr ""
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
+#: ../../english/y2k/l10n.data:24
+msgid "ALL"
msgstr ""
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
+#: ../../english/y2k/l10n.data:27
+msgid "Package"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
+#: ../../english/y2k/l10n.data:30
+msgid "Status"
msgstr ""
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
+#: ../../english/y2k/l10n.data:33
+msgid "Version"
msgstr ""
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
+#: ../../english/y2k/l10n.data:36
+msgid "URL"
msgstr ""
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
msgstr ""
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
msgstr ""
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
msgstr ""
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
msgstr ""
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
msgstr ""
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
msgstr ""
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
msgstr ""
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
msgstr ""
-#: ../../english/y2k/l10n.data:18
-msgid "??"
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
msgstr ""
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
msgstr ""
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
msgstr ""
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
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"
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
msgstr ""
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
msgstr ""
diff --git a/czech/po/partners.cs.po b/czech/po/partners.cs.po
index db8c9e99938..644cd23a422 100644
--- a/czech/po/partners.cs.po
+++ b/czech/po/partners.cs.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
diff --git a/czech/po/ports.cs.po b/czech/po/ports.cs.po
index 6e846158663..cfdc627aaf3 100644
--- a/czech/po/ports.cs.po
+++ b/czech/po/ports.cs.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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 ""
@@ -89,6 +73,22 @@ msgstr ""
msgid "Systems"
msgstr ""
+#: ../../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/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr ""
diff --git a/czech/po/security.cs.po b/czech/po/security.cs.po
index 47b09ec1e4e..97091dd7469 100644
--- a/czech/po/security.cs.po
+++ b/czech/po/security.cs.po
@@ -12,40 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr ""
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr ""
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr ""
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr ""
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Zdroj:"
@@ -127,3 +93,37 @@ msgstr ""
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr ""
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr ""
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/czech/po/stats.cs.po b/czech/po/stats.cs.po
index fd083f1b1db..def18f7e4c0 100644
--- a/czech/po/stats.cs.po
+++ b/czech/po/stats.cs.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/czech/po/templates.cs.po b/czech/po/templates.cs.po
index b9306136070..49e67106c56 100644
--- a/czech/po/templates.cs.po
+++ b/czech/po/templates.cs.po
@@ -15,14 +15,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Stránky Debianu"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Hledá na webových stránkách Debianu."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -84,7 +76,6 @@ msgstr "Napište nám"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Informace k verzím"
@@ -164,7 +155,6 @@ msgstr "Debian Blog"
#: ../../english/template/debian/common_translation.wml:94
#, fuzzy
-#| msgid "Last Modified"
msgid "Last Updated"
msgstr "Poslední změna"
@@ -216,12 +206,6 @@ msgstr "ve vydání 2.2"
#. your language.
#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
-#| "using_cvs\">available</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -274,6 +258,14 @@ msgstr "Tato stránka je také dostupná v následujících jazycích:"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Jak nastavit <a href=m4_HOME/intro/cn>výchozí jazyk</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian a jazyky"
@@ -320,7 +312,6 @@ msgstr "Knihy o Debianu"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Debian"
msgid "Debian Wiki"
msgstr "Debian"
@@ -552,6 +543,14 @@ 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>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Stránky Debianu"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Hledá na webových stránkách Debianu."
+
#~ msgid "Rating:"
#~ msgstr "Hodnocení:"
diff --git a/czech/po/vote.cs.po b/czech/po/vote.cs.po
index f9afc9134b4..d985dfcabc9 100644
--- a/czech/po/vote.cs.po
+++ b/czech/po/vote.cs.po
@@ -71,201 +71,225 @@ msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Seconds"
+msgid "Proposal G Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal A Seconds"
+msgid "Proposal H Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal B Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal C Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal D Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Proposal E Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Proposal F Seconds"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Opposition"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Text"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal A"
+msgid "Proposal G Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal B"
+msgid "Proposal H Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal C"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal D"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Proposal E"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Proposal F"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Choices"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Proposer"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Seconds"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Text"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Proposer A"
+msgid "Proposal G"
msgstr ""
#: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Seconds A"
+msgid "Proposal H"
msgstr ""
#: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Text A"
+msgid "Choices"
msgstr ""
#: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Proposer B"
+msgid "Amendment Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:124
-msgid "Amendment Seconds B"
+msgid "Amendment Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:127
-msgid "Amendment Text B"
+msgid "Amendment Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:130
-msgid "Amendment Proposer C"
+msgid "Amendment Proposer A"
msgstr ""
#: ../../english/template/debian/votebar.wml:133
-msgid "Amendment Seconds C"
+msgid "Amendment Seconds A"
msgstr ""
#: ../../english/template/debian/votebar.wml:136
-msgid "Amendment Text C"
+msgid "Amendment Text A"
msgstr ""
#: ../../english/template/debian/votebar.wml:139
-msgid "Amendments"
+msgid "Amendment Proposer B"
msgstr ""
#: ../../english/template/debian/votebar.wml:142
-msgid "Proceedings"
+msgid "Amendment Seconds B"
msgstr ""
#: ../../english/template/debian/votebar.wml:145
-msgid "Majority Requirement"
+msgid "Amendment Text B"
msgstr ""
#: ../../english/template/debian/votebar.wml:148
-msgid "Data and Statistics"
+msgid "Amendment Proposer C"
msgstr ""
#: ../../english/template/debian/votebar.wml:151
-msgid "Quorum"
+msgid "Amendment Seconds C"
msgstr ""
#: ../../english/template/debian/votebar.wml:154
-msgid "Minimum Discussion"
+msgid "Amendment Text C"
msgstr ""
#: ../../english/template/debian/votebar.wml:157
-msgid "Ballot"
+msgid "Amendments"
msgstr ""
#: ../../english/template/debian/votebar.wml:160
-msgid "Forum"
+msgid "Proceedings"
msgstr ""
#: ../../english/template/debian/votebar.wml:163
+msgid "Majority Requirement"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:166
+msgid "Data and Statistics"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:169
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:172
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:175
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:178
+msgid "Forum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr ""
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr ""
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr ""
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr ""
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr ""
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr ""
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr ""
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr ""
diff --git a/danish/po/cdimage.da.po b/danish/po/cdimage.da.po
index 0e58bdaa343..8906dda3507 100644
--- a/danish/po/cdimage.da.po
+++ b/danish/po/cdimage.da.po
@@ -9,20 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Nøglefingeraftryk"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "ISO-aftryk"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo-filer"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -119,3 +105,17 @@ msgid ""
msgstr ""
"Engelsksproget <a href=\"/MailingLists/disclaimer\">offentlig postliste</a> "
"vedr. cd'er/dvd'er:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO-aftryk"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo-filer"
diff --git a/danish/po/consultants.da.po b/danish/po/consultants.da.po
index 6eba46c9caf..1021a4ae595 100644
--- a/danish/po/consultants.da.po
+++ b/danish/po/consultants.da.po
@@ -9,6 +9,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Konsulentliste"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Tilbage til <a href=\"./\">Debians konsulentside</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Navn:"
@@ -64,11 +72,3 @@ msgid ""
msgstr ""
"<total_consultant> Debian-konsulenter i <total_country> lande over hele "
"verden er vist ."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Konsulentliste"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Tilbage til <a href=\"./\">Debians konsulentside</a>."
diff --git a/danish/po/countries.da.po b/danish/po/countries.da.po
index ad50ad438fa..81fecb945c4 100644
--- a/danish/po/countries.da.po
+++ b/danish/po/countries.da.po
@@ -218,210 +218,215 @@ msgid "Kenya"
msgstr "Kenya"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazakhstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Korea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuwait"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazakhstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Litauen"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxembourg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Letland"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Marokko"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldova"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Montenegro"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Makedonien, Republikken"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongoliet"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mexico"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malaysia"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Ny Kaledonien"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Holland"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norge"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "New Zealand"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Fransk Polynesien"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filippinerne"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polen"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugal"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "Réunion"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Romænien"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Serbien"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusland"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Saudi-Arabien"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Sverige"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapore"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovenien"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovakiet"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "El Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Thailand"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tadsjikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunesien"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Tyrkiet"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taiwan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukraine"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "USA"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Usbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Sydafrika"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/danish/po/distrib.da.po b/danish/po/distrib.da.po
index 8f009c2b434..f2dbdd96004 100644
--- a/danish/po/distrib.da.po
+++ b/danish/po/distrib.da.po
@@ -9,97 +9,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Søgeord"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Vis"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Søg efter"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "stier der slutter på søgeordet"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Kun pakkenavne"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "pakker der indeholder filer med navne som dette"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Beskrivelser"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "pakker indeholdende filer hvis navne indeholder søgeordet"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Navne på kildekodepakker"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Vis kun ens forekomster"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribution"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "eksperimentel"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Arkitektur"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "alle"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Søg"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Nulstil"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Søg efter"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Kun pakkenavne"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Beskrivelser"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Navne på kildekodepakker"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Vis kun ens forekomster"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Sektion"
@@ -116,6 +86,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Søg"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Nulstil"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Vis"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "stier der slutter på søgeordet"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "pakker der indeholder filer med navne som dette"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "pakker indeholdende filer hvis navne indeholder søgeordet"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Arkitektur"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
diff --git a/danish/po/doc.da.po b/danish/po/doc.da.po
index cff5cfa4d10..c2ea4ac988e 100644
--- a/danish/po/doc.da.po
+++ b/danish/po/doc.da.po
@@ -9,6 +9,121 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Forfatter:"
+
+#: ../../english/doc/books.def:41
+msgid "Debian Release:"
+msgstr "Debian-udgave"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "e-mail:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Kan købes hos:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "Indeholder cd:"
+
+#: ../../english/doc/books.def:54
+msgid "Publisher:"
+msgstr "Forlag:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Forfattere:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Redaktører:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Vedligeholder:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Tilgængelighed:"
+
+#: ../../english/doc/manuals.defs:97
+msgid "Latest version:"
+msgstr "Seneste version:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(version <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "ren tekst"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"Den seneste <get-var srctype />-kildekode er tilgængelig fra <a href="
+"\"https://packages.debian.org/git\">Git</a>-arkivet."
+
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Webgrænseflade: "
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "VCS-grænseflade: "
+
+#: ../../english/doc/manuals.defs:177
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+"Den seneste <get-var srctype />-kildekode er tilgængelig fra <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a>-arkivet."
+
+#: ../../english/doc/manuals.defs:185
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a> repository."
+msgstr ""
+"Den seneste <get-var srctype />-kildekode er tilgængelig fra <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a>-arkivet."
+
+#: ../../english/doc/manuals.defs:203
+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 ""
+"Arbejdskopi af CVS-kildekode: sæt <code>CVSROOT</code>\n"
+" til <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+" og hent modulet <kbd>boot-floppies/documentation</kbd>."
+
+#: ../../english/doc/manuals.defs:208
+msgid "CVS via web"
+msgstr "CVS via web"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Debian-pakke"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Debian-pakke (arkiveret)"
+
#: ../../english/doc/books.data:32
msgid ""
"\n"
@@ -158,121 +273,6 @@ msgstr ""
" SSL-certifikater, UFW-firewall, MySQL Vulnerability, kommerciel\n"
" Symantec-antivirus, herunder indtrængningssporingssystemet Snort. "
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Forfatter:"
-
-#: ../../english/doc/books.def:41
-msgid "Debian Release:"
-msgstr "Debian-udgave"
-
-#: ../../english/doc/books.def:44
-msgid "email:"
-msgstr "e-mail:"
-
-#: ../../english/doc/books.def:48
-msgid "Available at:"
-msgstr "Kan købes hos:"
-
-#: ../../english/doc/books.def:51
-msgid "CD Included:"
-msgstr "Indeholder cd:"
-
-#: ../../english/doc/books.def:54
-msgid "Publisher:"
-msgstr "Forlag:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Forfattere:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Redaktører:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Vedligeholder:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Status:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Tilgængelighed:"
-
-#: ../../english/doc/manuals.defs:97
-msgid "Latest version:"
-msgstr "Seneste version:"
-
-#: ../../english/doc/manuals.defs:113
-msgid "(version <get-var version />)"
-msgstr "(version <get-var version />)"
-
-#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "ren tekst"
-
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:193
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"Den seneste <get-var srctype />-kildekode er tilgængelig fra <a href="
-"\"https://packages.debian.org/git\">Git</a>-arkivet."
-
-#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
-#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
-#: ../../english/doc/manuals.defs:195
-msgid "Web interface: "
-msgstr "Webgrænseflade: "
-
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
-#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
-#: ../../english/doc/manuals.defs:196
-msgid "VCS interface: "
-msgstr "VCS-grænseflade: "
-
-#: ../../english/doc/manuals.defs:177
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/cvs\">Cvs</a> repository."
-msgstr ""
-"Den seneste <get-var srctype />-kildekode er tilgængelig fra <a href="
-"\"https://packages.debian.org/cvs\">Cvs</a>-arkivet."
-
-#: ../../english/doc/manuals.defs:185
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/subversion\">Subversion</a> repository."
-msgstr ""
-"Den seneste <get-var srctype />-kildekode er tilgængelig fra <a href="
-"\"https://packages.debian.org/subversion\">Subversion</a>-arkivet."
-
-#: ../../english/doc/manuals.defs:203
-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 ""
-"Arbejdskopi af CVS-kildekode: sæt <code>CVSROOT</code>\n"
-" til <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-" og hent modulet <kbd>boot-floppies/documentation</kbd>."
-
-#: ../../english/doc/manuals.defs:208
-msgid "CVS via web"
-msgstr "CVS via web"
-
-#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
-msgid "Debian package"
-msgstr "Debian-pakke"
-
-#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
-msgid "Debian package (archived)"
-msgstr "Debian-pakke (arkiveret)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/danish/po/newsevents.da.po b/danish/po/newsevents.da.po
index 1ee467fff8c..01cf27e1b6c 100644
--- a/danish/po/newsevents.da.po
+++ b/danish/po/newsevents.da.po
@@ -9,66 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Debian-nyheder"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Debians seneste nyheder"
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "s.<get-var page />"
-
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr "Debian-fællesskabets nyhedsbrev"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Titel"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Forfatter"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Sprog:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Dato:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Begivenhed:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Plancher:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "kildekode"
-
-#: ../../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 "sammendrag"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Kommende begivenheder"
@@ -127,6 +67,128 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (dødt link)"
+#: ../../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 ""
+"For at modtage dette nyhedsbrev som mail, kan man <a href=\"https://lists."
+"debian.org/debian-news/\">abonnere på postlisten 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=\"../../\">Tidligere udgaver</a> af nyhedsbrevet er tilgængelige."
+
+#. 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\" />Debians projektnyheder redigeres af <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\" />Debians projektnyheder redigeres af <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\" />Denne udgave af Debians projektnyheder blev "
+"redigeret af <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\" />Denne udgave af Debians projektnyheder blev redigeret "
+"af <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\" />Den blev oversat af %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\" />Den blev oversat af %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\" />Den blev oversat af %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\" />Den blev oversat af %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 ""
+"For at få dette nyhedsbrev som e-mail hver uge, <a href=\"https://lists."
+"debian.org/debian-news/\">abonnér på postlisten 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\" />Debian Weekly News redigeres af <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 redigeres af <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\" />Denne udgave af Debian Weekly News blev redigeret af "
+"<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\" />Denne udgave af Debian Weekly News blev redigeret af "
+"<a href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -377,127 +439,65 @@ msgstr ""
"news />\">forskelligt nyt til udviklere</a>, er blevet udgivet, og dækker "
"følgende emner:"
-#: ../../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 ""
-"For at modtage dette nyhedsbrev som mail, kan man <a href=\"https://lists."
-"debian.org/debian-news/\">abonnere på postlisten debian-news</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "s.<get-var page />"
-#: ../../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=\"../../\">Tidligere udgaver</a> af nyhedsbrevet er tilgængelige."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Titel"
-#. 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\" />Debians projektnyheder redigeres af <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Forfatter"
-#. 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\" />Debians projektnyheder redigeres af <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Sprog:"
-#. 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\" />Denne udgave af Debians projektnyheder blev "
-"redigeret af <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Dato:"
-#. 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\" />Denne udgave af Debians projektnyheder blev redigeret "
-"af <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Begivenhed:"
-#. 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\" />Den blev oversat af %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Plancher:"
-#. 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\" />Den blev oversat af %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "kildekode"
-#. 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\" />Den blev oversat af %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Den blev oversat af %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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 ""
-"For at få dette nyhedsbrev som e-mail hver uge, <a href=\"https://lists."
-"debian.org/debian-news/\">abonnér på postlisten debian-news</a>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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 redigeres af <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "sammendrag"
-#. 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 redigeres af <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Debian-nyheder"
-#. 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\" />Denne udgave af Debian Weekly News blev redigeret af "
-"<a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Debians seneste nyheder"
-#. 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\" />Denne udgave af Debian Weekly News blev redigeret af "
-"<a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Debian-fællesskabets nyhedsbrev"
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/danish/po/organization.da.po b/danish/po/organization.da.po
index e5ed303a873..6a795167936 100644
--- a/danish/po/organization.da.po
+++ b/danish/po/organization.da.po
@@ -42,13 +42,13 @@ msgid "manager"
msgstr "leder"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Udgivelsesansvarlig for stable"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "troldmand"
@@ -75,27 +75,27 @@ msgid "role"
msgstr "rolle"
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Bestyrelesesmedlemmer"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribution"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Kommunikation og opsøgende arbejde"
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr "Databeskyttelseshold"
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Publicityhold"
@@ -109,136 +109,131 @@ msgstr "Medlemskaber af andre organisationer"
msgid "Support and Infrastructure"
msgstr "Support og infrastruktur"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr "Debian Pure Blends"
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Leder"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Teknisk komité"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Sekretær"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Udviklingsprojekter"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Ftp-arkiv"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "Ftp-mastere"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Ftp-assistenter"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Ftp-troldmænd"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Backports-holdet"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Udgivelsesstyring"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Udgivelseshold"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Kvalitetssikring"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Startdisketter"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr "Debian Live Team"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Udgivelsesbemærkninger"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Cd-aftryk"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produktion"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Tester"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr "Cloud-holdet"
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Autoopbygning og infrastruktur"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Wanna-build-hold"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Buildd-administration"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentation"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Pakker der skal arbejdes på og fremtidige pakker"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Tilpasninger"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Specielle systemer"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Bærbare"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Firewalls"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Embedded systemer"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Pressekontakt"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Websider"
@@ -409,44 +404,40 @@ msgstr "Pakkesporingssystem"
msgid "Treasurer"
msgstr "Kasserer"
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
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:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Salsa-administratorer"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "Debian for børn mellem 1 og 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
+
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian for børn mellem 1 og 99"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "Debian til lægepraksiser og forskning"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian til lægepraksiser og forskning"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "Debian til uddannelse"
+#~ msgid "Debian for education"
+#~ msgstr "Debian til uddannelse"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "Debian på juridiske kontorer"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian på juridiske kontorer"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "Debian til handicappede"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian til handicappede"
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr "Debian til videnskabelig og relateret forskning"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian til videnskabelig og relateret forskning"
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr "Debian til astronomi"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian til astronomi"
#~ msgid "Alioth administrators"
#~ msgstr "Alioth-administratorer"
diff --git a/danish/po/others.da.po b/danish/po/others.da.po
index 3205ad498cf..d46bd0f295f 100644
--- a/danish/po/others.da.po
+++ b/danish/po/others.da.po
@@ -57,42 +57,6 @@ msgstr "<void id=\"d-i\" />Ukendt"
msgid "Unavailable"
msgstr "Ikke tilgængelig"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Nye medlemmer-hjørnet"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Trin 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Trin 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Trin 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Trin 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Trin 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Trin 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Trin 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Ansøgerens kontrolliste"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -128,6 +92,34 @@ msgstr "Fax"
msgid "Address"
msgstr "Adresse"
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "Med&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "Uden&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "Indkapslet PostScript"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Powered by Debian]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Powered by Debian GNU/Linux]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Debian powered]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (miniknap)"
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Produkter"
@@ -216,71 +208,6 @@ msgstr "Donerer penge til Debian"
msgid "Money is used to organize local free software events"
msgstr "Penge anvendes til at organisere lokale fri software-begivenheder"
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "Med&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "Uden&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "Indkapslet PostScript"
-
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Powered by Debian]"
-
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Powered by Debian GNU/Linux]"
-
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Debian powered]"
-
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (miniknap)"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "samme som oven for"
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Hvor længe har du benyttet Debian?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Er du Debian Developer?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "Hvilke områder i Debian er du involveret i?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Hvad gjorde dig interesseret i at arbejde 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 nogen tips til kvinder, der har lyst til at blive mere involveret i "
-"Debian?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr "Kender du andre kvinder i teknologigrupper? Hvilke(n)?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Lidt mere om dig selv..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "Ok"
@@ -325,6 +252,79 @@ msgstr "Version"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Nye medlemmer-hjørnet"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Trin 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Trin 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Trin 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Trin 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Trin 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Trin 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Trin 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Ansøgerens kontrolliste"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "samme som oven for"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Hvor længe har du benyttet Debian?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Er du Debian Developer?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "Hvilke områder i Debian er du involveret i?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Hvad gjorde dig interesseret i at arbejde 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 nogen tips til kvinder, der har lyst til at blive mere involveret i "
+"Debian?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr "Kender du andre kvinder i teknologigrupper? Hvilke(n)?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Lidt mere om dig selv..."
+
#~ msgid "Wanted:"
#~ msgstr "Ønskes:"
diff --git a/danish/po/partners.da.po b/danish/po/partners.da.po
index ca0785589d6..6110868dbe3 100644
--- a/danish/po/partners.da.po
+++ b/danish/po/partners.da.po
@@ -105,12 +105,13 @@ msgstr ""
"af forsyning og sikkerhed på deres 2.000 m² store tekniske areal."
#: ../../english/partners/partners.def:64
+#, fuzzy
msgid ""
"<a href=\"https://www.credativ.com/\">credativ</a> is an independent "
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
"<a href=\"https://www.credativ.com/\">credativ</a> er en uafhængig konsult- "
"og tjenesteydelsesvirksomhed, der siden 1999 har tilbudt omfattende "
diff --git a/danish/po/ports.da.po b/danish/po/ports.da.po
index b40f7f8c8e8..099fc3a6818 100644
--- a/danish/po/ports.da.po
+++ b/danish/po/ports.da.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian til Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian til PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd-cd'er"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian til IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Kontakt"
@@ -89,6 +73,22 @@ msgstr "Tilgængelighed"
msgid "Systems"
msgstr "Systemer"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian til Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian til PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd-cd'er"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian til IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD til i386"
diff --git a/danish/po/security.da.po b/danish/po/security.da.po
index e0c0e3fc117..cf9d7ea168a 100644
--- a/danish/po/security.da.po
+++ b/danish/po/security.da.po
@@ -9,42 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Sikkerhed i Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Debians sikkerhedsbulletiner"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "Sp"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"<a href=\\\"undated/\\\">udaterede</a> sikkerhedsbulletiner bevaret til "
-"eftertiden"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "I Mitres CVE-ordbog:"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus' Bugtraq-database"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT-bulletiner"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT-sårbarhedsbemærkninger"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Kildekode:"
@@ -129,5 +93,41 @@ msgstr ""
"Der er pt. ingen tilgængelige eksterne sikkerhedsreferencer i andre "
"databaser."
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Sp"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Sikkerhed i Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Debians sikkerhedsbulletiner"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "I Mitres CVE-ordbog:"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus' Bugtraq-database"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT-bulletiner"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT-sårbarhedsbemærkninger"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"<a href=\\\"undated/\\\">udaterede</a> sikkerhedsbulletiner bevaret til "
+"eftertiden"
+
#~ msgid "CERT alerts"
#~ msgstr "CERT-advarsler"
diff --git a/danish/po/stats.da.po b/danish/po/stats.da.po
index 5258e8b8ba5..caf67d725bf 100644
--- a/danish/po/stats.da.po
+++ b/danish/po/stats.da.po
@@ -3,22 +3,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Statistik over oversættelser på Debians websted"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Der er %d sider at oversætte."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Der er %d bytes at oversætte."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Der er %d strenge at oversætte."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Forkert oversættelsesversion"
@@ -36,13 +20,13 @@ msgid "The original no longer exists"
msgstr "Originalen findes ikke længere"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "antal forekomster ikke tilgængelig"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "forekomster"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "antal forekomster ikke tilgængelig"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Klik for at hente diffstat-data"
@@ -55,15 +39,6 @@ msgstr "Oprettet med <transstatslink>"
msgid "Translation summary for"
msgstr "Oversættelsesresume for"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Ikke oversat"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Forældet"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Oversat"
@@ -73,6 +48,15 @@ msgstr "Oversat"
msgid "Up to date"
msgstr "Ajourført"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Forældet"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Ikke oversat"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -223,6 +207,22 @@ msgstr "Oversatte websider (efter størrelse)"
msgid "Translation Statistics by Page Size"
msgstr "Oversættelsesstatistik efter sidestørrelse"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Statistik over oversættelser på Debians websted"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Der er %d sider at oversætte."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Der er %d bytes at oversætte."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Der er %d strenge at oversætte."
+
#~ msgid "Unified diff"
#~ msgstr "Samlet diff"
diff --git a/danish/po/templates.da.po b/danish/po/templates.da.po
index b6eab2e8a6a..c6bc17072c6 100644
--- a/danish/po/templates.da.po
+++ b/danish/po/templates.da.po
@@ -9,14 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Debians websted"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Gennemsøg Debians websted."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -258,6 +250,14 @@ msgstr ""
"Sådan opsætter du <a href=m4_HOME/intro/cn>standardsprogvalg for dokumenter</"
"a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian internationalt"
@@ -534,6 +534,14 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Tilbage til <a href=\"./\">Hvem bruger Debian?-siden</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Debians websted"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Gennemsøg Debians websted."
+
#~ msgid "Select a server near you"
#~ msgstr "Vælg en server i nærheden af dig"
diff --git a/danish/po/vote.da.po b/danish/po/vote.da.po
index be2f4a85ce1..0129d818ccb 100644
--- a/danish/po/vote.da.po
+++ b/danish/po/vote.da.po
@@ -66,201 +66,231 @@ msgid "Proposal F Proposer"
msgstr "Forslags F's forslagsstiller"
#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Forslags A's forslagsstiller"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Forslags A's forslagsstiller"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Støtter"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Forslags A's støtter"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Forslags B's støtter"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Forslags C's støtter"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Forslags D's støtter"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Forslags E's støtter"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Forslags F's støtter"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Forslags A's støtter"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Forslags A's støtter"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Opposition"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Tekst"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Forslag A"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Forslag B"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Forslag C"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Forslag D"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Forslag E"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Forslag F"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Forslag A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Forslag A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Valgmuligheder"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Ændringens forslagstiller"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Ændringens støtter"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Ændringens tekst"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Ændringens forslagstiller A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Ændringens støtter A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Ændringens tekst A"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Ændringens forslagstiller B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Ændringens støtter B"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Ændringens tekst B"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "Ændringens forslagstiller C"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "Ændringens støtter C"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "Ændringens tekst C"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Ændringsforslag"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Forløb"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Flertalskrav"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Data og statistik"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Beslutningsdygtigt flertal"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Minimal diskussion"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Stemme"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Resultat"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Venter&nbsp;på&nbsp;en&nbsp;sponsor"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Under&nbsp;diskussion"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Afstemning&nbsp;åben"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Besluttet"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Tilbagetrukket"
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Andet"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Hjem&nbsp;til&nbsp;afstemningssiden"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Hvordan&nbsp;man&nbsp;..."
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Afgiver&nbsp;et&nbsp;forslag"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Ændrer&nbsp;et&nbsp;forslag"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Følger&nbsp;et&nbsp;forslag"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Læser&nbsp;et&nbsp;resultat"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Stemmer"
diff --git a/dutch/po/cdimage.nl.po b/dutch/po/cdimage.nl.po
index 391b0f84b28..139a74fca6e 100644
--- a/dutch/po/cdimage.nl.po
+++ b/dutch/po/cdimage.nl.po
@@ -20,20 +20,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Vingerafdruk van de Sleutel"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "ISO-images"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo-bestanden"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -130,3 +116,17 @@ msgid ""
msgstr ""
"Engelstalige <a href=\"/MailingLists/disclaimer\">publieke mailinglijst</a> "
"voor CD's/DVD's"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO-images"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo-bestanden"
diff --git a/dutch/po/consultants.nl.po b/dutch/po/consultants.nl.po
index dfd10fbf58a..c383416d772 100644
--- a/dutch/po/consultants.nl.po
+++ b/dutch/po/consultants.nl.po
@@ -18,6 +18,14 @@ msgstr ""
"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+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>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Naam:"
@@ -73,11 +81,3 @@ msgid ""
msgstr ""
"<total_consultant> Debian dienstverleners opgenomen in <total_country> "
"landen wereldwijd."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-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/countries.nl.po b/dutch/po/countries.nl.po
index 25e9581bfa6..d7a0c8aaf0c 100644
--- a/dutch/po/countries.nl.po
+++ b/dutch/po/countries.nl.po
@@ -229,210 +229,215 @@ msgid "Kenya"
msgstr "Kenia"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazachstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Korea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Koeweit"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazachstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Litouwen"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxemburg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Letland"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Marokko"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldavië"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Montenegro"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Macedonië"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongolië"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mexico"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Maleisië"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Nieuw Caledonië"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Nederland"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Noorwegen"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Nieuw-Zeeland"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Frans Polynesië"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipijnen"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polen"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugal"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "Réunion"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Roemenië"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Servië"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusland"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Saoedi-Arabië"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Zweden"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapore"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovenië"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovakije"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "El Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Thailand"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tadzjikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunesië"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turkije"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taiwan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Oekraïne"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Verenigde Staten"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Oezbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Zuid-Afrika"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/dutch/po/distrib.nl.po b/dutch/po/distrib.nl.po
index 2f32541d7c9..3153e701724 100644
--- a/dutch/po/distrib.nl.po
+++ b/dutch/po/distrib.nl.po
@@ -20,97 +20,67 @@ msgstr ""
"X-Generator: Gtranslator 2.91.7\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Zoekterm"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Laat zien"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Zoek op"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "paden eindigend op de zoekterm"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Alleen pakketnamen"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "pakketten met bestanden die zo heten"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Omschrijving"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "pakketten met bestanden waarvan de naam de zoekterm bevat"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Naam van bronpakket"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Toon alleen resultaten die exact overeenkomen"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distributie"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimenteel"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Architectuur"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "maakt niet uit"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Zoek"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Reset"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Zoek op"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Alleen pakketnamen"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Omschrijving"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Naam van bronpakket"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Toon alleen resultaten die exact overeenkomen"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Sectie"
@@ -127,6 +97,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Zoek"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Reset"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Laat zien"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "paden eindigend op de zoekterm"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "pakketten met bestanden die zo heten"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "pakketten met bestanden waarvan de naam de zoekterm bevat"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Architectuur"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
diff --git a/dutch/po/doc.nl.po b/dutch/po/doc.nl.po
index ed1052021c0..5fbcfe76317 100644
--- a/dutch/po/doc.nl.po
+++ b/dutch/po/doc.nl.po
@@ -20,6 +20,121 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Auteur:"
+
+#: ../../english/doc/books.def:41
+msgid "Debian Release:"
+msgstr "Debian Release:"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "E-mail:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Beschikbaar op:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "Inclusief CD:"
+
+#: ../../english/doc/books.def:54
+msgid "Publisher:"
+msgstr "Uitgever:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Auteurs:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Redactie:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Verantwoordelijke:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Beschikbaarheid:"
+
+#: ../../english/doc/manuals.defs:97
+msgid "Latest version:"
+msgstr "Meest recente versie:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(versie <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "platte tekst"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+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:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Web interface: "
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "VCS interface: "
+
+#: ../../english/doc/manuals.defs:177
+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:185
+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:203
+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>."
+
+#: ../../english/doc/manuals.defs:208
+msgid "CVS via web"
+msgstr "CVS via web"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Debian-pakket"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Debian-pakket (gearchiveerd)"
+
#: ../../english/doc/books.data:32
msgid ""
"\n"
@@ -177,121 +292,6 @@ msgstr ""
" UFW-firewall, MySQL-kwetsbaarheid, het commercieel antivirusprogramma\n"
" van Symantec evenals het inbraakdetectiesysteem van Snort."
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Auteur:"
-
-#: ../../english/doc/books.def:41
-msgid "Debian Release:"
-msgstr "Debian Release:"
-
-#: ../../english/doc/books.def:44
-msgid "email:"
-msgstr "E-mail:"
-
-#: ../../english/doc/books.def:48
-msgid "Available at:"
-msgstr "Beschikbaar op:"
-
-#: ../../english/doc/books.def:51
-msgid "CD Included:"
-msgstr "Inclusief CD:"
-
-#: ../../english/doc/books.def:54
-msgid "Publisher:"
-msgstr "Uitgever:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Auteurs:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Redactie:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Verantwoordelijke:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Status:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Beschikbaarheid:"
-
-#: ../../english/doc/manuals.defs:97
-msgid "Latest version:"
-msgstr "Meest recente versie:"
-
-#: ../../english/doc/manuals.defs:113
-msgid "(version <get-var version />)"
-msgstr "(versie <get-var version />)"
-
-#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "platte tekst"
-
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:193
-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:161 ../../english/doc/manuals.defs:171
-#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
-#: ../../english/doc/manuals.defs:195
-msgid "Web interface: "
-msgstr "Web interface: "
-
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
-#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
-#: ../../english/doc/manuals.defs:196
-msgid "VCS interface: "
-msgstr "VCS interface: "
-
-#: ../../english/doc/manuals.defs:177
-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:185
-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:203
-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>."
-
-#: ../../english/doc/manuals.defs:208
-msgid "CVS via web"
-msgstr "CVS via web"
-
-#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
-msgid "Debian package"
-msgstr "Debian-pakket"
-
-#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
-msgid "Debian package (archived)"
-msgstr "Debian-pakket (gearchiveerd)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/dutch/po/newsevents.nl.po b/dutch/po/newsevents.nl.po
index 7e7ec77b239..71a9d186817 100644
--- a/dutch/po/newsevents.nl.po
+++ b/dutch/po/newsevents.nl.po
@@ -20,66 +20,6 @@ msgstr ""
"X-Generator: Gtranslator 2.91.7\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Debian Nieuws"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Laatste nieuws van 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 "De nieuwsbrief voor de Debian-gemeenschap"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Auteur:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Taal:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Datum:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Evenement:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Dia’s:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "broncode"
-
-#: ../../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 "Samenvatting"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Komende evenementen"
@@ -138,6 +78,138 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (dode link)"
+#: ../../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 ""
+"Om deze nieuwsbrief 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."
+
+#. 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>."
+
+#. 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>."
+
+#. 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>."
+
+#. 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>."
+
+#. 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."
+
+#. 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."
+
+#. 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."
+
+#. 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."
+
+#: ../../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>."
+
+#. 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>."
+
+#. 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>."
+
+#. 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>."
+
+#. 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>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -391,137 +463,65 @@ msgstr ""
"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 in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
-msgstr ""
-"Om deze nieuwsbrief in uw mailbox te ontvangen, kunt u zich <a href="
-"\"https://lists.debian.org/debian-news/\">aanmelden voor de debian-news "
-"mailinglijst</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Titel:"
-#. 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>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Auteur:"
-#. 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>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Taal:"
-#. 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>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Datum:"
-#. 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>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Evenement:"
-#. 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."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Dia’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."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "broncode"
-#. 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."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Samenvatting"
-#. 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>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Debian Nieuws"
-#. 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>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Laatste nieuws van 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\" />Deze uitgave van Debian Weekly News werd geredigeerd "
-"door <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "De nieuwsbrief voor de Debian-gemeenschap"
#~ msgid "Name:"
#~ msgstr "Naam:"
diff --git a/dutch/po/organization.nl.po b/dutch/po/organization.nl.po
index 19ea51e4b67..d228f1c4af2 100644
--- a/dutch/po/organization.nl.po
+++ b/dutch/po/organization.nl.po
@@ -54,13 +54,13 @@ msgid "manager"
msgstr "coördinator"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Stabiele-release coördinator"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "grootmeester"
@@ -87,27 +87,27 @@ msgid "role"
msgstr "functie"
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Gezagsdragers"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distributie"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Communicatie en doelgroepenwerking"
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr "Gegevensbeschermingsteam"
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Publiciteitsteam"
@@ -121,136 +121,131 @@ msgstr "Lidmaatschap van andere organisaties"
msgid "Support and Infrastructure"
msgstr "Ondersteuning en Infrastructuur"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr "Specifieke uitgaven"
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Leider"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Technisch comité"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Secretaris"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Ontwikkelingsprojecten"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP-archieven"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "FTP-meesters"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "FTP-assistenten"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "FTP-grootmeesters"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Backports-team"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Releasemanagement"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Release-team"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Kwaliteitscontrole"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Installatiesysteem-team"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr "Debian team voor live-media"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Notities bij de uitgave"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD-images"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Productie"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testing"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr "Cloud-team"
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infrastructuur voor geautomatiseerde bouw van pakketten"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Wanna-build-team"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Buildd-beheer"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Documentatie"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Lijst van pakketten waaraan gewerkt moet worden of die eraan komen"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Ports"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Speciale configuraties"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Laptops"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Firewalls"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Embedded systemen"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Perscontact"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Webpagina’s"
@@ -422,44 +417,40 @@ msgstr "Pakketvolgsysteem"
msgid "Treasurer"
msgstr "Penningmeester"
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Aanvragen voor het gebruik van het <a name=\"trademark\" href=\"m4_HOME/"
"trademark\">handelsmerk</a>"
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Salsa-beheerders"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "Debian voor kinderen van 1 tot 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Specifieke uitgaven"
+
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian voor kinderen van 1 tot 99"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "Debian voor medische toepassingen en onderzoek"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian voor medische toepassingen en onderzoek"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "Debian voor het onderwijs"
+#~ msgid "Debian for education"
+#~ msgstr "Debian voor het onderwijs"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "Debian in de rechtspraak"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian in de rechtspraak"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "Debian voor mensen met een handicap"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian voor mensen met een handicap"
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr "Debian voor wetenschappelijke toepassingen en onderzoek"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian voor wetenschappelijke toepassingen en onderzoek"
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr "Debian voor de sterrenkunde"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian voor de sterrenkunde"
#~ msgid "Live System Team"
#~ msgstr "Livesysteem-team"
diff --git a/dutch/po/others.nl.po b/dutch/po/others.nl.po
index c68463977bd..473f3330138 100644
--- a/dutch/po/others.nl.po
+++ b/dutch/po/others.nl.po
@@ -68,42 +68,6 @@ msgstr "<void id=\"d-i\" />Onbekend"
msgid "Unavailable"
msgstr "Niet beschikbaar"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Hoek voor nieuwe leden"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Stap 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Stap 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Stap 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Stap 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Stap 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Stap 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Stap 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-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> "
@@ -139,6 +103,34 @@ msgstr "Fax"
msgid "Address"
msgstr "Adres"
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "Met&nbsp;\"Debian\""
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "Zonder&nbsp;\"Debian\""
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "Encapsulated PostScript"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Draait op Debian]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Draait op Debian GNU/Linux]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Draait op Debian]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (mini-button)"
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Producten"
@@ -227,71 +219,6 @@ msgstr "Schenkt geld aan Debian"
msgid "Money is used to organize local free software events"
msgstr "Geld wordt gebruikt om lokale vrijesoftware-evenementen te organiseren"
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "Met&nbsp;\"Debian\""
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "Zonder&nbsp;\"Debian\""
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "Encapsulated PostScript"
-
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Draait op Debian]"
-
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Draait op Debian GNU/Linux]"
-
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Draait op Debian]"
-
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (mini-button)"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "zelfde als bovenstaande"
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Hoe lang gebruikt u Debian al?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Bent u een ontwikkelaar van Debian?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "In welke domeinen van Debian bent u actief?"
-
-#: ../../english/women/profiles/profiles.def:33
-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?"
-
-#: ../../english/women/profiles/profiles.def:39
-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
-msgid "A bit more about you..."
-msgstr "Iets meer over uzelf..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -336,6 +263,79 @@ msgstr "Versie"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Hoek voor nieuwe leden"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Stap 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Stap 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Stap 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Stap 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Stap 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Stap 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Stap 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Checklist voor inschrijvers"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "zelfde als bovenstaande"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Hoe lang gebruikt u Debian al?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Bent u een ontwikkelaar van Debian?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "In welke domeinen van Debian bent u actief?"
+
+#: ../../english/women/profiles/profiles.def:33
+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?"
+
+#: ../../english/women/profiles/profiles.def:39
+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
+msgid "A bit more about you..."
+msgstr "Iets meer over uzelf..."
+
#~ msgid "Wanted:"
#~ msgstr "Gevraagd:"
diff --git a/dutch/po/partners.nl.po b/dutch/po/partners.nl.po
index b2a3f836e71..b014f65be97 100644
--- a/dutch/po/partners.nl.po
+++ b/dutch/po/partners.nl.po
@@ -116,12 +116,13 @@ msgstr ""
"technische ruimte van 2.000 m²."
#: ../../english/partners/partners.def:64
+#, fuzzy
msgid ""
"<a href=\"https://www.credativ.com/\">credativ</a> is an independent "
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
"<a href=\"https://www.credativ.com/\">credativ</a> is een onafhankelijk "
"advies- en dienstverleningsbedrijf dat sinds 1999 allesomvattende diensten "
diff --git a/dutch/po/ports.nl.po b/dutch/po/ports.nl.po
index 7893b79b8be..12702bee7c1 100644
--- a/dutch/po/ports.nl.po
+++ b/dutch/po/ports.nl.po
@@ -16,22 +16,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian voor Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian voor PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd-CD's"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian voor IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Contact"
@@ -96,6 +80,22 @@ msgstr "Toevoer"
msgid "Systems"
msgstr "Systemen"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian voor Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian voor PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd-CD's"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian voor IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD voor i386"
diff --git a/dutch/po/security.nl.po b/dutch/po/security.nl.po
index 8e567ba4ab5..cc19d602e50 100644
--- a/dutch/po/security.nl.po
+++ b/dutch/po/security.nl.po
@@ -12,42 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Debian Beveiliging"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Debian Beveiligingsberichten"
-
-#: ../../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 ""
-" <a href=\\\"undated/\\\">ongedateerde</a> beveiligingsberichten (voor de "
-"volledigheid)"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre CVE-woordenboek"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus Bugtraq-database"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT-berichten"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT-kwetsbaarheidsmeldingen"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Bron:"
@@ -130,3 +94,39 @@ msgstr "Kwetsbaarheden van CERT, berichten en notities bij incidenten:"
msgid "No other external database security references currently available."
msgstr ""
"Geen andere referenties naar externe beveiligingsdatabases beschikbaar."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Q"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Debian Beveiliging"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Debian Beveiligingsberichten"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitre CVE-woordenboek"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus Bugtraq-database"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT-berichten"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT-kwetsbaarheidsmeldingen"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+" <a href=\\\"undated/\\\">ongedateerde</a> beveiligingsberichten (voor de "
+"volledigheid)"
diff --git a/dutch/po/stats.nl.po b/dutch/po/stats.nl.po
index 0e701eed8ca..aa30911ea61 100644
--- a/dutch/po/stats.nl.po
+++ b/dutch/po/stats.nl.po
@@ -18,22 +18,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Debian website vertaalstatistieken"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Er zijn %d pagina’s te vertalen."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Er zijn %d bytes te vertalen."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Er zijn %d strings te vertalen."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Verkeerde vertalingsversie"
@@ -51,13 +35,13 @@ msgid "The original no longer exists"
msgstr "Het origineel bestaat niet meer"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "aantal bezoeken n.v.t"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "bezoeken"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "aantal bezoeken n.v.t"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Klik om de verschil-info op te halen"
@@ -70,15 +54,6 @@ msgstr "Gemaakt met <transstatslink>"
msgid "Translation summary for"
msgstr "Vertaaloverzicht voor"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Niet vertaald"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Verouderd"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Vertaald"
@@ -88,6 +63,15 @@ msgstr "Vertaald"
msgid "Up to date"
msgstr "Bijgewerkt"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Verouderd"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Niet vertaald"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -238,6 +222,22 @@ msgstr "Vertaalde webpagina’s (grootte)"
msgid "Translation Statistics by Page Size"
msgstr "Vertaalstatistieken op basis van paginagrootte"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Debian website vertaalstatistieken"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Er zijn %d pagina’s te vertalen."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Er zijn %d bytes te vertalen."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Er zijn %d strings te vertalen."
+
#~ msgid "Unified diff"
#~ msgstr "Verenigde diff"
diff --git a/dutch/po/templates.nl.po b/dutch/po/templates.nl.po
index 06a4d51560b..cee2ce2c678 100644
--- a/dutch/po/templates.nl.po
+++ b/dutch/po/templates.nl.po
@@ -20,14 +20,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Debian-website"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Zoek binnen de website van Debian."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -273,6 +265,14 @@ 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"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian Internationaal"
@@ -551,5 +551,13 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Terug naar de <a href=\"../\">Wie gebruikt Debian?-pagina</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Debian-website"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Zoek binnen de website van Debian."
+
#~ msgid "Visit the site sponsor"
#~ msgstr "Bezoek de sponsor van deze site"
diff --git a/dutch/po/vote.nl.po b/dutch/po/vote.nl.po
index 7fb5704c278..0407a1afdb0 100644
--- a/dutch/po/vote.nl.po
+++ b/dutch/po/vote.nl.po
@@ -76,201 +76,231 @@ msgid "Proposal F Proposer"
msgstr "Indiener Voorstel F"
#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Indiener Voorstel A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Indiener Voorstel A"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Steun"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Steun Voorstel A"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Steun Voorstel B"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Steun Voorstel C"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Steun Voorstel D"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Steun Voorstel E"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Steun Voorstel F"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Steun Voorstel A"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Steun Voorstel A"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Weerstand"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Tekst"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Voorstel A"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Voorstel B"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Voorstel C"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Voorstel D"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Voorstel E"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Voorstel F"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Voorstel A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Voorstel A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Keuzes"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Indiener Amendement"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Steun Amendement"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Tekst Amendement"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Indiener Amendement A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Steun Amendement A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Tekst Amendement A"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Indiener Amendement B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Steun Amendement B"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Tekst Amendement B"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "Indiener Amendement C"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "Steun Amendement C"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "Tekst Amendement C"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Amendementen"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Notulen"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Meerderheidsvereiste"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Data en Statistieken"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Quorum"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Minimum Discussie"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Stembiljet"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Uitslag"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "In&nbsp;afwachting&nbsp;van&nbsp;sponsors"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Ter&nbsp;discussie"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "In&nbsp;stemming"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Besloten"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Teruggetrokken"
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Andere"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Home&nbsp;stempagina"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "How&nbsp;To"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Een&nbsp;voorstel&nbsp;voorleggen"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Een&nbsp;voorstel&nbsp;amenderen"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Een&nbsp;voorstel&nbsp;steunen"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Lees&nbsp;een&nbsp;resultaat"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Stem"
diff --git a/esperanto/po/cdimage.eo.po b/esperanto/po/cdimage.eo.po
index d36b3e96399..4aa59359e4c 100644
--- a/esperanto/po/cdimage.eo.po
+++ b/esperanto/po/cdimage.eo.po
@@ -9,20 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -70,7 +56,6 @@ msgstr "<void id=\"dc_rsyncmirrors\" />Speguloj de rsync"
#: ../../english/template/debian/cdimage.wml:43
#, fuzzy
-#| msgid "<void id=\"dc_misc\" />Misc"
msgid "<void id=\"dc_verify\" />Verify"
msgstr "<void id=\"dc_verify\" />Kontroli"
@@ -121,3 +106,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Publika retpoŝta dissendolisto</a> por "
"KD/DVD en la angla lingvo:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/esperanto/po/consultants.eo.po b/esperanto/po/consultants.eo.po
index 657f6e8c2fa..9b01e2a286a 100644
--- a/esperanto/po/consultants.eo.po
+++ b/esperanto/po/consultants.eo.po
@@ -9,6 +9,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Listo de konsilistoj"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Reen al la <a href=\"./\">paĝo de konsilistoj pri Debian</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Nomo:"
@@ -64,11 +72,3 @@ msgid ""
msgstr ""
"Estas <total_consultant> konsultistoj pri Debian listitaj en <total_country> "
"landoj worldwide."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Listo de konsilistoj"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Reen al la <a href=\"./\">paĝo de konsilistoj pri Debian</a>."
diff --git a/esperanto/po/countries.eo.po b/esperanto/po/countries.eo.po
index 2761a706481..897d3123a73 100644
--- a/esperanto/po/countries.eo.po
+++ b/esperanto/po/countries.eo.po
@@ -11,7 +11,6 @@ msgstr ""
#: ../../english/template/debian/countries.wml:111
#, fuzzy
-#| msgid "United States"
msgid "United Arab Emirates"
msgstr "Usono"
@@ -221,212 +220,216 @@ msgid "Kenya"
msgstr ""
#: ../../english/template/debian/countries.wml:267
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Koreio"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr ""
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr ""
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr ""
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr ""
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr ""
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr ""
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr ""
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr ""
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr ""
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskaro"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr ""
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr ""
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr ""
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Meksiko"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr ""
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr ""
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr ""
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Nederlando"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norvegio"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Novzelando"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
#, fuzzy
msgid "Panama"
msgstr "Kanado"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr ""
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr ""
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr ""
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr ""
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polando"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugalio"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr ""
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr ""
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusio"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr ""
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Svedio"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr ""
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr ""
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr ""
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr ""
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr ""
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr ""
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr ""
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turkio"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Tajvano"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
#, fuzzy
msgid "Ukraine"
msgstr "Francio"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Usono"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr ""
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr ""
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr ""
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr ""
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr ""
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Sudafriko"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabvo"
diff --git a/esperanto/po/distrib.eo.po b/esperanto/po/distrib.eo.po
index b729e720719..12992034142 100644
--- a/esperanto/po/distrib.eo.po
+++ b/esperanto/po/distrib.eo.po
@@ -9,97 +9,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Ŝlosilvorto"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Montri"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr ""
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "vojojn kiuj finiĝas per la ŝlosilvorto"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr ""
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "pakojn kiuj enhavas dosierojn kun nomoj ĉi tiaj"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr ""
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "pakojn kiuj enhavas dosierojn kies nomoj enhavas la ŝlosilvorto"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr ""
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribuo"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Serĉi"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Rekomenci"
-
-#: ../../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:21
-msgid "Only show exact matches"
-msgstr ""
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr ""
@@ -116,6 +86,36 @@ msgstr ""
msgid "non-free"
msgstr ""
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Serĉi"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Rekomenci"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Montri"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "vojojn kiuj finiĝas per la ŝlosilvorto"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "pakojn kiuj enhavas dosierojn kun nomoj ĉi tiaj"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "pakojn kiuj enhavas dosierojn kies nomoj enhavas la ŝlosilvorto"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr ""
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr ""
diff --git a/esperanto/po/doc.eo.po b/esperanto/po/doc.eo.po
index 12c26cafaf6..72ad6b3c7cc 100644
--- a/esperanto/po/doc.eo.po
+++ b/esperanto/po/doc.eo.po
@@ -9,96 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-" Debian 9 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:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-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:83
-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:105
-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:125
-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:146
-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 8) 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:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr ""
@@ -205,6 +115,96 @@ msgstr ""
msgid "Debian package (archived)"
msgstr ""
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/esperanto/po/newsevents.eo.po b/esperanto/po/newsevents.eo.po
index dfce0e5aa49..ef8a44017af 100644
--- a/esperanto/po/newsevents.eo.po
+++ b/esperanto/po/newsevents.eo.po
@@ -9,68 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr ""
-
-#: ../../english/News/news.rdf.in:19
-#, fuzzy
-#| msgid "Latest News"
-msgid "Debian Latest News"
-msgstr "Lastaj Novaĵoj"
-
-#: ../../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/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 "Venontaj Aferoj"
@@ -128,6 +66,141 @@ msgstr "Reen al la <a href=\"m4_HOME/\">Debiana Projekta hejmpaĝo</a>."
msgid "<get-var url /> (dead link)"
msgstr ""
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+" <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."
+
+#: ../../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=\"../../\">Antaŭaj ekzempleroj</a> de tiu ĉi novaĵletero estas "
+"haveblaj."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+#, fuzzy
+msgid ""
+"<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>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+#, fuzzy
+msgid ""
+"<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>."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:25
+#, 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 ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:30
+#, 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 ""
+"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
+"\">Joey Hess</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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#: ../../english/template/debian/weeklynews/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>."
+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."
+
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:15
+#, fuzzy
+msgid ""
+"<void id=\"singular\" />Debian Weekly News is 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>."
+
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:20
+#, fuzzy
+msgid ""
+"<void id=\"plural\" />Debian Weekly News is 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>."
+
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:25
+#, fuzzy
+msgid ""
+"<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>."
+
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:30
+#, fuzzy
+msgid ""
+"<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>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -309,140 +382,66 @@ msgid ""
"the following topics:"
msgstr ""
-#: ../../english/template/debian/projectnews/footer.wml:6
-#, fuzzy
-msgid ""
-"To receive this newsletter in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
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."
-#: ../../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."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
msgstr ""
-"<a href=\"../../\">Antaŭaj ekzempleroj</a> de tiu ĉi novaĵletero estas "
-"haveblaj."
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
-#, fuzzy
-msgid ""
-"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-#, fuzzy
-msgid ""
-"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:25
-#, fuzzy
-msgid ""
-"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:30
-#, fuzzy
-msgid ""
-"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</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."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:29
+msgid "source"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
msgstr ""
-#: ../../english/template/debian/weeklynews/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>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
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."
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:15
-#, fuzzy
-msgid ""
-"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:20
-#, fuzzy
-msgid ""
-"<void id=\"plural\" />Debian Weekly News is edited by <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:25
+#: ../../english/News/news.rdf.in:19
#, fuzzy
-msgid ""
-"<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>."
+msgid "Debian Latest News"
+msgstr "Lastaj Novaĵoj"
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:30
-#, fuzzy
-msgid ""
-"<void id=\"plural\" />This issue of Debian Weekly News was edited by <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
msgstr ""
-"<i>Debian Weekly News</i> estas verkita de <a href=\"mailto:dwn@debian.org"
-"\">Joey Hess</a>."
#, fuzzy
#~ msgid ""
diff --git a/esperanto/po/organization.eo.po b/esperanto/po/organization.eo.po
index 80b50a02123..6f92ae6cc9e 100644
--- a/esperanto/po/organization.eo.po
+++ b/esperanto/po/organization.eo.po
@@ -42,11 +42,11 @@ msgid "manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "SRM"
+msgid "Stable Release Manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "Stable Release Manager"
+msgid "SRM"
msgstr ""
#: ../../english/intro/organization.data:36
@@ -75,27 +75,27 @@ msgid "role"
msgstr ""
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr ""
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr ""
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr ""
@@ -109,136 +109,131 @@ msgstr ""
msgid "Support and Infrastructure"
msgstr ""
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr ""
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr ""
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr ""
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr ""
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr ""
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr ""
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr ""
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr ""
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr ""
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr ""
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr ""
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr ""
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr ""
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr ""
@@ -397,39 +392,11 @@ msgstr ""
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr ""
-
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr ""
-
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr ""
-
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr ""
-
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr ""
-
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr ""
-
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr ""
-
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr ""
diff --git a/esperanto/po/others.eo.po b/esperanto/po/others.eo.po
index c5be2e8b66c..52e028ef32a 100644
--- a/esperanto/po/others.eo.po
+++ b/esperanto/po/others.eo.po
@@ -57,42 +57,6 @@ msgstr ""
msgid "Unavailable"
msgstr ""
-#: ../../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> "
@@ -124,6 +88,34 @@ msgstr ""
msgid "Address"
msgstr ""
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr ""
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr ""
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr ""
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr ""
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr ""
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr ""
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr ""
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr ""
@@ -212,109 +204,117 @@ msgstr ""
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
+#: ../../english/y2k/l10n.data:6
+msgid "OK"
msgstr ""
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
+#: ../../english/y2k/l10n.data:9
+msgid "BAD"
msgstr ""
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
+#: ../../english/y2k/l10n.data:12
+msgid "OK?"
msgstr ""
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
+#: ../../english/y2k/l10n.data:15
+msgid "BAD?"
msgstr ""
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
+#: ../../english/y2k/l10n.data:18
+msgid "??"
msgstr ""
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
+#: ../../english/y2k/l10n.data:21
+msgid "Unknown"
msgstr ""
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
+#: ../../english/y2k/l10n.data:24
+msgid "ALL"
msgstr ""
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
+#: ../../english/y2k/l10n.data:27
+msgid "Package"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
+#: ../../english/y2k/l10n.data:30
+msgid "Status"
msgstr ""
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
+#: ../../english/y2k/l10n.data:33
+msgid "Version"
msgstr ""
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
+#: ../../english/y2k/l10n.data:36
+msgid "URL"
msgstr ""
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
msgstr ""
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
msgstr ""
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
msgstr ""
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
msgstr ""
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
msgstr ""
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
msgstr ""
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
msgstr ""
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
msgstr ""
-#: ../../english/y2k/l10n.data:18
-msgid "??"
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
msgstr ""
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
msgstr ""
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
msgstr ""
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
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"
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
msgstr ""
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
msgstr ""
diff --git a/esperanto/po/partners.eo.po b/esperanto/po/partners.eo.po
index db8c9e99938..644cd23a422 100644
--- a/esperanto/po/partners.eo.po
+++ b/esperanto/po/partners.eo.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
diff --git a/esperanto/po/ports.eo.po b/esperanto/po/ports.eo.po
index 991177aac13..1c99a8eb8ae 100644
--- a/esperanto/po/ports.eo.po
+++ b/esperanto/po/ports.eo.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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 ""
@@ -89,6 +73,22 @@ msgstr ""
msgid "Systems"
msgstr ""
+#: ../../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/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr ""
diff --git a/esperanto/po/security.eo.po b/esperanto/po/security.eo.po
index ccf6dcbc314..33ea557ab42 100644
--- a/esperanto/po/security.eo.po
+++ b/esperanto/po/security.eo.po
@@ -9,41 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Sekureco de Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Sekurecaj avertoj de Debian"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr ""
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:92
-#, fuzzy
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Koncernebla"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr ""
@@ -121,3 +86,38 @@ msgstr ""
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr ""
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Sekureco de Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Sekurecaj avertoj de Debian"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:92
+#, fuzzy
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Koncernebla"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/esperanto/po/stats.eo.po b/esperanto/po/stats.eo.po
index 0a311fe1955..0bc4754b652 100644
--- a/esperanto/po/stats.eo.po
+++ b/esperanto/po/stats.eo.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/esperanto/po/templates.eo.po b/esperanto/po/templates.eo.po
index 1bb9f7e0318..75f42ba83c5 100644
--- a/esperanto/po/templates.eo.po
+++ b/esperanto/po/templates.eo.po
@@ -9,20 +9,9 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-#, fuzzy
-#| msgid "Debian Project"
-msgid "Debian website"
-msgstr "Projekto Debiano"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian"
msgstr "Helpu Debianon"
@@ -44,10 +33,6 @@ msgstr "Projekto Debiano"
#: ../../english/template/debian/common_translation.wml:13
#, fuzzy
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -88,7 +73,6 @@ msgstr "Kontaktu Nin"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Informo pri livero"
@@ -164,13 +148,11 @@ msgstr "Akiri Debian"
#: ../../english/template/debian/common_translation.wml:91
#, fuzzy
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "Libroj pri Debian"
#: ../../english/template/debian/common_translation.wml:94
#, fuzzy
-#| msgid "Last Modified"
msgid "Last Updated"
msgstr "Laste modifita"
@@ -221,11 +203,6 @@ msgstr "en livero 2.2"
#. your language.
#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -277,6 +254,14 @@ msgstr "Tiu ĉi paĝo estas havebla ankaŭ en la jenaj lingvoj"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Kiel elekti <a href=m4_HOME/intro/cn>la ĉefan dokumentan lingvon</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Internacia Debian"
@@ -323,7 +308,6 @@ msgstr "Libroj pri Debian"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian Wiki"
msgstr "Helpu Debianon"
@@ -357,7 +341,6 @@ msgstr "Datumbazo de disvolvantoj"
#: ../../english/template/debian/links.tags.wml:64
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian FAQ"
msgstr "Helpu Debianon"
@@ -435,7 +418,6 @@ msgstr "Vendistoj de KD"
#: ../../english/template/debian/links.tags.wml:125
#, fuzzy
-#| msgid "CD ISO images"
msgid "CD/USB ISO images"
msgstr "KD kun bildoj ISO"
@@ -559,6 +541,15 @@ 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>."
+#: ../../english/search.xml.in:7
+#, fuzzy
+msgid "Debian website"
+msgstr "Projekto Debiano"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
#~ msgid "Visit the site sponsor"
#~ msgstr "Viziti aŭspicianton"
diff --git a/esperanto/po/vote.eo.po b/esperanto/po/vote.eo.po
index 7407e59ce9c..93cad631190 100644
--- a/esperanto/po/vote.eo.po
+++ b/esperanto/po/vote.eo.po
@@ -68,202 +68,228 @@ msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Seconds"
+msgid "Proposal G Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal A Seconds"
+msgid "Proposal H Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal B Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal C Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal D Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Proposal E Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Proposal F Seconds"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Opposition"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Text"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal A"
+msgid "Proposal G Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal B"
+msgid "Proposal H Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal C"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal D"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Proposal E"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Proposal F"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Choices"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Proposer"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Seconds"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Text"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "proponita"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "proponita"
+
+#: ../../english/template/debian/votebar.wml:118
+msgid "Choices"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:121
+msgid "Amendment Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:124
+msgid "Amendment Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:127
+msgid "Amendment Text"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr ""
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr ""
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr ""
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr ""
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
#, fuzzy
msgid "Minimum Discussion"
msgstr "Diskutata"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr ""
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Esperanta&nbsp;je&nbsp;Aŭspiciantoj"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Diskutata"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Voĉdono&nbsp;Malfermita"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Decidita"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Alia"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Hejma&nbsp;Voĉdona&nbsp;Paĝo"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Kiel&nbsp;Fari"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Sendi&nbsp;Proponon"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Modifi&nbsp;Proponon"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Sekvi&nbsp;Proponon"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Legi&nbsp;Rezulton"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Voĉdono"
diff --git a/finnish/po/blends.fi.po b/finnish/po/blends.fi.po
index ebf39cc3025..4953502cc49 100644
--- a/finnish/po/blends.fi.po
+++ b/finnish/po/blends.fi.po
@@ -43,9 +43,6 @@ msgstr ""
#: ../../english/blends/released.data:31
#, fuzzy
-#| msgid ""
-#| "The goal of Debian Games is to provide games in Debian from arcade and "
-#| "aventure to simulation and strategy."
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
diff --git a/finnish/po/cdimage.fi.po b/finnish/po/cdimage.fi.po
index 2a7b6c9cd68..26aff1ece1b 100644
--- a/finnish/po/cdimage.fi.po
+++ b/finnish/po/cdimage.fi.po
@@ -9,20 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "ISO-vedokset"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo-tiedostot"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -119,3 +105,17 @@ msgid ""
msgstr ""
"Englanninkielinen <a href=\"/MailingLists/disclaimer\">julkinen postilista</"
"a> CD/DVD:ille:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO-vedokset"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo-tiedostot"
diff --git a/finnish/po/consultants.fi.po b/finnish/po/consultants.fi.po
index 4f7b4b7eb92..22575bfe7e3 100644
--- a/finnish/po/consultants.fi.po
+++ b/finnish/po/consultants.fi.po
@@ -9,6 +9,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Konsulttilista"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Takaisin <a href=\"./\">Debian-konsulttisivulle</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Nimi:"
@@ -64,11 +72,3 @@ msgid ""
msgstr ""
"Listattu yhteensä <total_consultant> Debian-konsulttia <total_country> "
"maassa maailmanlaajuisesti."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Konsulttilista"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Takaisin <a href=\"./\">Debian-konsulttisivulle</a>."
diff --git a/finnish/po/countries.fi.po b/finnish/po/countries.fi.po
index c6d9ff39e57..7d3ff819ac2 100644
--- a/finnish/po/countries.fi.po
+++ b/finnish/po/countries.fi.po
@@ -218,210 +218,215 @@ msgid "Kenya"
msgstr "Kenia"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazakstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Korea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuwait"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazakstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Liettua"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxemburg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Latvia"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Marokko"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldova"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Montenegro"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Makedonian tasavalta"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongolia"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Meksiko"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malesia"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Uusi-Kaledonia"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Alankomaat"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norja"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Uusi-Seelanti"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Ranskan Polynesia"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filippiinit"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Puola"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugali"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Romania"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Serbia"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Venäjä"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Saudi-Arabia"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Ruotsi"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapore"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovenia"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovakia"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "El Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Thaimaa"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tadžikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunisia"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turkki"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taiwan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukraina"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Yhdysvallat"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Etelä-Afrikka"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/finnish/po/distrib.fi.po b/finnish/po/distrib.fi.po
index 3bc8caec02c..6313b7ca7f9 100644
--- a/finnish/po/distrib.fi.po
+++ b/finnish/po/distrib.fi.po
@@ -9,97 +9,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Hakusana"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Näytä"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Hae"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "hakusanaan päättyvät polut"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "vain pakettien nimistä"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "paketit joista löytyy tämän nimisiä tiedostoja"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "kuvauksista"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "paketit joista löytyy hakusanan sisältäviä tiedostonimiä"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "lähdekoodipakettien nimistä"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Näytä vain täydelliset vastineet"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Jakelu"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "kokeellinen"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "epävakaa"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testattava"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "vakaa"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "aiempi vakaa"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Arkkitehtuuri"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "mikä tahansa"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Hae"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Tyhjennä"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Hae"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "vain pakettien nimistä"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "kuvauksista"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "lähdekoodipakettien nimistä"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Näytä vain täydelliset vastineet"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Osasto"
@@ -116,6 +86,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "epävapaa"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Hae"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Tyhjennä"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Näytä"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "hakusanaan päättyvät polut"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "paketit joista löytyy tämän nimisiä tiedostoja"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "paketit joista löytyy hakusanan sisältäviä tiedostonimiä"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Arkkitehtuuri"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -190,7 +190,6 @@ msgstr "POWER-prosessorit"
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "64-bit MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "64-bittinen MIPS (little endian)"
diff --git a/finnish/po/doc.fi.po b/finnish/po/doc.fi.po
index 30bb5660fee..d7aeb31dd78 100644
--- a/finnish/po/doc.fi.po
+++ b/finnish/po/doc.fi.po
@@ -9,119 +9,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-" Debian 9 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:61 ../../english/doc/books.data:171
-#: ../../english/doc/books.data:226
-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:83
-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 ""
-"Tämän vapaasti saatavan, ajan tasalla olevan kirjan tavoitteena on\n"
-" tutustuttaa käyttäjä Debianiin (sekä nykyiseen vakaaseen että "
-"epävakaaseen\n"
-" jakeluun). Kirja on aihepiiriltään laaja ja käsittelee järjestelmän\n"
-" asentamisen ja ylläpidon perusteita (kotona, töissä, yhdistyksissä tai\n"
-" koulussa)."
-
-#: ../../english/doc/books.data:105
-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 ""
-"Ensimmäine ranskankielinen Debian-kirja on jo viidennessä laitoksessaan. "
-"Kirjassa\n"
-" käsitellään kaikkia Debianin ylläpidon aiheita asennuksesta "
-"verkkopalvelujen\n"
-" räätälöintiin.\n"
-" Koska kirjan on kirjoittanut kaksi Debian-kehittäjää, teos voi\n"
-" kiinnostaa monia henkilöitä: aloittelijoita, jotka tutkivat\n"
-" Debiania, kokeneempia käyttäjiä, jotka etsivät vinkkejä\n"
-" Debian-työkalujen käyttötaitojen kehittämiseen sekä ylläpitäjiä, jotka\n"
-" haluavat rakentaa luotettavan verkon Debianin varaan."
-
-#: ../../english/doc/books.data:125
-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:146
-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 8) 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:200
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Tekijä:"
#: ../../english/doc/books.def:41
#, fuzzy
-#| msgid "Debian package"
msgid "Debian Release:"
msgstr "Debian-paketti"
@@ -233,6 +126,112 @@ msgstr "Debian-paketti"
msgid "Debian package (archived)"
msgstr "Debian-paketti (arkistoitu)"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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 ""
+"Tämän vapaasti saatavan, ajan tasalla olevan kirjan tavoitteena on\n"
+" tutustuttaa käyttäjä Debianiin (sekä nykyiseen vakaaseen että "
+"epävakaaseen\n"
+" jakeluun). Kirja on aihepiiriltään laaja ja käsittelee järjestelmän\n"
+" asentamisen ja ylläpidon perusteita (kotona, töissä, yhdistyksissä tai\n"
+" koulussa)."
+
+#: ../../english/doc/books.data:105
+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 ""
+"Ensimmäine ranskankielinen Debian-kirja on jo viidennessä laitoksessaan. "
+"Kirjassa\n"
+" käsitellään kaikkia Debianin ylläpidon aiheita asennuksesta "
+"verkkopalvelujen\n"
+" räätälöintiin.\n"
+" Koska kirjan on kirjoittanut kaksi Debian-kehittäjää, teos voi\n"
+" kiinnostaa monia henkilöitä: aloittelijoita, jotka tutkivat\n"
+" Debiania, kokeneempia käyttäjiä, jotka etsivät vinkkejä\n"
+" Debian-työkalujen käyttötaitojen kehittämiseen sekä ylläpitäjiä, jotka\n"
+" haluavat rakentaa luotettavan verkon Debianin varaan."
+
+#: ../../english/doc/books.data:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/finnish/po/newsevents.fi.po b/finnish/po/newsevents.fi.po
index fa37eda620c..576019c8e82 100644
--- a/finnish/po/newsevents.fi.po
+++ b/finnish/po/newsevents.fi.po
@@ -9,66 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Debian-uutiset"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Debianin tuoreimmat uutiset"
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "s. <get-var page />"
-
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr "Uutiskirje Debian-yhteisölle"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Otsikko:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Tekijä:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Kieli:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Päiväys:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Tapahtuma:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Kalvot:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "lähdekoodi"
-
-#: ../../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 "Tiivistelmä"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Tulevia tapahtumia"
@@ -127,6 +67,127 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (poistettu osoite)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr ""
+"Uutiskirjeen <a href=\"../../\">vanhoja numeroita</a> on myös saatavilla."
+
+#. 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 ""
+"Debianin projektikatsausta toimittaa <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 ""
+"Debianin projektikatsausta toimittavat <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 ""
+"Tämän Debianin projektikatsauksen toimitti <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 ""
+"Tämän Debianin projektikatsauksen toimittivat <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 "Tämän numeron käänsi %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 "Tämän numeron käänsivät %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 "Tämän numeron käänsi %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 "Tämän numeron käänsivät %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 ""
+"Saadaksesi tämän uutiskirjeen viikottain postilaatikkoosi, <a href=\"https://"
+"lists.debian.org/debian-news/\">liity debian-news-postilistalle</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 ""
+"Debianin viikkokatsausta toimittaa <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 ""
+"Debianin viikkokatsausta toimittavat <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 ""
+"Debianin viikkokatsausta toimittaa <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 ""
+"Debianin viikkokatsausta toimittavat <a href=\"mailto:dwn@debian.org\">%s</"
+"a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -308,130 +369,65 @@ msgid ""
"the following topics:"
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 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>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "s. <get-var page />"
-#: ../../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 ""
-"Uutiskirjeen <a href=\"../../\">vanhoja numeroita</a> on myös saatavilla."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Otsikko:"
-#. 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 ""
-"Debianin projektikatsausta toimittaa <a href=\"mailto:debian-publicity@lists."
-"debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Tekijä:"
-#. 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 ""
-"Debianin projektikatsausta toimittavat <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Kieli:"
-#. 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 ""
-"Tämän Debianin projektikatsauksen toimitti <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Päiväys:"
-#. 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 ""
-"Tämän Debianin projektikatsauksen toimittivat <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Tapahtuma:"
-#. 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 "Tämän numeron käänsi %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Kalvot:"
-#. 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 "Tämän numeron käänsivät %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "lähdekoodi"
-#. 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 "Tämän numeron käänsi %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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 "Tämän numeron käänsivät %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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 ""
-"Saadaksesi tämän uutiskirjeen viikottain postilaatikkoosi, <a href=\"https://"
-"lists.debian.org/debian-news/\">liity debian-news-postilistalle</a>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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 ""
-"Debianin viikkokatsausta toimittaa <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Tiivistelmä"
-#. 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 ""
-"Debianin viikkokatsausta toimittavat <a href=\"mailto:dwn@debian.org\">%s</"
-"a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Debian-uutiset"
-#. 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 ""
-"Debianin viikkokatsausta toimittaa <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Debianin tuoreimmat uutiset"
-#. 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 ""
-"Debianin viikkokatsausta toimittavat <a href=\"mailto:dwn@debian.org\">%s</"
-"a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Uutiskirje Debian-yhteisölle"
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/finnish/po/organization.fi.po b/finnish/po/organization.fi.po
index 5f1426cbb11..e83694533e9 100644
--- a/finnish/po/organization.fi.po
+++ b/finnish/po/organization.fi.po
@@ -42,13 +42,13 @@ msgid "manager"
msgstr "johtaja"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Vakaan versiojohtajat"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "velho"
@@ -56,7 +56,6 @@ msgstr "velho"
#. we only use the chair tag once, for techctte, I wonder why it's here.
#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "puheenjohtaja"
@@ -77,29 +76,28 @@ msgid "role"
msgstr ""
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Virkailijat"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Jakelu"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Julkisuus"
@@ -113,138 +111,132 @@ msgstr ""
msgid "Support and Infrastructure"
msgstr "Tuki ja infrastruktuuri"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr "Debianin puhtaat sekoitukset"
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Päällikkö"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Tekninen komitea"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "sihteeri"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Kehitysprojektit"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP-arkistot"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
#, fuzzy
-#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP-hallinto"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "FTP-avustajat"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Takaisinsiirrokset"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Takaisinsiirrosryhmä"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Versiohallinto"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Julkaisuryhmä"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Laadunvalvonta"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Käynnistyslevykkeet"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr ""
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Julkistusmuistio"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD-raakakopiot"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Tuotanto"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testaus"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr ""
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Automattikääntäjien infrastruktuuri"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Wanna-build-ryhmä"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Buildd-ylläpito"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentointi"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "WNPP-luettelo"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Siirrokset"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Erityisvaatimusprojektit"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Kannettavat"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Palomuurit"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Sulautetut järjestelmät"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Lehdistösihteeri"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "WWW-sivusto"
@@ -270,7 +262,6 @@ msgstr "Tapahtumat"
#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Tekninen komitea"
@@ -336,7 +327,6 @@ msgstr "Postituslistojen hallinto ja arkistointi"
#: ../../english/intro/organization.data:422
#, fuzzy
-#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Uusien ylläpitäjien vastaanotto"
@@ -413,48 +403,43 @@ msgstr "Pakettiseurantajärjestelmä"
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Alioth-ylläpitäjät"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "Debian lapsille (1-99 v)"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debianin puhtaat sekoitukset"
+
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian lapsille (1-99 v)"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "Debian terveydenhuollossa"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian terveydenhuollossa"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "Debian oppilaitoksille"
+#~ msgid "Debian for education"
+#~ msgstr "Debian oppilaitoksille"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "Debian lakitoimistoille"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian lakitoimistoille"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "Debian toimintarajoitteisille henkilöille"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian toimintarajoitteisille henkilöille"
-#: ../../english/intro/organization.data:520
#, fuzzy
-#| msgid "Debian for medical practice and research"
-msgid "Debian for science and related research"
-msgstr "Debian terveydenhuollossa"
+#~| msgid "Debian for medical practice and research"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian terveydenhuollossa"
-#: ../../english/intro/organization.data:523
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian oppilaitoksille"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian oppilaitoksille"
#~ msgid "Alioth administrators"
#~ msgstr "Alioth-ylläpitäjät"
diff --git a/finnish/po/others.fi.po b/finnish/po/others.fi.po
index 7f64f1c6752..bc1029554e5 100644
--- a/finnish/po/others.fi.po
+++ b/finnish/po/others.fi.po
@@ -57,42 +57,6 @@ msgstr "<void id=\"d-i\" />Tuntematon"
msgid "Unavailable"
msgstr "Ei saatavilla"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Uuden jäsenen nurkkaus"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Vaihe 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Vaihe 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Vaihe 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Vaihe 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Vaihe 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Vaihe 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Vaihe 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Hakijan muistilista"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -128,6 +92,34 @@ msgstr "Faksi"
msgid "Address"
msgstr "Osoite"
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "Mukana&nbsp;\"Debian\""
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "Ilman&nbsp;\"Debian\":ia"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "Kapseloitu PostScript"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Käytössä Debian]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Käytössä Debian GNU/Linux]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Debian-käyttöinen]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (pieni logo)"
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Tuotteet"
@@ -216,33 +208,85 @@ msgstr ""
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "Mukana&nbsp;\"Debian\""
+#: ../../english/y2k/l10n.data:6
+msgid "OK"
+msgstr "OK"
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "Ilman&nbsp;\"Debian\":ia"
+#: ../../english/y2k/l10n.data:9
+msgid "BAD"
+msgstr "HUONO"
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "Kapseloitu PostScript"
+#: ../../english/y2k/l10n.data:12
+msgid "OK?"
+msgstr "OK?"
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Käytössä Debian]"
+#: ../../english/y2k/l10n.data:15
+msgid "BAD?"
+msgstr "HUONO?"
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Käytössä Debian GNU/Linux]"
+#: ../../english/y2k/l10n.data:18
+msgid "??"
+msgstr "??"
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Debian-käyttöinen]"
+#: ../../english/y2k/l10n.data:21
+msgid "Unknown"
+msgstr "Tuntematon"
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (pieni logo)"
+#: ../../english/y2k/l10n.data:24
+msgid "ALL"
+msgstr "KAIKKI"
+
+#: ../../english/y2k/l10n.data:27
+msgid "Package"
+msgstr "Paketti"
+
+#: ../../english/y2k/l10n.data:30
+msgid "Status"
+msgstr "Tila"
+
+#: ../../english/y2k/l10n.data:33
+msgid "Version"
+msgstr "Versio"
+
+#: ../../english/y2k/l10n.data:36
+msgid "URL"
+msgstr "URL"
+
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Uuden jäsenen nurkkaus"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Vaihe 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Vaihe 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Vaihe 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Vaihe 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Vaihe 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Vaihe 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Vaihe 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Hakijan muistilista"
#: ../../english/mirror/submit.inc:7
msgid "same as the above"
@@ -282,50 +326,6 @@ msgstr ""
msgid "A bit more about you..."
msgstr "Vielä vähän lisää sinusta..."
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
-msgstr "OK"
-
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
-msgstr "HUONO"
-
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
-msgstr "OK?"
-
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
-msgstr "HUONO?"
-
-#: ../../english/y2k/l10n.data:18
-msgid "??"
-msgstr "??"
-
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
-msgstr "KAIKKI"
-
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
-msgstr "Paketti"
-
-#: ../../english/y2k/l10n.data:30
-msgid "Status"
-msgstr "Tila"
-
-#: ../../english/y2k/l10n.data:33
-msgid "Version"
-msgstr "Versio"
-
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
-msgstr "URL"
-
#~ msgid "Wanted:"
#~ msgstr "Hinnat:"
diff --git a/finnish/po/partners.fi.po b/finnish/po/partners.fi.po
index db8c9e99938..644cd23a422 100644
--- a/finnish/po/partners.fi.po
+++ b/finnish/po/partners.fi.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
diff --git a/finnish/po/ports.fi.po b/finnish/po/ports.fi.po
index 87a027dd25b..f5c91e00746 100644
--- a/finnish/po/ports.fi.po
+++ b/finnish/po/ports.fi.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian Alphalle"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian PA-RISCille"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd-romput"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian IA-64:lle"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Yhteystiedot"
@@ -89,6 +73,22 @@ msgstr "Toimitus"
msgid "Systems"
msgstr "Järjestelmät"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian Alphalle"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian PA-RISCille"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd-romput"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian IA-64:lle"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD i386:lle"
diff --git a/finnish/po/security.fi.po b/finnish/po/security.fi.po
index 90da5c91cd0..4db5612a43e 100644
--- a/finnish/po/security.fi.po
+++ b/finnish/po/security.fi.po
@@ -9,42 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Debianin tietoturva"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Debianin tietoturvatiedotteet"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "K"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"<a href=\\\"undated/\\\">päiväyksettömiä</a> tietoturvatiedotteita "
-"jälkipolvien ihailtavaksi"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitren CVE-sanakirjassa:"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocuksen Bugtraq-tietokanta"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT-tiedotteet"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT:n kuvaukset haavoittuvuuksista"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Lähde:"
@@ -129,5 +93,41 @@ msgstr ""
"Muita tietoturvaviitteitä ulkoisiin tietokantoihin ei tällä hetkellä ole "
"saatavilla."
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "K"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Debianin tietoturva"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Debianin tietoturvatiedotteet"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitren CVE-sanakirjassa:"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocuksen Bugtraq-tietokanta"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT-tiedotteet"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT:n kuvaukset haavoittuvuuksista"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"<a href=\\\"undated/\\\">päiväyksettömiä</a> tietoturvatiedotteita "
+"jälkipolvien ihailtavaksi"
+
#~ msgid "CERT alerts"
#~ msgstr "CERT-varoitukset"
diff --git a/finnish/po/stats.fi.po b/finnish/po/stats.fi.po
index db2ce59b3dd..4f7811ce4ac 100644
--- a/finnish/po/stats.fi.po
+++ b/finnish/po/stats.fi.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Debianin www-sivuston käännöstilastot"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Yhteensä %d käännettävää sivua."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Yhteensä %d tavua käännettävänä."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Yhteensä %d merkkijonoa käännettävänä."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Väärä käännösversio"
@@ -42,13 +26,13 @@ msgid "The original no longer exists"
msgstr "Alkuperäistä sivua ei enää ole olemassa"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "osumalukua ei saatavilla"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "osumaa"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "osumalukua ei saatavilla"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Napsauta noutaaksesi muutostilastojen datan"
@@ -61,15 +45,6 @@ msgstr ""
msgid "Translation summary for"
msgstr "Käännösyhteenveto"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Ei käännetty"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Vanhentunut"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Käännetty"
@@ -79,6 +54,15 @@ msgstr "Käännetty"
msgid "Up to date"
msgstr "Ajan tasalla"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Vanhentunut"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Ei käännetty"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,6 +213,22 @@ msgstr "Käännetyt www-sivut (koon mukaan)"
msgid "Translation Statistics by Page Size"
msgstr "Käännöstilastot sivukoon mukaan"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Debianin www-sivuston käännöstilastot"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Yhteensä %d käännettävää sivua."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Yhteensä %d tavua käännettävänä."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Yhteensä %d merkkijonoa käännettävänä."
+
#~ msgid "Unified diff"
#~ msgstr "Unifoidut muutokset"
diff --git a/finnish/po/templates.fi.po b/finnish/po/templates.fi.po
index 0b93b46d3e1..92ad3e6d7ca 100644
--- a/finnish/po/templates.fi.po
+++ b/finnish/po/templates.fi.po
@@ -9,14 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Debian-sivusto"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Etsi Debianin www-sivustolta."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -78,7 +70,6 @@ msgstr "Ota yhteyttä"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Julkaisutiedot"
@@ -158,7 +149,6 @@ msgstr "Debian-blogi"
#: ../../english/template/debian/common_translation.wml:94
#, fuzzy
-#| msgid "Last Modified"
msgid "Last Updated"
msgstr "Viimeksi muutettu"
@@ -210,12 +200,6 @@ msgstr "versiossa 2.2"
#. your language.
#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
-#| "using_cvs\">available</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -266,6 +250,14 @@ msgstr "Tämä sivu on olemassa myös seuraavilla kielillä:"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Oletuskielen <a href=m4_HOME/intro/cn>asettamisohjeet</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Kansainvälinen Debian"
@@ -543,6 +535,14 @@ 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>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Debian-sivusto"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Etsi Debianin www-sivustolta."
+
#~ msgid "Visit the site sponsor"
#~ msgstr "Vierailethan sivuston sponsorilla"
diff --git a/finnish/po/vote.fi.po b/finnish/po/vote.fi.po
index 1f982d2d632..a546ebd929b 100644
--- a/finnish/po/vote.fi.po
+++ b/finnish/po/vote.fi.po
@@ -27,7 +27,6 @@ msgstr "Nimeämiset"
#: ../../english/template/debian/votebar.wml:25
#, fuzzy
-#| msgid "Withdrawn"
msgid "Withdrawals"
msgstr "Vedetty pois"
@@ -68,201 +67,231 @@ msgid "Proposal F Proposer"
msgstr "Ehdotuksen F ehdottaja"
#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Ehdotuksen A ehdottaja"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Ehdotuksen A ehdottaja"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Kannatukset"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Ehdotuksen A kannattajat"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Ehdotuksen B kannattajat"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Ehdotuksen C kannattajat"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Ehdotuksen D kannattajat"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Ehdotuksen E kannattajat"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Ehdotuksen F kannattajat"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Ehdotuksen A kannattajat"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Ehdotuksen A kannattajat"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Vastustus"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Teksti"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Ehdotus A"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Ehdotus B"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Ehdotus C"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Ehdotus D"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Ehdotus E"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Ehdotus F"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Ehdotus A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Ehdotus A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Vaihtoehdot"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Muutosehdotuksen tekijä"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Muutosehdotuksen kannattajat"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Muutosehdotuksen teksti"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Muutosehdotuksen A tekijä"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Muutosehdotuksen A kannattajat"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Muutosehdotuksen A teksti"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Muutosehdotuksen B tekijä"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Muutosehdotuksen B kannattajat"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Muutosehdotuksen B teksti"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "Muutosehdotuksen C tekijä"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "Muutosehdotuksen C kannattajat"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "Muutosehdotuksen C teksti"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Muutosehdotukset"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Pöytäkirjat"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Enemmistövaatimus"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Tiedot ja tilastot"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Määrävaatimus"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Vähimmäismäärä keskustelua"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Äänestyslippu"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Foorumi"
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Tulos"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Kannatusta odottavat"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Keskusteltavana"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Äänestys&nbsp;käynnissä"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Päätetty"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Vedetty pois"
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Muu"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Koti&nbsp;äänestyssivu"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Kuinka"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Ehdottaa"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Täydentää&nbsp;ehdotusta"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Seurata&nbsp;ehdotuksen&nbsp;kehitystä"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Lukea&nbsp;tulos"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Äänestää"
diff --git a/french/po/cdimage.fr.po b/french/po/cdimage.fr.po
index 20ed37b2953..1845f9f0dcc 100644
--- a/french/po/cdimage.fr.po
+++ b/french/po/cdimage.fr.po
@@ -13,20 +13,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Empreinte de la clef"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "images ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "fichiers Jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -123,3 +109,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Liste de diffusion</a> anglophone pour "
"les CD et DVD&nbsp;:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "images ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "fichiers Jigdo"
diff --git a/french/po/consultants.fr.po b/french/po/consultants.fr.po
index f0eda12df2c..373773b00a3 100644
--- a/french/po/consultants.fr.po
+++ b/french/po/consultants.fr.po
@@ -13,6 +13,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Liste des consultants"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Retour à la <a href=\"./\">page des consultants Debian</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Nom :"
@@ -67,11 +75,3 @@ msgid ""
"worldwide."
msgstr ""
"<total_consultant> consultants Debian recensés dans <total_country> pays."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Liste des consultants"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Retour à la <a href=\"./\">page des consultants Debian</a>."
diff --git a/french/po/countries.fr.po b/french/po/countries.fr.po
index 01d583630ae..da4200e675f 100644
--- a/french/po/countries.fr.po
+++ b/french/po/countries.fr.po
@@ -232,210 +232,215 @@ msgid "Kenya"
msgstr "Kenya"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazakhstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Corée"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Koweït"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazakhstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Lituanie"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxembourg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Lettonie"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Maroc"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldavie"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Monténégro"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagascar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Macédoine, République de"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongolie"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malte"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mexique"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malaisie"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Nouvelle-Calédonie"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Pays-Bas"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norvège"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Nouvelle-Zélande"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Pérou"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Polynésie française"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Philippines"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Pologne"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugal"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "La Réunion"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Roumanie"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Serbie"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Russie"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Arabie saoudite"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Suède"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapour"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovénie"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovaquie"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Thaïlande"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tadjikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunisie"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turquie"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taïwan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukraine"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "États-Unis"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Ouzbékistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Viêtnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Afrique du Sud"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/french/po/distrib.fr.po b/french/po/distrib.fr.po
index 27de79df57f..974bc472b13 100644
--- a/french/po/distrib.fr.po
+++ b/french/po/distrib.fr.po
@@ -20,97 +20,67 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Lokalize 1.5\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Mot-clé "
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Afficher "
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Rechercher sur "
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "les chemins se terminant par le mot-clé"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Noms de paquets seulement"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "les paquets contenant un fichier de ce nom"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Descriptions"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "les paquets contenant un fichier dont le nom contient le mot-clé"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Noms de paquets-sources"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "N'afficher que les correspondances exactes"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribution "
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "ancienne stable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Architecture "
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "toutes"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Rechercher"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Réinitialiser"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Rechercher sur "
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Noms de paquets seulement"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Descriptions"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Noms de paquets-sources"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "N'afficher que les correspondances exactes"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Section "
@@ -127,6 +97,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Rechercher"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Afficher "
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "les chemins se terminant par le mot-clé"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "les paquets contenant un fichier de ce nom"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "les paquets contenant un fichier dont le nom contient le mot-clé"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Architecture "
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
diff --git a/french/po/doc.fr.po b/french/po/doc.fr.po
index 65186f1b9c7..d59ae39323e 100644
--- a/french/po/doc.fr.po
+++ b/french/po/doc.fr.po
@@ -25,6 +25,121 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Lokalize 2.0\n"
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Auteur :"
+
+#: ../../english/doc/books.def:41
+msgid "Debian Release:"
+msgstr "Version de Debian :"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "Courrier électronique :"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Disponible à :"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "CD inclus :"
+
+#: ../../english/doc/books.def:54
+msgid "Publisher:"
+msgstr "Éditeur :"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Auteurs :"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Éditeurs :"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Responsable :"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "État :"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Disponibilité :"
+
+#: ../../english/doc/manuals.defs:97
+msgid "Latest version:"
+msgstr "Dernière version :"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(version <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "texte seul"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"Les dernières sources au format <get-var srctype /> sont disponibles dans le "
+"dépôt <a href=\"https://packages.debian.org/git\">Git</a>."
+
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Interface web : "
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "Interface du système de gestion de versions : "
+
+#: ../../english/doc/manuals.defs:177
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+"Les dernières sources au format <get-var srctype /> sont disponibles dans le "
+"dépôt <a href=\"https://packages.debian.org/cvs\">CVS</a>."
+
+#: ../../english/doc/manuals.defs:185
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a> repository."
+msgstr ""
+"Les dernières sources au format <get-var srctype /> sont disponibles dans le "
+"dépôt <a href=\"https://packages.debian.org/subversion\">Subversion</a>."
+
+#: ../../english/doc/manuals.defs:203
+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 ""
+"Copie de travail des sources CVS : positionnez <code>CVSROOT</code> à <kbd>:"
+"ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>, et récupérez le "
+"module <kbd>boot-floppies/documentation</kbd>."
+
+#: ../../english/doc/manuals.defs:208
+msgid "CVS via web"
+msgstr "Accès CVS par le web"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Paquet Debian"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Paquet Debian (archivé)"
+
#: ../../english/doc/books.data:32
msgid ""
"\n"
@@ -174,121 +289,6 @@ msgstr ""
"Symantec, y\n"
" compris le système de détection d'intrusion Snort."
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Auteur :"
-
-#: ../../english/doc/books.def:41
-msgid "Debian Release:"
-msgstr "Version de Debian :"
-
-#: ../../english/doc/books.def:44
-msgid "email:"
-msgstr "Courrier électronique :"
-
-#: ../../english/doc/books.def:48
-msgid "Available at:"
-msgstr "Disponible à :"
-
-#: ../../english/doc/books.def:51
-msgid "CD Included:"
-msgstr "CD inclus :"
-
-#: ../../english/doc/books.def:54
-msgid "Publisher:"
-msgstr "Éditeur :"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Auteurs :"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Éditeurs :"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Responsable :"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "État :"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Disponibilité :"
-
-#: ../../english/doc/manuals.defs:97
-msgid "Latest version:"
-msgstr "Dernière version :"
-
-#: ../../english/doc/manuals.defs:113
-msgid "(version <get-var version />)"
-msgstr "(version <get-var version />)"
-
-#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "texte seul"
-
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:193
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"Les dernières sources au format <get-var srctype /> sont disponibles dans le "
-"dépôt <a href=\"https://packages.debian.org/git\">Git</a>."
-
-#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
-#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
-#: ../../english/doc/manuals.defs:195
-msgid "Web interface: "
-msgstr "Interface web : "
-
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
-#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
-#: ../../english/doc/manuals.defs:196
-msgid "VCS interface: "
-msgstr "Interface du système de gestion de versions : "
-
-#: ../../english/doc/manuals.defs:177
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/cvs\">Cvs</a> repository."
-msgstr ""
-"Les dernières sources au format <get-var srctype /> sont disponibles dans le "
-"dépôt <a href=\"https://packages.debian.org/cvs\">CVS</a>."
-
-#: ../../english/doc/manuals.defs:185
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/subversion\">Subversion</a> repository."
-msgstr ""
-"Les dernières sources au format <get-var srctype /> sont disponibles dans le "
-"dépôt <a href=\"https://packages.debian.org/subversion\">Subversion</a>."
-
-#: ../../english/doc/manuals.defs:203
-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 ""
-"Copie de travail des sources CVS : positionnez <code>CVSROOT</code> à <kbd>:"
-"ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>, et récupérez le "
-"module <kbd>boot-floppies/documentation</kbd>."
-
-#: ../../english/doc/manuals.defs:208
-msgid "CVS via web"
-msgstr "Accès CVS par le web"
-
-#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
-msgid "Debian package"
-msgstr "Paquet Debian"
-
-#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
-msgid "Debian package (archived)"
-msgstr "Paquet Debian (archivé)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/french/po/newsevents.fr.po b/french/po/newsevents.fr.po
index d85bf1241b4..2475809cbd5 100644
--- a/french/po/newsevents.fr.po
+++ b/french/po/newsevents.fr.po
@@ -17,67 +17,6 @@ msgstr ""
"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Actualités Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Dernières nouvelles de Debian"
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "p<get-var page />"
-
-# msgid "The newsletter for the Debian community"
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr "La lettre d'information de la communauté Debian"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Titre :"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Auteur :"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Langue :"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Date :"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Événement :"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Diapositives :"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "source"
-
-#: ../../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 "Résumé"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Attractions à venir"
@@ -136,6 +75,141 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (lien inexistant)"
+#: ../../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 ""
+"Pour recevoir cette gazette 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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr ""
+"<a href=\"../../\">Les dernières parutions</a> de cette gazette sont "
+"disponibles."
+
+#. 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 ""
+"Les Nouvelles du projet Debian sont éditées par <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 ""
+"Les Nouvelles du projet Debian sont éditées par <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\" />Ce numéro des Nouvelles du projet Debian a été édité "
+"par <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\" />Ce numéro des Nouvelles du projet Debian a été édité "
+"par <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\" />Il a été traduit par <a href=\"mailto:debian-l10n-"
+"french@lists.debian.org\">%s</a>."
+
+#. 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\" />Il a été traduit par <a href=\"mailto:debian-l10n-"
+"french@lists.debian.org\">%s</a>."
+
+#. 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\" />Il a été traduit par <a href=\"mailto:debian-"
+"l10n-french@lists.debian.org\">%s</a>."
+
+#. 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\" />Il a été traduit par <a href=\"mailto:debian-"
+"l10n-french@lists.debian.org\">%s</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 ""
+"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."
+
+#. 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 ""
+"Debian Weekly News est éditée par <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 ""
+"Debian Weekly News est éditée par <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\" />Ce numéro de la Debian Weekly News a été édité par "
+"<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\" />Ce numéro de la Debian Weekly News a été édité par <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -398,140 +472,66 @@ msgstr ""
"news />\">nouvelles diverses pour les développeurs</a> a été publiée et "
"couvre les sujets suivants :"
-#: ../../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 ""
-"Pour recevoir cette gazette 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/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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=\"../../\">Les dernières parutions</a> de cette gazette sont "
-"disponibles."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Titre :"
-#. 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 ""
-"Les Nouvelles du projet Debian sont éditées par <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Auteur :"
-#. 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 ""
-"Les Nouvelles du projet Debian sont éditées par <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Langue :"
-#. 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\" />Ce numéro des Nouvelles du projet Debian a été édité "
-"par <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Date :"
-#. 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\" />Ce numéro des Nouvelles du projet Debian a été édité "
-"par <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Événement :"
-#. 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\" />Il a été traduit par <a href=\"mailto:debian-l10n-"
-"french@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Diapositives :"
-#. 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\" />Il a été traduit par <a href=\"mailto:debian-l10n-"
-"french@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "source"
-#. 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\" />Il a été traduit par <a href=\"mailto:debian-"
-"l10n-french@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Il a été traduit par <a href=\"mailto:debian-"
-"l10n-french@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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 ""
-"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/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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 ""
-"Debian Weekly News est éditée par <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Résumé"
-#. 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 ""
-"Debian Weekly News est éditée par <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Actualités 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\" />Ce numéro de la Debian Weekly News a été édité par "
-"<a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Dernières nouvelles de 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\" />Ce numéro de la Debian Weekly News a été édité par <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+# msgid "The newsletter for the Debian community"
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "La lettre d'information de la communauté Debian"
#~ msgid "Name:"
#~ msgstr "Nom :"
diff --git a/french/po/organization.fr.po b/french/po/organization.fr.po
index 4994da2ec07..f821b7a46f5 100644
--- a/french/po/organization.fr.po
+++ b/french/po/organization.fr.po
@@ -58,13 +58,13 @@ msgid "manager"
msgstr "responsable"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Responsable de la publication stable"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "conseiller"
@@ -91,27 +91,27 @@ msgid "role"
msgstr "rôle"
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Directeurs"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribution"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Communication et ouverture"
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr "Équipe de protection des données"
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Équipe de publicité"
@@ -125,136 +125,131 @@ msgstr "Participation dans d'autres organisations"
msgid "Support and Infrastructure"
msgstr "Assistance et infrastructure"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr "Debian Pure Blends"
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Chef du projet"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Comité technique"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Secrétaire"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Projets de développement"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Archives FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "Responsables du FTP"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Assistants pour le FTP"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Conseillers pour le FTP"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Rétroportages"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Équipe en charge des rétroportages"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Organisation des nouvelles versions"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Équipe de publication"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Assurance qualité"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Équipe du système d'installation"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr "Équipe Debian Live"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Notes de publication"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Images CD"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Production"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Test"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr "Équipe pour l'informatique dématérialisée"
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infrastructure des empaqueteurs automatiques"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Équipe en charge de wanna-build"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Administration des démons de construction"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Documentation"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Liste des paquets en souffrance et paquets souhaités"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Portages"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Configurations spéciales"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Portables"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Pare-feux"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Systèmes embarqués"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Contact presse"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Pages web"
@@ -428,44 +423,40 @@ msgstr "Système de suivi de paquets"
msgid "Treasurer"
msgstr "Trésorier"
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Demandes d'utilisation de <a name=\"trademark\" href=\"m4_HOME/trademark"
"\">marque déposée</a>"
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Administration de Salsa"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "Debian pour les enfants de 1 à 99 ans"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
+
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian pour les enfants de 1 à 99 ans"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "Debian pour la pratique médicale et la recherche"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian pour la pratique médicale et la recherche"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "Debian pour l'éducation"
+#~ msgid "Debian for education"
+#~ msgstr "Debian pour l'éducation"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "Debian dans les organismes juridiques"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian dans les organismes juridiques"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "Debian pour les personnes handicapées"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian pour les personnes handicapées"
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr "Debian pour la science et la recherche associée"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian pour la science et la recherche associée"
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr "Debian pour l'astronomie"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian pour l'astronomie"
#~ msgid "Individual Packages"
#~ msgstr "Paquets individuels"
diff --git a/french/po/others.fr.po b/french/po/others.fr.po
index 889dade8296..488f07e7961 100644
--- a/french/po/others.fr.po
+++ b/french/po/others.fr.po
@@ -64,42 +64,6 @@ msgstr "<void id=\"d-i\" />Inconnu"
msgid "Unavailable"
msgstr "Non disponible"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Le coin des nouveaux membres"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Étape 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Étape 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Étape 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Étape 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Étape 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Étape 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Étape 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Liste de contrôle pour les candidats"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -135,6 +99,34 @@ msgstr "Fax"
msgid "Address"
msgstr "Adresse"
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "Avec « Debian »"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "Sans « Debian »"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "PostScript encapsulé"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Fonctionnant sous Debian]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Fonctionnant sous Debian GNU/Linux]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Fonctionnant sous Debian]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (mini-bouton)"
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Produits"
@@ -225,33 +217,85 @@ msgstr ""
"Argent utilisé pour organiser des évènements locaux à propos du logiciel "
"libre"
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "Avec « Debian »"
+#: ../../english/y2k/l10n.data:6
+msgid "OK"
+msgstr "OK"
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "Sans « Debian »"
+#: ../../english/y2k/l10n.data:9
+msgid "BAD"
+msgstr "MAL"
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "PostScript encapsulé"
+#: ../../english/y2k/l10n.data:12
+msgid "OK?"
+msgstr "OK ?"
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Fonctionnant sous Debian]"
+#: ../../english/y2k/l10n.data:15
+msgid "BAD?"
+msgstr "MAL ?"
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Fonctionnant sous Debian GNU/Linux]"
+#: ../../english/y2k/l10n.data:18
+msgid "??"
+msgstr "??"
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Fonctionnant sous Debian]"
+#: ../../english/y2k/l10n.data:21
+msgid "Unknown"
+msgstr "Inconnu"
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (mini-bouton)"
+#: ../../english/y2k/l10n.data:24
+msgid "ALL"
+msgstr "TOUS"
+
+#: ../../english/y2k/l10n.data:27
+msgid "Package"
+msgstr "Paquet"
+
+#: ../../english/y2k/l10n.data:30
+msgid "Status"
+msgstr "État"
+
+#: ../../english/y2k/l10n.data:33
+msgid "Version"
+msgstr "Version"
+
+#: ../../english/y2k/l10n.data:36
+msgid "URL"
+msgstr "URL"
+
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Le coin des nouveaux membres"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Étape 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Étape 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Étape 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Étape 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Étape 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Étape 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Étape 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Liste de contrôle pour les candidats"
#: ../../english/mirror/submit.inc:7
msgid "same as the above"
@@ -292,50 +336,6 @@ msgstr ""
msgid "A bit more about you..."
msgstr "Un peu plus sur vous…"
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
-msgstr "OK"
-
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
-msgstr "MAL"
-
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
-msgstr "OK ?"
-
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
-msgstr "MAL ?"
-
-#: ../../english/y2k/l10n.data:18
-msgid "??"
-msgstr "??"
-
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
-msgstr "TOUS"
-
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
-msgstr "Paquet"
-
-#: ../../english/y2k/l10n.data:30
-msgid "Status"
-msgstr "État"
-
-#: ../../english/y2k/l10n.data:33
-msgid "Version"
-msgstr "Version"
-
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
-msgstr "URL"
-
#~ msgid "Last update"
#~ msgstr "Dernière mise à jour"
diff --git a/french/po/partners.fr.po b/french/po/partners.fr.po
index 2b2e5b9d73d..d5bb2da1a77 100644
--- a/french/po/partners.fr.po
+++ b/french/po/partners.fr.po
@@ -117,12 +117,13 @@ msgstr ""
"sécurité sur leur 2 000 m² d’aire technique."
#: ../../english/partners/partners.def:64
+#, fuzzy
msgid ""
"<a href=\"https://www.credativ.com/\">credativ</a> is an independent "
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
"<a href=\"https://www.credativ.com/\">credativ</a> est une société "
"indépendante de conseil et service depuis 1999 qui offre des services et de "
diff --git a/french/po/ports.fr.po b/french/po/ports.fr.po
index b3ae6e433fd..082997c347d 100644
--- a/french/po/ports.fr.po
+++ b/french/po/ports.fr.po
@@ -13,22 +13,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian pour Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian pour PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "CD Hurd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian pour IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Contact"
@@ -93,6 +77,22 @@ msgstr "Fournitures"
msgid "Systems"
msgstr "Systèmes"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian pour Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian pour PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "CD Hurd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian pour IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD pour i386"
diff --git a/french/po/security.fr.po b/french/po/security.fr.po
index b0a4924ef75..2247a6c0678 100644
--- a/french/po/security.fr.po
+++ b/french/po/security.fr.po
@@ -13,42 +13,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Sécurité Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Bulletins d'alerte Debian"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "Question <define-tag small_Q>Q. </define-tag>"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"annonces de sécurités <a href=\\\"undated/\\\">non datées</a>, conservées "
-"pour la postérité"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Dictionnaire CVE du Mitre&nbsp;:"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Base de données du suivi des bogues chez Securityfocus"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Alertes du CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Notes d'alerte du CERT US"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Source :"
@@ -133,3 +97,39 @@ msgid "No other external database security references currently available."
msgstr ""
"Aucune référence à une base de données externe en rapport avec la sécurité "
"n'est actuellement disponible."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Question <define-tag small_Q>Q. </define-tag>"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Sécurité Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Bulletins d'alerte Debian"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Dictionnaire CVE du Mitre&nbsp;:"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Base de données du suivi des bogues chez Securityfocus"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Alertes du CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Notes d'alerte du CERT US"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"annonces de sécurités <a href=\\\"undated/\\\">non datées</a>, conservées "
+"pour la postérité"
diff --git a/french/po/stats.fr.po b/french/po/stats.fr.po
index f9a5f983af7..e46f4d6e155 100644
--- a/french/po/stats.fr.po
+++ b/french/po/stats.fr.po
@@ -16,22 +16,6 @@ msgstr ""
"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Statistiques de traduction du site web Debian"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "%d pages sont à traduire."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "%d octets sont à traduire."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "%d chaînes sont à traduire."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Mauvaise version de traduction"
@@ -49,13 +33,13 @@ msgid "The original no longer exists"
msgstr "L'original n'existe plus"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "Nombre de visites indisponible"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "visites"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "Nombre de visites indisponible"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Cliquer pour récupérer les statistiques du différentiel"
@@ -68,15 +52,6 @@ msgstr "Créé avec <transstatslink>"
msgid "Translation summary for"
msgstr "Vue globale des traductions pour la langue :"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Non traduites"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Incomplètes"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Traduites"
@@ -86,6 +61,15 @@ msgstr "Traduites"
msgid "Up to date"
msgstr "À jour"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Incomplètes"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Non traduites"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -236,6 +220,22 @@ msgstr "Pages web traduites (par taille)"
msgid "Translation Statistics by Page Size"
msgstr "Statistiques de traduction par taille de pages"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Statistiques de traduction du site web Debian"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "%d pages sont à traduire."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "%d octets sont à traduire."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "%d chaînes sont à traduire."
+
#~ msgid "Unified diff"
#~ msgstr "Différentiel unifié"
diff --git a/french/po/templates.fr.po b/french/po/templates.fr.po
index 2a3fa55f533..4f6a64d1723 100644
--- a/french/po/templates.fr.po
+++ b/french/po/templates.fr.po
@@ -26,14 +26,6 @@ msgstr ""
"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Site web Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Chercher sur le site web Debian."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -280,6 +272,14 @@ msgstr ""
"Comment configurer la <a href=m4_HOME/intro/cn>langue par défaut du "
"document</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian et l'international"
@@ -558,6 +558,14 @@ 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>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Site web Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Chercher sur le site web Debian."
+
#~ msgid "Visit the site sponsor"
#~ msgstr "Le site de notre sponsor"
diff --git a/french/po/vote.fr.po b/french/po/vote.fr.po
index 3fbf733ec73..c950dad0b85 100644
--- a/french/po/vote.fr.po
+++ b/french/po/vote.fr.po
@@ -73,201 +73,231 @@ msgid "Proposal F Proposer"
msgstr "Déposant de la proposition F"
#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Déposant de la proposition A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Déposant de la proposition A"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Parrains"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Parrains de la proposition A"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Parrains de la proposition B"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Parrains de la proposition C"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Parrains de la proposition D"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Parrains de la proposition E"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Parrains de la proposition F"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Parrains de la proposition A"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Parrains de la proposition A"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Opposition"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Texte"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Proposition A"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Proposition B"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Proposition C"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Proposition D"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Proposition E"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Proposition F"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Proposition A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Proposition A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Choix"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Déposant de l'amendement"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Parrains de l'amendement"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Texte de l'amendement"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Déposant de l'amendement A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Parrains de l'amendement A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Texte de l'amendement A"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Déposant de l'amendement B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Parrains de l'amendement B"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Texte de l'amendement B"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "Déposant de l'amendement C"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "Parrains de l'amendement C"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "Texte de l'amendement C"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Amendements"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Compte-rendu"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Majorités requises"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Données et statistiques"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Quorum"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Discussion minimale"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Bulletin"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Résultat"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "En&nbsp;attente&nbsp;de&nbsp;sponsors"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "En&nbsp;discussion"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Vote&nbsp;ouvert"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Décidé"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Annulé"
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Autre"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Page&nbsp;d'accueil&nbsp;des&nbsp;votes"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Aide"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Soumettre&nbsp;une&nbsp;proposition"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Amender&nbsp;une&nbsp;proposition"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Appuyer&nbsp;une&nbsp;proposition"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Lire&nbsp;un&nbsp;résultat"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Vote"
diff --git a/galician/po/cdimage.gl.po b/galician/po/cdimage.gl.po
index 44913225a4e..3852c9779b1 100644
--- a/galician/po/cdimage.gl.po
+++ b/galician/po/cdimage.gl.po
@@ -12,20 +12,6 @@ msgstr ""
"X-Generator: Lokalize 1.4\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Pegada dixital da chave"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "Imaxes ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Ficheiros «Jigdo»"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -122,3 +108,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Lista de correo pública</a> de fala "
"inglesa para CDs/DVDs:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "Imaxes ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Ficheiros «Jigdo»"
diff --git a/galician/po/consultants.gl.po b/galician/po/consultants.gl.po
index ef46baa5eda..65d7db330e4 100644
--- a/galician/po/consultants.gl.po
+++ b/galician/po/consultants.gl.po
@@ -12,6 +12,14 @@ msgstr ""
"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+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>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Nome:"
@@ -67,11 +75,3 @@ msgid ""
msgstr ""
"Hai listados <total_consultant> asesores técnicos de Debian en "
"<total_country> países de todo o mundo."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-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/countries.gl.po b/galician/po/countries.gl.po
index ca4a8bca665..f40cf6a3b8a 100644
--- a/galician/po/countries.gl.po
+++ b/galician/po/countries.gl.po
@@ -221,210 +221,215 @@ msgid "Kenya"
msgstr "Quenia"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazakhstán"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Corea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuvait"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazakhstán"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Lituania"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxemburgo"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Letonia"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Marrocos"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldavia"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Montenegro"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagascar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Macedonia, República de"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongolia"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "México"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malasia"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Nova Caledonia"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Países Baixos"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Noruega"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Nova Celandia"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panamá"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Perú"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Polinesia Francesa"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipinas"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Paquistán"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polonia"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugal"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Romanía"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Serbia"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusia"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Arabia Saudí"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Suecia"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapur"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Eslovenia"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Eslovaquia"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "O Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Tailandia"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Taxiquistán"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunicia"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turquía"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taiwán"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ucraína"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Estados Unidos de América"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguai"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Uzbequistán"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatú"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "África do Sur"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabue"
diff --git a/galician/po/distrib.gl.po b/galician/po/distrib.gl.po
index a7162d8ab2f..e1d690139ad 100644
--- a/galician/po/distrib.gl.po
+++ b/galician/po/distrib.gl.po
@@ -12,97 +12,67 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Palabra clave"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Mostrar"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Buscar en"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "rutas que acaben ca palabra clave"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Só nos nomes dos paquetes"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "paquetes que conteñan ficheiros con este nome"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Descricións"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "paquetes que conteñan ficheiros que conteñan a palabra clave no nome"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Nomes dos paquetes de fontes"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Mostrar só coincidencias exactas"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribución"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Arquitectura"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "calquera"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Busca"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Reiniciar"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Buscar en"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Só nos nomes dos paquetes"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Descricións"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Nomes dos paquetes de fontes"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Mostrar só coincidencias exactas"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Sección"
@@ -119,6 +89,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Busca"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Reiniciar"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Mostrar"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "rutas que acaben ca palabra clave"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "paquetes que conteñan ficheiros con este nome"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "paquetes que conteñan ficheiros que conteñan a palabra clave no nome"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Arquitectura"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -133,19 +133,16 @@ 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
#, fuzzy
-#| msgid "EABI ARM"
msgid "EABI ARM (armel)"
msgstr "EABI ARM"
#: ../../english/releases/arches.data:13
#, fuzzy
-#| msgid "Hard Float ABI ARM"
msgid "Hard Float ABI ARM (armhf)"
msgstr "Hard Float ABI ARM"
@@ -183,7 +180,6 @@ msgstr "MIPS (big endian)"
#: ../../english/releases/arches.data:22
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "MIPS (little endian)"
@@ -201,7 +197,6 @@ msgstr ""
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "MIPS (little endian)"
diff --git a/galician/po/doc.gl.po b/galician/po/doc.gl.po
index 35eee3f1213..f60f2aebb29 100644
--- a/galician/po/doc.gl.po
+++ b/galician/po/doc.gl.po
@@ -12,10 +12,126 @@ msgstr ""
"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../english/doc/books.data:31
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "paquete Debian"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "correo electrónico:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Dispoñíbel en:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "CD incluído:"
+
+#: ../../english/doc/books.def:54
+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:97
+msgid "Latest version:"
+msgstr "Última versión:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(versión <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "texto plano"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+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:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Interface web: "
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "Interface VCS: "
+
+#: ../../english/doc/manuals.defs:177
+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:185
+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:203
+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:208
+msgid "CVS via web"
+msgstr "CVS vía web"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "paquete Debian"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "paquete Debian (arquivado)"
+
+#: ../../english/doc/books.data:32
msgid ""
"\n"
-" Debian 8 is the must-have handbook for learning Linux. Start on the\n"
+" Debian 9 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"
@@ -29,22 +145,9 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
#, fuzzy
-#| 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."
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -69,7 +172,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:80
+#: ../../english/doc/books.data:83
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"
@@ -82,7 +185,7 @@ 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:101
+#: ../../english/doc/books.data:105
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"
@@ -101,7 +204,7 @@ 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:120
+#: ../../english/doc/books.data:125
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -113,14 +216,8 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:140
+#: ../../english/doc/books.data:146
#, fuzzy
-#| 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."
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 "
@@ -132,7 +229,7 @@ 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:191
+#: ../../english/doc/books.data:200
msgid ""
"Written by two penetration researcher - Annihilator, Firstblood.\n"
" This book teaches you how to build and configure Debian 8.x server system\n"
@@ -148,114 +245,6 @@ msgid ""
" intrusion detection system."
msgstr ""
-#: ../../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:38
-msgid "plain text"
-msgstr "texto plano"
-
-#: ../../english/doc/manuals.defs:154 ../../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: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: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:36
msgid "HTML"
msgstr "HTML"
diff --git a/galician/po/newsevents.gl.po b/galician/po/newsevents.gl.po
index 6ac35c40cfc..6702e159140 100644
--- a/galician/po/newsevents.gl.po
+++ b/galician/po/newsevents.gl.po
@@ -12,90 +12,6 @@ msgstr ""
"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Novas de Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Últimas novas de 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 "O boletín de novas da comunidade Debian"
-
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "Nome:"
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "Correo electrónico:"
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "Charlas anteriores:"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Idiomas:"
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Localización:"
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Temas:"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Título:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Idioma:"
-
-#: ../../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 "Presentación:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "fonte"
-
-#: ../../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 "Resumo"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Próximos eventos de interese"
@@ -154,6 +70,131 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (a ligazón xa non funciona)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr ""
+"Están dispoñíbeis <a href=\"../../\">os números antigos</a> de este boletín."
+
+#. 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\" />As novas do proxecto Debian edítaas <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\" />As novas do proxecto Debian edítanas <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\" />Este número das novas do proxecto Debian foi editado "
+"por <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\" />Este número das novas do proxecto Debian foi editado "
+"por <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\" />Foi traducido por %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\" />Foi traducido por %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\" />Foi traducido por %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\" />Foi traducido por %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 ""
+"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
+msgid ""
+"<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+msgstr ""
+"<void id=\"singular\" />As novas semanais de Debian edítanas <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\" />As novas semanais de Debian edítanas <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\" />Este número das novas semanais de Debian foi editado "
+"por <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\" />Este número das novas semanais de Debian foi editado "
+"por <a href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -406,142 +447,89 @@ msgstr ""
"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 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>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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 ""
-"Están dispoñíbeis <a href=\"../../\">os números antigos</a> de este boletín."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Título:"
-#. 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\" />As novas do proxecto Debian edítaas <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Autor:"
-#. 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\" />As novas do proxecto Debian edítanas <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Idioma:"
-#. 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\" />Este número das novas do proxecto Debian foi editado "
-"por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Data:"
-#. 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\" />Este número das novas do proxecto Debian foi editado "
-"por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Evento:"
-#. 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\" />Foi traducido por %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Presentación:"
-#. 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\" />Foi traducido por %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "fonte"
-#. 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\" />Foi traducido por %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Foi traducido por %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Lista de oradores"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Volver á <a href=\"./\">páxina de oradores de Debian</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Resumo"
-#: ../../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 ""
-"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/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Novas de Debian"
-#. 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\" />As novas semanais de Debian edítanas <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Últimas novas de 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\" />As novas semanais de Debian edítanas <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "O boletín de novas da comunidade 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\" />Este número das novas semanais de Debian foi editado "
-"por <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Name:"
+#~ msgstr "Nome:"
-#. 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\" />Este número das novas semanais de Debian foi editado "
-"por <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Email:"
+#~ msgstr "Correo electrónico:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "Charlas anteriores:"
+
+#~ msgid "Languages:"
+#~ msgstr "Idiomas:"
+
+#~ msgid "Location:"
+#~ msgstr "Localización:"
+
+#~ msgid "Topics:"
+#~ msgstr "Temas:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "Lista de oradores"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Volver á <a href=\"./\">páxina de oradores de Debian</a>."
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/galician/po/organization.gl.po b/galician/po/organization.gl.po
index 95a30e17ab8..8cfe56eb2cb 100644
--- a/galician/po/organization.gl.po
+++ b/galician/po/organization.gl.po
@@ -45,281 +45,327 @@ msgid "manager"
msgstr "xestor"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Xestor da versión estable"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "mago"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "presidente"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "asistente"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "secretario"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Dirixentes"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribución"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Publicidade"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Asistencia e infraestrutura"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr "Debian Pure Blends"
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Líder"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Comité técnico"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Secretaría"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Proxectos de desenvolvemento"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Arquivos FTP"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "Xestores do FTP"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Asistentes do FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Magos do FTP"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Equipo de backports"
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Paquetes individuais"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Xestión das publicacións"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Equipo de publicación"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Garantía de calidade"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Equipo do sistema de instalación"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Notas da publicación"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Imaxes de CD"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produción"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Probas"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infraestrutura de construción automática"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Equipo de peticións de construción"
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Administración de buildd"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Documentación"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Lista de paquetes que precisan traballo e por crear"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Adaptacións"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Configuracións especiais"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Portátiles"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Devasas"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Sistemas embebidos"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Contacto coa prensa"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Páxinas web"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Planeta Debian"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Proxecto muller Debian"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr "Anti-acoso"
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Eventos"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Comité técnico"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Programa de socios"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Coordinador das doazóns de hardware"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Asistencia ao usuario"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Sistema de seguimento dos informes de fallos"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administración das listas de correo o dos seus arquivos"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr "Recepción de novos membros"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Xestores de contas de Debian"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Mantedores dos chaveiros (PGP e GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Equipo de seguridade"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Páxina de asesores técnicos"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "Páxina de vendedores de CDs"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Políticas"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Administración de sistemas"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -328,7 +374,7 @@ msgstr ""
"de Debian, incluídos problemas cos contrasinais ou se precisa que se instale "
"un paquete."
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:469
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 "
@@ -338,68 +384,65 @@ 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:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "Administrador do directorio LDAP de desenvolvedores"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Réplicas"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "Mantedor do DNS"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Sistema de seguimento de paquetes"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
#, 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:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Administradores de alioth"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Debian para nenos de 1 a 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Debian para práctica e investigación médica"
+#~ msgid "Individual Packages"
+#~ msgstr "Paquetes individuais"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Debian para a educación"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian para nenos de 1 a 99"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Debian en oficinas legais"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian para práctica e investigación médica"
+
+#~ msgid "Debian for education"
+#~ msgstr "Debian para a educación"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian en oficinas legais"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Debian para persoas con discapacidades"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian para persoas con discapacidades"
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr "Debian para investigación científica e relacionada"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian para investigación científica e relacionada"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian para a educación"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian para a educación"
#~ msgid "Live System Team"
#~ msgstr "Equipo do sistema Live"
diff --git a/galician/po/others.gl.po b/galician/po/others.gl.po
index 8b5f812f659..4c4ce8ea61f 100644
--- a/galician/po/others.gl.po
+++ b/galician/po/others.gl.po
@@ -60,42 +60,6 @@ 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> "
@@ -159,130 +123,94 @@ 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
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Produtos"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "Camisetas"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "sombreiros"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "adhesivos"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "cuncas"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "outra roupa"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "camisetas de manga longa"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "discos"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "alfrombriñas para o rato"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "chapas"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "canastras"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "pendentes"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "maletas"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "paraugas"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "fundas para almofadas"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "cadeas de chaves"
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "Navallas suízas"
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr ""
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "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"
@@ -327,6 +255,78 @@ 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/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 "Where:"
#~ msgstr "Onde:"
diff --git a/galician/po/partners.gl.po b/galician/po/partners.gl.po
index 021ae624d61..644cd23a422 100644
--- a/galician/po/partners.gl.po
+++ b/galician/po/partners.gl.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/galician/po/ports.gl.po b/galician/po/ports.gl.po
index 7741172577f..90c6a4d5db1 100644
--- a/galician/po/ports.gl.po
+++ b/galician/po/ports.gl.po
@@ -12,22 +12,6 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian para Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian para PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "CDs de Hurd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian para IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Contacto"
@@ -92,6 +76,22 @@ msgstr "Subministro"
msgid "Systems"
msgstr "Sistemas"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian para Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian para PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "CDs de Hurd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian para IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD para i386"
diff --git a/galician/po/security.gl.po b/galician/po/security.gl.po
index ef9863cd31f..42b4c86fedc 100644
--- a/galician/po/security.gl.po
+++ b/galician/po/security.gl.po
@@ -12,42 +12,6 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Seguridade de Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Avisos de seguridade de 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 ""
-"avisos de seguridade <a href=\\\"undated/\\\">sen data</a>, incluídos como "
-"referencia para a posteridade"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Dicionario de CVE de Mitre"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Base de datos Bugtraq de Securityfocus"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Avisos do CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Notas de vulnerabilidades de US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Fonte:"
@@ -131,3 +95,39 @@ msgid "No other external database security references currently available."
msgstr ""
"Non están dispoñíbeis outras referencias de bases de datos de seguridade "
"externas."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Q"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Seguridade de Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Avisos de seguridade de Debian"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Dicionario de CVE de Mitre"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Base de datos Bugtraq de Securityfocus"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Avisos do CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Notas de vulnerabilidades de US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"avisos de seguridade <a href=\\\"undated/\\\">sen data</a>, incluídos como "
+"referencia para a posteridade"
diff --git a/galician/po/stats.gl.po b/galician/po/stats.gl.po
index 35670add89a..382e3a3716b 100644
--- a/galician/po/stats.gl.po
+++ b/galician/po/stats.gl.po
@@ -12,22 +12,6 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Estatísticas de tradución do sitio web de Debian"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Hai %d páxinas por traducir."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Hai %d bytes por traducir."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Hai %d cadeas por traducir."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "A versión da tradución é incorrecta"
@@ -45,13 +29,13 @@ msgid "The original no longer exists"
msgstr "O orixinal xa non existe"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "non hai número de visitas"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "visitas"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "non hai número de visitas"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Pulse para obter datos de «diffstat»"
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr "Resumo da tradución para o"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Sen traducir"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Desfasado"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Traducido"
@@ -82,6 +57,15 @@ msgstr "Traducido"
msgid "Up to date"
msgstr "Actualizado"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Desfasado"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Sen traducir"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -232,6 +216,22 @@ msgstr "Páxinas web traducidas (por tamaño)"
msgid "Translation Statistics by Page Size"
msgstr "Estatísticas de tradución por tamaño de páxina"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Estatísticas de tradución do sitio web de Debian"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Hai %d páxinas por traducir."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Hai %d bytes por traducir."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Hai %d cadeas por traducir."
+
#~ msgid "Created with"
#~ msgstr "Creado con"
diff --git a/galician/po/templates.gl.po b/galician/po/templates.gl.po
index b439f74610b..06e66387358 100644
--- a/galician/po/templates.gl.po
+++ b/galician/po/templates.gl.po
@@ -12,14 +12,6 @@ msgstr ""
"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Sitio web de Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Busca no sitio web de Debian"
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -82,7 +74,6 @@ msgstr "Contacto"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Información da publicación"
@@ -160,6 +151,11 @@ msgstr "Obter Debian"
msgid "The Debian Blog"
msgstr "A bitácora de Debian"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Modificado por última vez"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -205,14 +201,8 @@ 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
-#| "using_cvs\">available</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -226,29 +216,29 @@ 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:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Modificado por última vez"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Copyright"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> e outras;"
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -267,6 +257,14 @@ msgstr ""
"Como configurar <a href=m4_HOME/intro/cn>o idioma predeterminado do "
"documento</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian internacional"
@@ -313,7 +311,6 @@ msgstr "Libros de Debian"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Debian"
msgid "Debian Wiki"
msgstr "Debian"
@@ -423,7 +420,6 @@ msgstr "Vendedores de CDs"
#: ../../english/template/debian/links.tags.wml:125
#, fuzzy
-#| msgid "CD ISO images"
msgid "CD/USB ISO images"
msgstr "Imaxes ISO de CD"
@@ -499,6 +495,15 @@ msgstr "(nova revisión)"
msgid "Report"
msgstr "Informe"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -534,9 +539,17 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Volver á <a href=\"../\">páxina «Quen está a usar Debian?»</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Sitio web de Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Busca no sitio web de Debian"
+
#~ msgid "Visit the site sponsor"
#~ msgstr "Visite o sitio do patrocinador"
diff --git a/galician/po/vendors.gl.po b/galician/po/vendors.gl.po
index 1fbfa8cbf3a..1d52e582471 100644
--- a/galician/po/vendors.gl.po
+++ b/galician/po/vendors.gl.po
@@ -22,7 +22,6 @@ msgstr "Permite contribucións"
#: ../../english/CD/vendors/vendors.CD.def:16
#, fuzzy
-#| msgid "CD/DVD"
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD"
diff --git a/galician/po/vote.gl.po b/galician/po/vote.gl.po
index 7476816f994..f6662f7caf0 100644
--- a/galician/po/vote.gl.po
+++ b/galician/po/vote.gl.po
@@ -29,243 +29,275 @@ msgid "Nominations"
msgstr "Nomeamentos"
#: ../../english/template/debian/votebar.wml:25
+#, fuzzy
+msgid "Withdrawals"
+msgstr "Retirada"
+
+#: ../../english/template/debian/votebar.wml:28
msgid "Debate"
msgstr "Debate"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr "Plataformas"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposer"
msgstr "Propoñente"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr "Propoñente da proposta A"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr "Propoñente da proposta B"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr "Propoñente da proposta B"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr "Propoñente da proposta D"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr "Propoñente da proposta E"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr "Propoñente da proposta F"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Propoñente da proposta A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Propoñente da proposta A"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Avalistas"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Avalan a proposta A"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Avalan a proposta B"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Avalan a proposta C"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Avalan a proposta D"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Avalan a proposta E"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Avalan a proposta F"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Avalan a proposta A"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Avalan a proposta A"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Oposición"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Texto"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Proposta A"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Proposta B"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Proposta C"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Proposta D"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Proposta E"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Proposta F"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Proposta A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Proposta A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Opcións"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Propoñente de emendas"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Avalistas da emenda"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Texto da emenda"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Propoñente de emenda A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Avalistas da emenda A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Texto da emenda A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Propoñente de emenda B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Avalistas da emenda B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Texto da emenda B"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
#, fuzzy
-#| msgid "Amendment Proposer A"
msgid "Amendment Proposer C"
msgstr "Propoñente de emenda A"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
#, fuzzy
-#| msgid "Amendment Seconds A"
msgid "Amendment Seconds C"
msgstr "Avalistas da emenda A"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
#, fuzzy
-#| msgid "Amendment Text A"
msgid "Amendment Text C"
msgstr "Texto da emenda A"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Emendas"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Procedementos"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Requirimento de maioría"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Datos e estatísticas"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Quórum"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Discusión mínima"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Votación"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Foro"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Resultado"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Agardando&nbsp;por&nbsp;patrocinadores"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "En&nbsp;discusión"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Votación&nbps;aberta"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Decidida"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Retirada"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Outra"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Páxina de inicio das votacións"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Receita"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Enviar unha proposta"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Emendar unha proposta"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Seguir unha proposta"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Ler un resultado"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Votar"
diff --git a/german/po/cdimage.de.po b/german/po/cdimage.de.po
index 2a8bc4e3373..0d91994d409 100644
--- a/german/po/cdimage.de.po
+++ b/german/po/cdimage.de.po
@@ -14,20 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Schl.-Fingerabdruck"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "ISO-Abbilder"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo-Dateien"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -124,3 +110,17 @@ msgid ""
msgstr ""
"Englischsprachige <a href=\"/MailingLists/disclaimer\">öffentliche "
"Mailingliste</a> für CDs/DVDs:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO-Abbilder"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo-Dateien"
diff --git a/german/po/consultants.de.po b/german/po/consultants.de.po
index 74d4804e4bb..ada19d54e09 100644
--- a/german/po/consultants.de.po
+++ b/german/po/consultants.de.po
@@ -14,6 +14,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Liste der Berater"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Zurück zur <a href=\"./\">Debian Beraterseite</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Name:"
@@ -69,11 +77,3 @@ msgid ""
msgstr ""
"<total_consultant> Debian-Berater aufgelistet in <total_country> Ländern "
"weltweit."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Liste der Berater"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Zurück zur <a href=\"./\">Debian Beraterseite</a>."
diff --git a/german/po/countries.de.po b/german/po/countries.de.po
index 68bc220b3d3..30ab49cfd83 100644
--- a/german/po/countries.de.po
+++ b/german/po/countries.de.po
@@ -226,210 +226,215 @@ msgid "Kenya"
msgstr "Kenia"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kasachstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Korea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuwait"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kasachstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Litauen"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxemburg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Lettland"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Marokko"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldawien"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Montenegro"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Republik Mazedonien"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongolei"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mexiko"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malaysia"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Neukaledonien"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Niederlande"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norwegen"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Neuseeland"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Französisch-Polynesien"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Philippinen"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polen"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugal"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "Réunion"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Rumänien"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Serbien"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Russland"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Saudi-Arabien"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Schweden"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapur"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slowenien"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slowakei"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "El Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Thailand"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tadschikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunesien"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Türkei"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taiwan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukraine"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Vereinigte Staaten von Amerika"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Usbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Südafrika"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Simbabwe"
diff --git a/german/po/distrib.de.po b/german/po/distrib.de.po
index 85b51645f27..6859dda1658 100644
--- a/german/po/distrib.de.po
+++ b/german/po/distrib.de.po
@@ -17,97 +17,67 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Schlüsselwort"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Zeige an"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Suche nach"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "Pfade, die mit Suchwort enden"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Nur Paketnamen"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "Pakete mit Dateien, die so benannt sind"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Beschreibungen"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "Pakete mit Dateien, deren Namen das Suchwort enthalten"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Quellpaket-Namen"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Zeige nur exakte Treffer"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distributionen"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "Experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "Unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "Testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "Stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "Oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Architektur"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "alle"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Suchen"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Zurücksetzen"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Suche nach"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Nur Paketnamen"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Beschreibungen"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Quellpaket-Namen"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Zeige nur exakte Treffer"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Abschnitte"
@@ -124,6 +94,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Suchen"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Zeige an"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "Pfade, die mit Suchwort enden"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "Pakete mit Dateien, die so benannt sind"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "Pakete mit Dateien, deren Namen das Suchwort enthalten"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Architektur"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
diff --git a/german/po/doc.de.po b/german/po/doc.de.po
index 63d52071043..72aa80cdaaf 100644
--- a/german/po/doc.de.po
+++ b/german/po/doc.de.po
@@ -17,6 +17,121 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../../english/doc/books.def:41
+msgid "Debian Release:"
+msgstr "Debian-Veröffentlichung:"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "E-Mail:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Erhältlich bei:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "Beiliegende CD:"
+
+#: ../../english/doc/books.def:54
+msgid "Publisher:"
+msgstr "Verlag:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Autoren:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Redakteure:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Betreuer:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Verfügbarkeit:"
+
+#: ../../english/doc/manuals.defs:97
+msgid "Latest version:"
+msgstr "Neueste Version:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(Version <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "Reiner Text"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"Der neueste <get-var srctype />-Quellcode ist über das <a href=\"https://"
+"packages.debian.org/git\">Git</a>-Depot verfügbar."
+
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Web-Interface: "
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "VCS-Interface: "
+
+#: ../../english/doc/manuals.defs:177
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+"Der neueste <get-var srctype />-Quellcode ist über das <a href=\"https://"
+"packages.debian.org/cvs\">Cvs</a>-Depot verfügbar."
+
+#: ../../english/doc/manuals.defs:185
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a> repository."
+msgstr ""
+"Der neueste <get-var srctype />-Quellcode ist über das <a href=\"https://"
+"packages.debian.org/subversion\">Subversion</a>-Depot verfügbar."
+
+#: ../../english/doc/manuals.defs:203
+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 ""
+"Arbeitskopie des CVS-Quellcodes: Setzen Sie <code>CVSROOT</code>\n"
+" auf <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+" und checken Sie das Modul <kbd>boot-floppies/documentation</kbd> aus."
+
+#: ../../english/doc/manuals.defs:208
+msgid "CVS via web"
+msgstr "CVS übers Web"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Debian-Paket"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Debian-Paket (archiviert)"
+
#: ../../english/doc/books.data:32
msgid ""
"\n"
@@ -158,118 +273,6 @@ msgid ""
" intrusion detection system."
msgstr ""
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/doc/books.def:41
-msgid "Debian Release:"
-msgstr "Debian-Veröffentlichung:"
-
-#: ../../english/doc/books.def:44
-msgid "email:"
-msgstr "E-Mail:"
-
-#: ../../english/doc/books.def:48
-msgid "Available at:"
-msgstr "Erhältlich bei:"
-
-#: ../../english/doc/books.def:51
-msgid "CD Included:"
-msgstr "Beiliegende CD:"
-
-#: ../../english/doc/books.def:54
-msgid "Publisher:"
-msgstr "Verlag:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Autoren:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Redakteure:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Betreuer:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Status:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Verfügbarkeit:"
-
-#: ../../english/doc/manuals.defs:97
-msgid "Latest version:"
-msgstr "Neueste Version:"
-
-#: ../../english/doc/manuals.defs:113
-msgid "(version <get-var version />)"
-msgstr "(Version <get-var version />)"
-
-#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "Reiner Text"
-
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:183
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"Der neueste <get-var srctype />-Quellcode ist über das <a href=\"https://"
-"packages.debian.org/git\">Git</a>-Depot verfügbar."
-
-#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:185
-msgid "Web interface: "
-msgstr "Web-Interface: "
-
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:170
-#: ../../english/doc/manuals.defs:178 ../../english/doc/manuals.defs:186
-msgid "VCS interface: "
-msgstr "VCS-Interface: "
-
-#: ../../english/doc/manuals.defs:167
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/cvs\">Cvs</a> repository."
-msgstr ""
-"Der neueste <get-var srctype />-Quellcode ist über das <a href=\"https://"
-"packages.debian.org/cvs\">Cvs</a>-Depot verfügbar."
-
-#: ../../english/doc/manuals.defs:175
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/subversion\">Subversion</a> repository."
-msgstr ""
-"Der neueste <get-var srctype />-Quellcode ist über das <a href=\"https://"
-"packages.debian.org/subversion\">Subversion</a>-Depot verfügbar."
-
-#: ../../english/doc/manuals.defs:193
-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 ""
-"Arbeitskopie des CVS-Quellcodes: Setzen Sie <code>CVSROOT</code>\n"
-" auf <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-" und checken Sie das Modul <kbd>boot-floppies/documentation</kbd> aus."
-
-#: ../../english/doc/manuals.defs:198
-msgid "CVS via web"
-msgstr "CVS übers Web"
-
-#: ../../english/doc/manuals.defs:202 ../../english/doc/manuals.defs:206
-msgid "Debian package"
-msgstr "Debian-Paket"
-
-#: ../../english/doc/manuals.defs:211 ../../english/doc/manuals.defs:215
-msgid "Debian package (archived)"
-msgstr "Debian-Paket (archiviert)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/german/po/newsevents.de.po b/german/po/newsevents.de.po
index 8ad322aa0b0..dca09120248 100644
--- a/german/po/newsevents.de.po
+++ b/german/po/newsevents.de.po
@@ -16,66 +16,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Debian-Nachrichten"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Neueste Nachrichten von 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 "Der Newsletter für die Debian-Gemeinschaft"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Sprache:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Datum:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Veranstaltung:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Folien:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "Quellcode"
-
-#: ../../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 "Zusammenfassung"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Kommende Veranstaltungen"
@@ -134,6 +74,130 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (toter Link)"
+#: ../../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 ""
+"Wenn Sie diesen Newsletter (auf Englisch) in Ihrer Mailbox haben wollen, <a "
+"href=\"https://lists.debian.org/debian-news/\">abonnieren Sie die "
+"Mailingliste 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 ""
+"Hier gibt es <a href=\"../../\">ältere Ausgaben</a> dieser Nachrichtenseite."
+
+#. 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 ""
+"Die Nachrichten des Debian-Projekts werden von <a href=\"mailto:debian-"
+"publicity@lists.debian.org\">%s</a> erstellt."
+
+#. 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 ""
+"Die Nachrichten des Debian-Projekts werden von <a href=\"mailto:debian-"
+"publicity@lists.debian.org\">%s</a> erstellt."
+
+#. 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 ""
+"Diese Ausgabe der Nachrichten für das Debian-Projekt wurde von <a href="
+"\"mailto:debian-publicity@lists.debian.org\">%s</a> erstellt."
+
+#. 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 ""
+"Diese Ausgabe der Nachrichten für das Debian-Projekt wurde von <a href="
+"\"mailto:debian-publicity@lists.debian.org\">%s</a> erstellt."
+
+#. 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 "Sie wurde von %s übersetzt."
+
+#. 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 "Sie wurde von %s übersetzt."
+
+#. 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 "Sie wurde von %s übersetzt."
+
+#. 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 "Sie wurde von %s übersetzt."
+
+#: ../../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 ""
+"Wenn Sie diesen Newsletter wöchentlich in Ihrer Mailbox haben wollen, <a "
+"href=\"https://lists.debian.org/debian-news-german/\">abonnieren Sie die "
+"Mailingliste debian-news-german</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 ""
+"Die wöchentlichen Debian-Nachrichten werden von <a href=\"mailto:dwn@debian."
+"org\">%s</a> erstellt."
+
+#. 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 ""
+"Die wöchentlichen Debian-Nachrichten werden von <a href=\"mailto:dwn@debian."
+"org\">%s</a> erstellt."
+
+#. 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 ""
+"Diese Ausgabe der wöchentlichen Debian-Nachrichten wurde von <a href="
+"\"mailto:dwn@debian.org\">%s</a> erstellt."
+
+#. 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 ""
+"Diese Ausgabe der wöchentlichen Debian-Nachrichten wurde von <a href="
+"\"mailto:dwn@debian.org\">%s</a> erstellt."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -395,129 +459,65 @@ msgstr ""
"news />\">unterschiedlichen Neuigkeiten für Entwickler</a> wurde "
"veröffentlicht und enthält folgende Themen:"
-#: ../../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 ""
-"Wenn Sie diesen Newsletter (auf Englisch) in Ihrer Mailbox haben wollen, <a "
-"href=\"https://lists.debian.org/debian-news/\">abonnieren Sie die "
-"Mailingliste debian-news</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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 ""
-"Hier gibt es <a href=\"../../\">ältere Ausgaben</a> dieser Nachrichtenseite."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Titel:"
-#. 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 ""
-"Die Nachrichten des Debian-Projekts werden von <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a> erstellt."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Autor:"
-#. 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 ""
-"Die Nachrichten des Debian-Projekts werden von <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a> erstellt."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Sprache:"
-#. 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 ""
-"Diese Ausgabe der Nachrichten für das Debian-Projekt wurde von <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> erstellt."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Datum:"
-#. 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 ""
-"Diese Ausgabe der Nachrichten für das Debian-Projekt wurde von <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> erstellt."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Veranstaltung:"
-#. 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 "Sie wurde von %s übersetzt."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Folien:"
-#. 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 "Sie wurde von %s übersetzt."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "Quellcode"
-#. 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 "Sie wurde von %s übersetzt."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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 "Sie wurde von %s übersetzt."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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 ""
-"Wenn Sie diesen Newsletter wöchentlich in Ihrer Mailbox haben wollen, <a "
-"href=\"https://lists.debian.org/debian-news-german/\">abonnieren Sie die "
-"Mailingliste debian-news-german</a>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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 ""
-"Die wöchentlichen Debian-Nachrichten werden von <a href=\"mailto:dwn@debian."
-"org\">%s</a> erstellt."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Zusammenfassung"
-#. 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 ""
-"Die wöchentlichen Debian-Nachrichten werden von <a href=\"mailto:dwn@debian."
-"org\">%s</a> erstellt."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Debian-Nachrichten"
-#. 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 ""
-"Diese Ausgabe der wöchentlichen Debian-Nachrichten wurde von <a href="
-"\"mailto:dwn@debian.org\">%s</a> erstellt."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Neueste Nachrichten von 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 ""
-"Diese Ausgabe der wöchentlichen Debian-Nachrichten wurde von <a href="
-"\"mailto:dwn@debian.org\">%s</a> erstellt."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Der Newsletter für die Debian-Gemeinschaft"
#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
#~ msgstr "Zurück zu <a href=\"./\">Debians Seite der Vortragenden</a>."
diff --git a/german/po/organization.de.po b/german/po/organization.de.po
index c8c6e968aa1..5acfb4ec0e7 100644
--- a/german/po/organization.de.po
+++ b/german/po/organization.de.po
@@ -51,13 +51,13 @@ msgid "manager"
msgstr "Verwalter"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Release-Manager für Stable"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "Berater"
@@ -75,226 +75,270 @@ msgstr "Assistent"
msgid "secretary"
msgstr "Schriftführer"
-#: ../../english/intro/organization.data:59
-#: ../../english/intro/organization.data:72
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Direktoren"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribution"
-#: ../../english/intro/organization.data:61
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Kommunikation und Outreach"
-#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:236
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr "Datenschutz-Team"
-#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Öffentlichkeitsarbeits-Team"
-#: ../../english/intro/organization.data:66
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Unterstützung und Infrastruktur"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:68
-msgid "Debian Pure Blends"
-msgstr "Debian Pure Blends (angepasste Debian-Distributionen)"
-
-#: ../../english/intro/organization.data:75
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Projektleiter"
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Technischer Ausschuss"
-#: ../../english/intro/organization.data:91
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Schriftführer"
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Entwicklungs-Projekte"
-#: ../../english/intro/organization.data:100
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP-Archive"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "FTP-Master"
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "FTP-Mitarbeiter"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "FTP-Berater"
-#: ../../english/intro/organization.data:117
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:119
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Backports-Team"
-#: ../../english/intro/organization.data:123
-msgid "Individual Packages"
-msgstr "Individuelle Pakete"
-
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Release-Verwaltung"
-#: ../../english/intro/organization.data:126
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Release-Team"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Qualitätssicherung"
-#: ../../english/intro/organization.data:140
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Installationssystem-Team"
-#: ../../english/intro/organization.data:141
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr "Debian-Live-Team"
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Veröffentlichungshinweise"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD-Images"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produktion"
-#: ../../english/intro/organization.data:153
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testing"
-#: ../../english/intro/organization.data:155
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr "Cloud-Team"
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Autobuilding-Infrastruktur"
-#: ../../english/intro/organization.data:161
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Wanna-build-Team"
-#: ../../english/intro/organization.data:168
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Buildd-Administration"
-#: ../../english/intro/organization.data:186
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentation"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Liste der Arbeit-bedürfenden und voraussichtlichen Pakete"
-#: ../../english/intro/organization.data:193
-msgid "Debian Live Team"
-msgstr "Debian-Live-Team"
-
-#: ../../english/intro/organization.data:194
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Portierungen"
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Spezielle Konfigurationen"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Laptops"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Firewalls"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Eingebettete Systeme"
-#: ../../english/intro/organization.data:243
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Pressekontakt"
-#: ../../english/intro/organization.data:245
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Webseiten"
-#: ../../english/intro/organization.data:255
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:260
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr "Outreach"
-#: ../../english/intro/organization.data:265
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Debian-Women-Projekt"
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr "Gegen Mobbing/Belästigung"
-#: ../../english/intro/organization.data:278
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Veranstaltungen"
-#: ../../english/intro/organization.data:285
+#: ../../english/intro/organization.data:289
msgid "DebConf Committee"
msgstr "DebConf-Ausschuss"
-#: ../../english/intro/organization.data:292
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Partner-Programm"
-#: ../../english/intro/organization.data:297
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Hardware-Spenden-Koordination"
-#: ../../english/intro/organization.data:310
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Benutzer-Unterstützung"
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Fehlerdatenbank"
-#: ../../english/intro/organization.data:382
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Mailinglisten-Verwaltung und -Archive"
-#: ../../english/intro/organization.data:390
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr "Empfang (Front desk) für neue Mitglieder"
-#: ../../english/intro/organization.data:396
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Debian-Konten-Verwalter"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -302,31 +346,31 @@ msgstr ""
"Um eine private Nachricht an alle DAMs zu schicken, verwenden Sie den GPG-"
"Schlüssel 57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:401
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Schlüsselring-Verwalter (PGP und GPG)"
-#: ../../english/intro/organization.data:405
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Sicherheitsteam"
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Beraterseite"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "CD-Distributoren-Seite"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Policy"
-#: ../../english/intro/organization.data:428
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "System-Administration"
-#: ../../english/intro/organization.data:429
+#: ../../english/intro/organization.data:460
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."
@@ -335,7 +379,7 @@ msgstr ""
"Maschinen aufgetreten sind, auch wenn es sich um Passwort-Probleme handelt "
"oder wenn neue Pakete installiert werden sollen."
-#: ../../english/intro/organization.data:438
+#: ../../english/intro/organization.data:469
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 "
@@ -346,64 +390,63 @@ msgstr ""
"Rechner</a>, sie sollte Administrator-Informationen für jede Maschine "
"enthalten."
-#: ../../english/intro/organization.data:439
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP-Entwickler-Verzeichnis-Verwalter"
-#: ../../english/intro/organization.data:440
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Spiegel"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "DNS-Verwalter"
-#: ../../english/intro/organization.data:448
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Paketverfolgungs-System"
-#: ../../english/intro/organization.data:450
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr "Schatzmeister"
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:488
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:459
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Salsa-Administratoren"
-#: ../../english/intro/organization.data:470
-msgid "Debian for children from 1 to 99"
-msgstr "Debian für Kinder von 1 bis 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends (angepasste Debian-Distributionen)"
-#: ../../english/intro/organization.data:473
-msgid "Debian for medical practice and research"
-msgstr "Debian für die medizinische Praxis und Forschung"
+#~ msgid "Individual Packages"
+#~ msgstr "Individuelle Pakete"
-#: ../../english/intro/organization.data:476
-msgid "Debian for education"
-msgstr "Debian für Bildung"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian für Kinder von 1 bis 99"
-#: ../../english/intro/organization.data:481
-msgid "Debian in legal offices"
-msgstr "Debian in Rechtsanwaltskanzleien"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian für die medizinische Praxis und Forschung"
+
+#~ msgid "Debian for education"
+#~ msgstr "Debian für Bildung"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian in Rechtsanwaltskanzleien"
-#: ../../english/intro/organization.data:485
-msgid "Debian for people with disabilities"
-msgstr "Debian für Behinderte"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian für Behinderte"
-#: ../../english/intro/organization.data:489
-msgid "Debian for science and related research"
-msgstr "Debian für die Wissenschaft und zugehörige Forschung"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian für die Wissenschaft und zugehörige Forschung"
-#: ../../english/intro/organization.data:492
-msgid "Debian for astronomy"
-msgstr "Debian für Astronomie"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian für Astronomie"
#~ msgid "Alioth administrators"
#~ msgstr "Alioth-Administratoren"
diff --git a/german/po/others.de.po b/german/po/others.de.po
index bc99e57df14..84f850faa46 100644
--- a/german/po/others.de.po
+++ b/german/po/others.de.po
@@ -64,42 +64,6 @@ msgstr "Unbekannt"
msgid "Unavailable"
msgstr "Nicht verfügbar"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Ecke für Neue Mitglieder"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Schritt 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Schritt 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Schritt 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Schritt 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Schritt 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Schritt 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Schritt 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Prüfliste für Bewerber"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -163,135 +127,96 @@ msgstr "[Debian powered]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (Mini-Button)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "identisch wie oben"
-
-#: ../../english/misc/merchandise.def:10
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Produkte"
-#: ../../english/misc/merchandise.def:13
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "T-Shirts"
-#: ../../english/misc/merchandise.def:16
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "Mützen"
-#: ../../english/misc/merchandise.def:19
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "Aufkleber"
-#: ../../english/misc/merchandise.def:22
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "Tassen"
-#: ../../english/misc/merchandise.def:25
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "andere Bekleidung"
-#: ../../english/misc/merchandise.def:28
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "Polo-Shirts"
-#: ../../english/misc/merchandise.def:31
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "Frisbees"
-#: ../../english/misc/merchandise.def:34
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "Maus-Pads"
-#: ../../english/misc/merchandise.def:37
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "Abzeichen"
-#: ../../english/misc/merchandise.def:40
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "Basketball-Körbe"
-#: ../../english/misc/merchandise.def:44
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "Ohrringe"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "Koffer"
-#: ../../english/misc/merchandise.def:50
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "Regenschirme"
-#: ../../english/misc/merchandise.def:53
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "Kissenbezüge"
-#: ../../english/misc/merchandise.def:56
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "Schlüsselanhänger"
-#: ../../english/misc/merchandise.def:59
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "Schweizer Messer"
-#: ../../english/misc/merchandise.def:62
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr "USB-Sticks"
-#: ../../english/misc/merchandise.def:77
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr "Schlüsselanhänger"
-#: ../../english/misc/merchandise.def:80
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr "Anderes"
-#: ../../english/misc/merchandise.def:101
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr "Spendet Geld an Debian"
-#: ../../english/misc/merchandise.def:106
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
"Für die Organisation von lokalen Veranstaltungen für Freie Software wird "
"Geld zur Verfügung gestellt"
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Wie lange benutzen Sie Debian bereits?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Sind Sie ein Debian-Entwickler?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "Mit welchen Bereichen von Debian befassen Sie sich?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Wodurch wurde Ihr Interesse geweckt, mit Debian zu arbeiten?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-"Haben Sie Tipps für Frauen, die Interesse daran haben, sich näher mit Debian "
-"zu beschäftigen?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-"Sind Sie an anderen Gruppen beteiligt, die Frauen und Technik zum Thema "
-"haben? Wenn ja, welche?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Etwas mehr über Sie ..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -336,6 +261,81 @@ msgstr "Version"
msgid "URL"
msgstr "Links"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Ecke für Neue Mitglieder"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Schritt 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Schritt 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Schritt 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Schritt 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Schritt 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Schritt 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Schritt 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Prüfliste für Bewerber"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "identisch wie oben"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Wie lange benutzen Sie Debian bereits?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Sind Sie ein Debian-Entwickler?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "Mit welchen Bereichen von Debian befassen Sie sich?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Wodurch wurde Ihr Interesse geweckt, mit Debian zu arbeiten?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+"Haben Sie Tipps für Frauen, die Interesse daran haben, sich näher mit Debian "
+"zu beschäftigen?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+"Sind Sie an anderen Gruppen beteiligt, die Frauen und Technik zum Thema "
+"haben? Wenn ja, welche?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Etwas mehr über Sie ..."
+
#~ msgid "Where:"
#~ msgstr "Wo:"
diff --git a/german/po/partners.de.po b/german/po/partners.de.po
index b14f77406f8..d9a2da474a2 100644
--- a/german/po/partners.de.po
+++ b/german/po/partners.de.po
@@ -113,12 +113,13 @@ msgstr ""
"mehr als 10.000 Server auf höchster Versorgungs- und Sicherheitsebene."
#: ../../english/partners/partners.def:64
+#, fuzzy
msgid ""
"<a href=\"https://www.credativ.com/\">credativ</a> is an independent "
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
"<a href=\"https://www.credativ.de\">credativ</a> ist ein "
"herstellerunabhängiges Beratungs- und Dienstleistungsunternehmen, und bietet "
@@ -263,10 +264,6 @@ msgstr ""
#: ../../english/partners/partners.def:116
#, fuzzy
-#| msgid ""
-#| "HPE is one of the largest computer companies in the world, providing a "
-#| "wide range of products and services, such as servers, storage, "
-#| "networking, consulting and support, software, and financial services."
msgid ""
"Google is one of the largest technology companies in the world, providing a "
"wide range of Internet-related services and products as online advertising "
@@ -557,15 +554,6 @@ msgstr ""
#: ../../english/partners/partners.def:236
#, fuzzy
-#| msgid ""
-#| "<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
-#| "partners that provide the infrastructure for the <a href=\"https://"
-#| "snapshot.debian.org\">Debian OS Snapshot Archive</a> since <a href="
-#| "\"https://www.debian.org/News/2014/20141014\">October 2014</a>, providing "
-#| "80 Terabytes (TB) of capacity. In 2017 they renewed their support by "
-#| "provisioning two additional dedicated servers that expanded the storage "
-#| "at their location by 50%, enough to accommodate anticipated growth for "
-#| "years to come."
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
diff --git a/german/po/ports.de.po b/german/po/ports.de.po
index 9c1484cc8b2..c4055eab2af 100644
--- a/german/po/ports.de.po
+++ b/german/po/ports.de.po
@@ -14,22 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian für Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian für PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd-CDs"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian für IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Kontakt"
@@ -94,6 +78,22 @@ msgstr "Bezugsquellen"
msgid "Systems"
msgstr "Systeme"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian für Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian für PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd-CDs"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian für IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD für i386"
diff --git a/german/po/security.de.po b/german/po/security.de.po
index a8cc6484e02..1cb51fe5698 100644
--- a/german/po/security.de.po
+++ b/german/po/security.de.po
@@ -13,42 +13,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Debian-Sicherheit"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Debian-Sicherheitsankündigung"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "F"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"<a href=\\\"undated/\\\">undatierte</a> Sicherheitsankündigungen, für die "
-"Nachwelt"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre CVE-Verzeichnis"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus-Bugtraq-Datenbank"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT-Sicherheitshinweise"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT-Verwundbarkeits-Hinweise"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Quellcode:"
@@ -132,3 +96,39 @@ msgid "No other external database security references currently available."
msgstr ""
"Im Augenblick ist keine weitere externe Sicherheitsdatenbank-Referenz "
"verfügbar."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "F"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Debian-Sicherheit"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Debian-Sicherheitsankündigung"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitre CVE-Verzeichnis"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus-Bugtraq-Datenbank"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT-Sicherheitshinweise"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT-Verwundbarkeits-Hinweise"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"<a href=\\\"undated/\\\">undatierte</a> Sicherheitsankündigungen, für die "
+"Nachwelt"
diff --git a/german/po/stats.de.po b/german/po/stats.de.po
index e899e8df96c..119c5627a6f 100644
--- a/german/po/stats.de.po
+++ b/german/po/stats.de.po
@@ -14,22 +14,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 2.0\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Übersetzungsstatistik der Debian-Website"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Es sind %d Seiten zu übersetzen."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Es sind %d Byte zu übersetzen."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Es sind %d Zeichenketten zu übersetzen."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Falsche Version übersetzt"
@@ -47,13 +31,13 @@ msgid "The original no longer exists"
msgstr "Das Original existiert nicht mehr"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "Keine Zugriffszahlen"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "Zugriffe"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "Keine Zugriffszahlen"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Klicken Sie, um diffstat-Daten zu erhalten"
@@ -66,15 +50,6 @@ msgstr "Erstellt mit <transstatslink>"
msgid "Translation summary for"
msgstr "Zusammenfassung der Übersetzung für"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Nicht übersetzt"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Veraltet"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Übersetzt"
@@ -84,6 +59,15 @@ msgstr "Übersetzt"
msgid "Up to date"
msgstr "Aktuell"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Veraltet"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Nicht übersetzt"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -235,6 +219,22 @@ msgstr "Übersetzte Webseiten (nach Größe)"
msgid "Translation Statistics by Page Size"
msgstr "Übersetzungsstatistik nach der Seitengröße"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Übersetzungsstatistik der Debian-Website"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Es sind %d Seiten zu übersetzen."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Es sind %d Byte zu übersetzen."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Es sind %d Zeichenketten zu übersetzen."
+
#~ msgid "Unified diff"
#~ msgstr "Einheitliche Unterschiede"
diff --git a/german/po/templates.de.po b/german/po/templates.de.po
index 60e92936940..15964baaf3c 100644
--- a/german/po/templates.de.po
+++ b/german/po/templates.de.po
@@ -16,14 +16,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Debian-Website"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Durchsuchen Sie die Debian-Website."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -212,7 +204,7 @@ msgstr "in Version 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:107
+#: ../../english/template/debian/footer.wml:106
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -229,29 +221,29 @@ msgstr ""
"\"m4_HOME/contact\">Kontaktseite</a>. Der Quelltext der Website ist <a href="
"\"https://salsa.debian.org/webmaster-team/webwml\">verfügbar</a>."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Zuletzt geändert"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr "Zuletzt gebaut"
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Copyright"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> und andere;"
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
msgstr ""
"weiteres in den <a href=\"m4_HOME/license\" rel=\"copyright"
"\">Lizenzbestimmungen</a>."
-#: ../../english/template/debian/footer.wml:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -268,6 +260,14 @@ msgstr "Diese Seite gibt es auch in den folgenden Sprachen:"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Wie man <a href=m4_HOME/intro/cn>die Standardsprache einstellt</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian International"
@@ -547,6 +547,14 @@ 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>«."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Debian-Website"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Durchsuchen Sie die Debian-Website."
+
#~ msgid "Visit the site sponsor"
#~ msgstr "Besuchen Sie unseren Sponsor"
diff --git a/german/po/vote.de.po b/german/po/vote.de.po
index c677fd34dea..d377ea100d2 100644
--- a/german/po/vote.de.po
+++ b/german/po/vote.de.po
@@ -72,201 +72,231 @@ msgid "Proposal F Proposer"
msgstr "Antragsteller von Vorschlag F"
#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Antragsteller von Vorschlag A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Antragsteller von Vorschlag A"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Unterstützer"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Unterstützer von Vorschlag A"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Unterstützer von Vorschlag B"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Unterstützer von Vorschlag C"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Unterstützer von Vorschlag D"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Unterstützer von Vorschlag E"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Unterstützer von Vorschlag F"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Unterstützer von Vorschlag A"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Unterstützer von Vorschlag A"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Opposition"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Text"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Vorschlag A"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Vorschlag B"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Vorschlag C"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Vorschlag D"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Vorschlag E"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Vorschlag F"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Vorschlag A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Vorschlag A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Auswahl"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Antragsteller der Ergänzung"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Unterstützer der Ergänzung"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Text der Ergänzung"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Antragsteller A der Ergänzung"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Unterstützer A der Ergänzung"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Text A der Ergänzung"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Antragsteller B der Ergänzung"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Unterstützer B der Ergänzung"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Text B der Ergänzung"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "Antragsteller C der Ergänzung"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "Unterstützer C der Ergänzung"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "Text C der Ergänzung"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Ergänzungen"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Fortgänge"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Mehrheitsanforderung"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Daten und Statistiken"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Mindestanzahl"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Mindestens erforderliche Diskussion"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Stimmzettel"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Ergebnis"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Auf Unterstützung wartend"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "In Diskussion"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "In der Abstimmung"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Entschieden"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Zurückgezogen"
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Sonstiges"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Home&nbsp;Abstimmungsseite"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Wie"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Vorschlag&nbsp;einsenden"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Vorschlag&nbsp;ergänzen"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Vorschlag&nbsp;verfolgen"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Resultat&nbsp;lesen"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Abstimmen"
diff --git a/greek/po/cdimage.el.po b/greek/po/cdimage.el.po
index 15d90265e35..c2fb85a7af5 100644
--- a/greek/po/cdimage.el.po
+++ b/greek/po/cdimage.el.po
@@ -12,20 +12,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../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:87
-msgid "ISO images"
-msgstr "εικόνες ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Αρχεία Jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -122,3 +108,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Δημόσια λίστα αλληλογραφίας</a> στα "
"Αγγλικά για CD/DVD:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "εικόνες ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Αρχεία Jigdo"
diff --git a/greek/po/consultants.el.po b/greek/po/consultants.el.po
index 1e8c0cf6081..c1f5ad6d095 100644
--- a/greek/po/consultants.el.po
+++ b/greek/po/consultants.el.po
@@ -12,6 +12,14 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\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 "Πίσω στην σελίδα των <a href=\"./\">συμβούλων του Debian</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Όνομα:"
@@ -66,11 +74,3 @@ msgid ""
"worldwide."
msgstr ""
"Υπάρχουν <total_consultant> σύμβουλοι του Debian σε <total_country> χώρες "
-
-#: ../../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 "Πίσω στην σελίδα των <a href=\"./\">συμβούλων του Debian</a>."
diff --git a/greek/po/countries.el.po b/greek/po/countries.el.po
index 3d6f13c4b15..8836d451ee0 100644
--- a/greek/po/countries.el.po
+++ b/greek/po/countries.el.po
@@ -221,210 +221,215 @@ msgid "Kenya"
msgstr "Κένυα"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Καζακστάν"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Κορέα"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Κουβέιτ"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Καζακστάν"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Σρι-Λάνκα"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Λιθουανία"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Λουξεμβούργο"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Λετονία"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Μαρόκο"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Μολδοβία"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Μαυροβούνιο"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Μαδαγασκάρη"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Μακεδονία, Δημοκρατία της"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Μογγολία"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Μάλτα"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Μεξικό"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Μαλαισία"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Νέα Καληδονία"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Νικαράγουα"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Ολλανδία"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Νορβηγία"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Νέα Ζηλανδία"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Παναμάς"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Περού"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Γαλλική Πολυνησία"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Φιλιππίνες"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Πακιστάν"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Πολωνία"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Πορτογαλία"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "Réunion"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Ρουμανία"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Σερβία"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Ρωσία"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Σαουδική Αραβία"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Σουηδία"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Σιγκαπούρη"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Σλοβενία"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Σλοβακία"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "Ελ Σαλβαδόρ"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Ταϊλάνδη"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Τατζικιστάν"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Τυνισία"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Τουρκία"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Ταΐβάν"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ουκρανία"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Ην. Πολιτείες"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Ουρουγουάη"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Ουζμπεκιστάν"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Βενεζουέλα"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Βιετνάμ"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Βανουάτου"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Νότια Αφρική"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Ζιμπάμπουε"
diff --git a/greek/po/distrib.el.po b/greek/po/distrib.el.po
index 9865967213f..e896cb0eb25 100644
--- a/greek/po/distrib.el.po
+++ b/greek/po/distrib.el.po
@@ -12,98 +12,67 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Λέξη Κλειδί"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Εμφάνιση"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Αναζήτηση σε"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "διαδρομές που τελειώνουν με τη λέξη-κλειδί"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Ονόματα πακέτων μόνο"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "πακέτα που περιέχουν ονόματα αρχείων σαν και αυτό"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Περιγραφές"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr ""
-"πακέτα που περιέχουν αρχεία που τα ονόματά τους περιέχουν τη λέξη-κλειδί"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Πακέτα πηγαίου κώδικα"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Εμφάνιση μόνο όσων ταιριάζουν ακριβώς"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Διανομή"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "πειραματική"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "ασταθής"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "δοκιμαστική"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "τρέχουσα"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "οποιοδήποτε"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Αναζήτηση"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-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"
-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:21
-msgid "Only show exact matches"
-msgstr "Εμφάνιση μόνο όσων ταιριάζουν ακριβώς"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Τομέας"
@@ -120,6 +89,37 @@ msgstr "συνεισφορές"
msgid "non-free"
msgstr "μή-ελεύθερα"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Αναζήτηση"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Επαναφορά"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Εμφάνιση"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "διαδρομές που τελειώνουν με τη λέξη-κλειδί"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "πακέτα που περιέχουν ονόματα αρχείων σαν και αυτό"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr ""
+"πακέτα που περιέχουν αρχεία που τα ονόματά τους περιέχουν τη λέξη-κλειδί"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Αρχιτεκτονική"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
diff --git a/greek/po/doc.el.po b/greek/po/doc.el.po
index 3c4a178c627..b552ead8951 100644
--- a/greek/po/doc.el.po
+++ b/greek/po/doc.el.po
@@ -12,6 +12,123 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Συγγραφέας:"
+
+#: ../../english/doc/books.def:41
+msgid "Debian Release:"
+msgstr "Έκδοση του Debian:"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "email:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Διαθέσιμο στο:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "CD που περιλαμβάνεται:"
+
+#: ../../english/doc/books.def:54
+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:97
+msgid "Latest version:"
+msgstr "Τελευταία έκδοση:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(εκδοση <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "απλό κείμενο"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+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:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Διεπαφή ιστού:"
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "Διεπαφή VCS: "
+
+#: ../../english/doc/manuals.defs:177
+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:185
+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:203
+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:208
+msgid "CVS via web"
+msgstr "CVS μέσω διαδικτύου"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Πακέτο του Debian"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Πακέτο Debian (αρχειοθετημένο)"
+
#: ../../english/doc/books.data:32
msgid ""
"\n"
@@ -187,123 +304,6 @@ msgstr ""
"Symantec antivirus, συμπεριλαμβανομένου του συστήματος ανίχνευσης "
"παραβιάσεων Snort."
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Συγγραφέας:"
-
-#: ../../english/doc/books.def:41
-msgid "Debian Release:"
-msgstr "Έκδοση του Debian:"
-
-#: ../../english/doc/books.def:44
-msgid "email:"
-msgstr "email:"
-
-#: ../../english/doc/books.def:48
-msgid "Available at:"
-msgstr "Διαθέσιμο στο:"
-
-#: ../../english/doc/books.def:51
-msgid "CD Included:"
-msgstr "CD που περιλαμβάνεται:"
-
-#: ../../english/doc/books.def:54
-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:97
-msgid "Latest version:"
-msgstr "Τελευταία έκδοση:"
-
-#: ../../english/doc/manuals.defs:113
-msgid "(version <get-var version />)"
-msgstr "(εκδοση <get-var version />)"
-
-#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "απλό κείμενο"
-
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:193
-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:161 ../../english/doc/manuals.defs:171
-#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
-#: ../../english/doc/manuals.defs:195
-msgid "Web interface: "
-msgstr "Διεπαφή ιστού:"
-
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
-#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
-#: ../../english/doc/manuals.defs:196
-msgid "VCS interface: "
-msgstr "Διεπαφή VCS: "
-
-#: ../../english/doc/manuals.defs:177
-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:185
-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:203
-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:208
-msgid "CVS via web"
-msgstr "CVS μέσω διαδικτύου"
-
-#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
-msgid "Debian package"
-msgstr "Πακέτο του Debian"
-
-#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
-msgid "Debian package (archived)"
-msgstr "Πακέτο Debian (αρχειοθετημένο)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/greek/po/newsevents.el.po b/greek/po/newsevents.el.po
index 02e6a630794..30c3c959b82 100644
--- a/greek/po/newsevents.el.po
+++ b/greek/po/newsevents.el.po
@@ -12,66 +12,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Νέα του Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Τελευταία Νέα του 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 "Το ενημερωτικό δελτίο για την κοινότητα του Debian"
-
-#: ../../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 "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 "Περίληψη"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Προσεχή ενδιαφέροντα γεγονότα"
@@ -130,6 +70,133 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (μη ενεργός σύνδεσμος)"
+#: ../../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 ""
+"Για να λαμβάνετε αυτό το ενημερωτικό δελτίο στο ηλεκτρονικό ταχυδρομείο σας "
+"<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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr ""
+"υπάρχουν διαθέσιμα <a href=\"../../\">Παλαότερα τεύχη</a> αυτού του "
+"ενημερωτικού δελτίου."
+
+#. 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 συντάσσονται από τον/την "
+"<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 συντάσσονται από τους/τις <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\" />Το παρόν τεύχος των Νέων του Σχεδίου Debian "
+"συντάχθηκε από τον/την <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\" /> Το παρόν τεύχος των Νέων του Σχεδίου Debian "
+"συντάχθηκε από τους/τις <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\" />Μεταφράστηκε από τον/την %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\" />Μεταφράστηκε από τους/τις %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\" />Μεταφράστηκε από την %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\" />Μεταφράστηκε από τις %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 ""
+"Για να λαμβάνετε αυτό το ενημερωτικό δελτίο κάθε εβδομάδα στο ηλεκτρονικό "
+"σας ταχυδρομείο <a href=\"https://lists.debian.org/debian-news/\">εγγραφείτε "
+"στην λίστα αλληλογραφίας 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\" />Τα Εβδομαδιαία Νέα του Debian συντάσσονται από τον/"
+"την <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 συντάσσονται απο τους/"
+"τις <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\" />Το παρόν τεύχος των Εβδομαδιαίων Νέων του Debian "
+"συντάχθηκε από τον/την <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\" />Το παρόν τεύχος των Εβδομαδιαίων Νέων του Debian "
+"συντάχθηκε από τους/τις <a href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -387,132 +454,65 @@ msgstr ""
"var url-devel-news />\">διάφορες ειδήσεις για τους προγραμματιστές</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 ""
-"Για να λαμβάνετε αυτό το ενημερωτικό δελτίο στο ηλεκτρονικό ταχυδρομείο σας "
-"<a href=\"https://lists.debian.org/debian-news/\"> εγγραφείτε στη λίστα "
-"αλληλογραφίας debian-news</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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=\"../../\">Παλαότερα τεύχη</a> αυτού του "
-"ενημερωτικού δελτίου."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+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>."
-msgstr ""
-"<void id=\"singular\" />Τα Νέα του Σχεδίου Debian συντάσσονται από τον/την "
-"<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+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>."
-msgstr ""
-"<void id=\"plural\" />Τα Νέα του Σχεδίου Debian συντάσσονται από τους/τις <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+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>."
-msgstr ""
-"<void id=\"singular\" />Το παρόν τεύχος των Νέων του Σχεδίου Debian "
-"συντάχθηκε από τον/την <a href=\"mailto:debian-publicity@lists.debian.org\">"
-"%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+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>."
-msgstr ""
-"<void id=\"plural\" /> Το παρόν τεύχος των Νέων του Σχεδίου Debian "
-"συντάχθηκε από τους/τις <a href=\"mailto:debian-publicity@lists.debian.org\">"
-"%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Γεγονός:"
-#. 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\" />Μεταφράστηκε από τον/την %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Διαφάνειες:"
-#. 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\" />Μεταφράστηκε από τους/τις %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "πηγή"
-#. 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\" />Μεταφράστηκε από την %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Μεταφράστηκε από τις %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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 ""
-"Για να λαμβάνετε αυτό το ενημερωτικό δελτίο κάθε εβδομάδα στο ηλεκτρονικό "
-"σας ταχυδρομείο <a href=\"https://lists.debian.org/debian-news/\">εγγραφείτε "
-"στην λίστα αλληλογραφίας debian-news</a>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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 συντάσσονται από τον/"
-"την <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+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>."
-msgstr ""
-"<void id=\"plural\" />Τα Εβδομαδιαία Νέα του Debian συντάσσονται απο τους/"
-"τις <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Νέα του 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\" />Το παρόν τεύχος των Εβδομαδιαίων Νέων του Debian "
-"συντάχθηκε από τον/την <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Τελευταία Νέα του 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\" />Το παρόν τεύχος των Εβδομαδιαίων Νέων του Debian "
-"συντάχθηκε από τους/τις <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Το ενημερωτικό δελτίο για την κοινότητα του Debian"
#~ msgid "Name:"
#~ msgstr "Όνομα:"
diff --git a/greek/po/organization.el.po b/greek/po/organization.el.po
index d0fa24b138c..d146ba54294 100644
--- a/greek/po/organization.el.po
+++ b/greek/po/organization.el.po
@@ -45,13 +45,13 @@ msgid "manager"
msgstr "Διαχειριστής"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Διαχειριστής Σταθερής Έκδοσης"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "wizard"
@@ -78,27 +78,27 @@ msgid "role"
msgstr "ρόλος"
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Aξιωματούχοι"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Διανομή"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Επικοινωνία και Απεύθυνση"
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr "Ομάδα Προστασίας Δεδομένων"
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Ομάδα Δημοσιότητας"
@@ -112,136 +112,131 @@ msgstr "Συμμετοχή σε άλλους οργανισμούς"
msgid "Support and Infrastructure"
msgstr "Υποστήριξη και Υποδομή"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr "Καθαρλα \"Μείγματα\" του Debian"
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Επικεφαλής"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Τεχνική Επιτροπή"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Γραμματέας"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Έργα Ανάπτυξης"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Αρχειοθήκες FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "Διαχειριστές FTP"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Βοηθοί FTP"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "FTP Wizards"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Ομάδα Backports"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Διαχείριση Έκδοσης"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Ομάδα Έκδοσης"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Εξασφάλιση Ποιότητας"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Ομάδα Συστήματος Εγκατάστασης"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr "Ομάδα του Debian Live"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Σημειώσεις Έκδοσης"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Εικόνες CD"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Παραγωγή"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Δοκιμαστική"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr "Ομάδα Νέφους"
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Υποδομή Αυτόματης Μεταγλώττισης"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Επίδοξη Ομάδα Μεταγλώττισης (Wanna-build team)"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Διαχείριση Buildd"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Τεκμηρίωση"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Λίστα Αναμενόμενων πακέτων και Πακέτων που χρειάζονται Εργασία"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Υλοποιήσεις"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Ιδιαίτερες Διατάξεις"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Φορητοί"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Τείχη Προστασίας"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Ενσωματωμένα συστήματα"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Υπεύθυνος Τύπου"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Ιστοσελίδες"
@@ -412,44 +407,40 @@ msgstr "Σύστημα Παρακολούθησης Πακέτων (PTS)"
msgid "Treasurer"
msgstr "Υπεύθυνος Οικονομικών"
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
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:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Διαχειριστές Salsa"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "Debian για παιδιά από 1 έως 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Καθαρλα \"Μείγματα\" του Debian"
+
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian για παιδιά από 1 έως 99"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "Debian για ιατρική πρακτική και έρευνα"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian για ιατρική πρακτική και έρευνα"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "Debian για την εκπαίδευση"
+#~ msgid "Debian for education"
+#~ msgstr "Debian για την εκπαίδευση"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "Debian σε νομικά γραφεία"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian σε νομικά γραφεία"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "Debian για άτομα με ειδικές ανάγκες"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian για άτομα με ειδικές ανάγκες"
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr "Debian για τις επιστήμες και τη σχετική έρευνα"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian για τις επιστήμες και τη σχετική έρευνα"
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr "Debian για την Αστρονομία"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian για την Αστρονομία"
#~ msgid "Individual Packages"
#~ msgstr "Μεμονωμένα Πακέτα"
diff --git a/greek/po/others.el.po b/greek/po/others.el.po
index bd5efbeb899..563fd2f2982 100644
--- a/greek/po/others.el.po
+++ b/greek/po/others.el.po
@@ -60,42 +60,6 @@ msgstr "<void id=\"d-i\" />Unknown"
msgid "Unavailable"
msgstr "Μη διαθέσιμο"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Γωνιά των νέων Μελών"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Βήμα 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Βήμα 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Βήμα 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Βήμα 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Βήμα 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Βήμα 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Βήμα 7"
-
-#: ../../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> "
@@ -131,6 +95,34 @@ msgstr "Τηλεομοιοτυπία"
msgid "Address"
msgstr "Διεύθυνση"
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "Με&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "Χωρίς&nbsp;``Debian''"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "Encapsulated PostScript"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Με τη δύναμη του Debian]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Με τη δύναμη του Debian GNU/Linux]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Με τη δύναμη του Debian]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (mini button)"
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Προϊόντα"
@@ -221,71 +213,6 @@ msgstr ""
"Τα χρήματα χρησιμοποιούνται για τη διοργάνωση τοπικών εκδηλώσεων για το "
"ελεύθερο λογισμικό"
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "Με&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "Χωρίς&nbsp;``Debian''"
-
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "Encapsulated PostScript"
-
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Με τη δύναμη του Debian]"
-
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Με τη δύναμη του Debian GNU/Linux]"
-
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Με τη δύναμη του Debian]"
-
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (mini button)"
-
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "το ίδιο με το παραπάνω"
-
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Πόσο καιρό χρησιμοποιείτε το Debian;"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Είστε προγραμματιστής του Debian;"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "Σε ποιούς τομείς του Debian εμπλέκεστε;"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Τι σας έκανε να ενδιαφερθείτε να δουλέψετε με το Debian;"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-"Έχετε οποιεσδήποτε συμβουλές για γυναίκες που ενδιαφέρονται να εμπλακούν "
-"περισσότερο με το Debian;"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr "Συμμετέχετε με άλλες γυναίκες σε κάποιες ομάδες τεχνολογίας; Σε ποιες;"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Πείτε λίγα παραπάνω για σας..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "Εντάξει"
@@ -330,6 +257,79 @@ msgstr "Έκδοση"
msgid "URL"
msgstr "Διεύθυνση"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Γωνιά των νέων Μελών"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Βήμα 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Βήμα 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Βήμα 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Βήμα 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Βήμα 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Βήμα 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Βήμα 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Λίστα ελέγχου του Υποψήφιου"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "το ίδιο με το παραπάνω"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Πόσο καιρό χρησιμοποιείτε το Debian;"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Είστε προγραμματιστής του Debian;"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "Σε ποιούς τομείς του Debian εμπλέκεστε;"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Τι σας έκανε να ενδιαφερθείτε να δουλέψετε με το Debian;"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+"Έχετε οποιεσδήποτε συμβουλές για γυναίκες που ενδιαφέρονται να εμπλακούν "
+"περισσότερο με το Debian;"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr "Συμμετέχετε με άλλες γυναίκες σε κάποιες ομάδες τεχνολογίας; Σε ποιες;"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Πείτε λίγα παραπάνω για σας..."
+
#, fuzzy
#~ msgid "Who:"
#~ msgstr "Τηλέφωνο:"
diff --git a/greek/po/partners.el.po b/greek/po/partners.el.po
index 8384f7c995e..ebd65201c2b 100644
--- a/greek/po/partners.el.po
+++ b/greek/po/partners.el.po
@@ -37,9 +37,9 @@ msgid ""
"<a href=\"http://www.1and1.info/\">1&amp;1</a> supports us by providing "
"several servers in their Karlsruhe high-performance datacenter."
msgstr ""
-"Η <a href=\"http://www.1and1.info/\">1&amp;1</a> μας υποστηρίζει προσφέροντας"
-" αρκετούς "
-"εξυπηρετητές στο Υψηλής Απόδοσης κέντρο δεδομένων της στην Καρλσρούη."
+"Η <a href=\"http://www.1and1.info/\">1&amp;1</a> μας υποστηρίζει "
+"προσφέροντας αρκετούς εξυπηρετητές στο Υψηλής Απόδοσης κέντρο δεδομένων της "
+"στην Καρλσρούη."
#: ../../english/partners/partners.def:33
msgid ""
@@ -49,22 +49,21 @@ msgid ""
"1&amp;1 are running on a Debian-based environment using several thousand "
"servers."
msgstr ""
-"Η 1&amp;1 είναι μία από τις μεγαλύτερες εταιρείς καταχώρησης τομέων δικτύου"
-" και φιλοξενίας ιστότοπων στον κόσμο "
-"με γραφεία στη Γερμανία, τη Γαλλία, τη Μεγάλη Βρετανία, την Ισπανία και τις"
-" ΗΠΑ. Οι περισσότεροι από τους 5 εκατομμύρια ιστότοποι "
-"και άλλες υπηρεσίες τις οποίες διαχειρίζεται η 1&amp;1 τρέχουν σε ένα"
-" περιβάλλον βασισμένο στο Debian με τη χρήση αρκετών χιλιάδων "
-"εξυπηρετητών."
+"Η 1&amp;1 είναι μία από τις μεγαλύτερες εταιρείς καταχώρησης τομέων δικτύου "
+"και φιλοξενίας ιστότοπων στον κόσμο με γραφεία στη Γερμανία, τη Γαλλία, τη "
+"Μεγάλη Βρετανία, την Ισπανία και τις ΗΠΑ. Οι περισσότεροι από τους 5 "
+"εκατομμύρια ιστότοποι και άλλες υπηρεσίες τις οποίες διαχειρίζεται η "
+"1&amp;1 τρέχουν σε ένα περιβάλλον βασισμένο στο Debian με τη χρήση αρκετών "
+"χιλιάδων εξυπηρετητών."
#: ../../english/partners/partners.def:42
msgid ""
"<a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> support us "
"by providing hosting services and sponsorship for the Debian Conference."
msgstr ""
-"Η <a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> μας"
-" υποστηρίζει προσφέροντας "
-"υπηρεσίες φιλοξενίας και χορηγίες για το Συνέδριο του Debian."
+"Η <a href=\"http://www.bytemark.co.uk/r/deb-partners\">Bytemark</a> μας "
+"υποστηρίζει προσφέροντας υπηρεσίες φιλοξενίας και χορηγίες για το Συνέδριο "
+"του Debian."
#: ../../english/partners/partners.def:46
msgid ""
@@ -75,15 +74,13 @@ msgid ""
"Choice</q> to any new customer who's not 100% sure on what to pick. Bytemark "
"are also well known for their expert and friendly support."
msgstr ""
-"Είναι ένας από τους ηγετικούς Παρόχους Υπηρεσιών Διαδικτύου (ISP) στο Ηνωμένο"
-" Βασίλειο και παρέχει "
-"προσιτή οικονομικά, κλιμακούμενη και ισχυρή φιλοξενία και προσφέροντας ως"
-" στάνταρ αρκετές <q>φιλικές για geek</q> έξτρα δυνατότητες. "
-"Το Debian GNU/Linux χρησιμοποιείται εκτενώς στο δίκτυό τους και συνίσταται ως"
-" η <q>Επιλεγμένη Διανομή</q> "
-"σε οποιονδήποτε/οποιαδήποτε πελάτη δεν ξέρει 100% ποια διανομή να διαλέξει. Η"
-" Bytemark είναι επίσης γνωστή "
-"για την ειδημοσύνη και την φιλική εξυπηρέτηση."
+"Είναι ένας από τους ηγετικούς Παρόχους Υπηρεσιών Διαδικτύου (ISP) στο "
+"Ηνωμένο Βασίλειο και παρέχει προσιτή οικονομικά, κλιμακούμενη και ισχυρή "
+"φιλοξενία και προσφέροντας ως στάνταρ αρκετές <q>φιλικές για geek</q> έξτρα "
+"δυνατότητες. Το Debian GNU/Linux χρησιμοποιείται εκτενώς στο δίκτυό τους και "
+"συνίσταται ως η <q>Επιλεγμένη Διανομή</q> σε οποιονδήποτε/οποιαδήποτε πελάτη "
+"δεν ξέρει 100% ποια διανομή να διαλέξει. Η Bytemark είναι επίσης γνωστή για "
+"την ειδημοσύνη και την φιλική εξυπηρέτηση."
#: ../../english/partners/partners.def:54
msgid ""
@@ -93,13 +90,12 @@ msgid ""
"Salzburg/Austria. Debian is also used on many systems used on a daily basis "
"at conova."
msgstr ""
-"Η <a href=\"https://www.conova.com\">conova communications GmbH</a>"
-" υποστηρίζει το Σχέδιο Debian "
-"ως συνεργάτης φιλοξενίας για αρκετά χρόνια. Επιπρόσθετα, οι ειδικοί αυτοί"
-" στην Πληροφορική φιλοξενούν πάρτυ "
-"κυνηγιού σφαλμάτων του Debian (Bug Squashing Parties) στο Σάλτσμπουργκ της"
-" Αυστρίας. Το Debian χρησιμοποιείται επίσης "
-"σε καθημερινή βάση σε πολλά συστήματα στην conova."
+"Η <a href=\"https://www.conova.com\">conova communications GmbH</a> "
+"υποστηρίζει το Σχέδιο Debian ως συνεργάτης φιλοξενίας για αρκετά χρόνια. "
+"Επιπρόσθετα, οι ειδικοί αυτοί στην Πληροφορική φιλοξενούν πάρτυ κυνηγιού "
+"σφαλμάτων του Debian (Bug Squashing Parties) στο Σάλτσμπουργκ της Αυστρίας. "
+"Το Debian χρησιμοποιείται επίσης σε καθημερινή βάση σε πολλά συστήματα στην "
+"conova."
#: ../../english/partners/partners.def:57
msgid ""
@@ -109,31 +105,28 @@ msgid ""
"security. The company offers space for more than 10,000 servers at the "
"highest level of supply and security on their 2,000 m² of technical area."
msgstr ""
-"Η conova λειτουργεί ένα από το πιο σύγχρονα κέντρα δεδομένων στην Ευρώπη στο"
-" Σάλτσμπουργκ της Αυστρίας. "
-"Οι υπηρεσίες που παρέχουν: εξατομικευένες λύσεις για φιλοξενία,"
-" διαχειριζόμενων &amp; υπηρεσιών νέφους, "
-"εξωτερικές αναθέσεις καθώς και υπηρεσίες δικτύου και ασφάλειας. Η εταιρεία"
-" προσφέρει χώρο για περισσότερους από "
-"10.000 εξυπηρετητές στο υψηλότερο δυνατό επίπεδο παροχής και ασφάλειας στην"
-" τεχνολογική περιοχή τους έκτασης "
-"2.000 τμ.."
+"Η conova λειτουργεί ένα από το πιο σύγχρονα κέντρα δεδομένων στην Ευρώπη στο "
+"Σάλτσμπουργκ της Αυστρίας. Οι υπηρεσίες που παρέχουν: εξατομικευένες λύσεις "
+"για φιλοξενία, διαχειριζόμενων &amp; υπηρεσιών νέφους, εξωτερικές αναθέσεις "
+"καθώς και υπηρεσίες δικτύου και ασφάλειας. Η εταιρεία προσφέρει χώρο για "
+"περισσότερους από 10.000 εξυπηρετητές στο υψηλότερο δυνατό επίπεδο παροχής "
+"και ασφάλειας στην τεχνολογική περιοχή τους έκτασης 2.000 τμ.."
#: ../../english/partners/partners.def:64
+#, fuzzy
msgid ""
"<a href=\"https://www.credativ.com/\">credativ</a> is an independent "
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
-"Η <a href=\"https://www.credativ.com/\">credativ</a> είναι μια ανεξάρτητη"
-" εταιρίας συμβουλευτικής "
-"και υπηρεσιών και από το 1999 παρέχει ολοκληρωμένες υπηρεσίες και τεχνική"
-" υποστήριξη για την υλοποίηση "
-"και λειτουργία του ανοιχτού λογισμικού σε επιχειρηματικές εφαρμογές. Το <q"
-">Κέντρο Υποστήριξης Ανοιχτού Λογισμικού</"
-"q> μας είναι πάντα διαθέσιμο, 365 μέρες τον χρόνο, κάθε στιγμή."
+"Η <a href=\"https://www.credativ.com/\">credativ</a> είναι μια ανεξάρτητη "
+"εταιρίας συμβουλευτικής και υπηρεσιών και από το 1999 παρέχει ολοκληρωμένες "
+"υπηρεσίες και τεχνική υποστήριξη για την υλοποίηση και λειτουργία του "
+"ανοιχτού λογισμικού σε επιχειρηματικές εφαρμογές. Το <q>Κέντρο Υποστήριξης "
+"Ανοιχτού Λογισμικού</q> μας είναι πάντα διαθέσιμο, 365 μέρες τον χρόνο, κάθε "
+"στιγμή."
#: ../../english/partners/partners.def:67
msgid ""
@@ -143,14 +136,11 @@ msgid ""
"to free software projects worldwide. Further information can be found at <a "
"href=\"https://www.credativ.com/\">https://www.credativ.com/</a>."
msgstr ""
-"Από την πρώτη στιγμή η credativ έχει υποστηρίξει ενεργά το Σχέδιο Debian και"
-" θα "
-"συνεχίσει να το κάνει και στο μέλλον. Επιπλέον πολλοί/πολλές από τους/τις"
-" συμβούλους μας είναι "
-"ταυτόχρονα και προγραμματιστές/προγραμματίστριες του Debian και εμπλέκονται"
-" ενεργά στη συνεισφορά στο ελεύθερο "
-"λογισμικό παγκοσμίως. Περισσότερες πληροφορίες μπορούν να βρεθούν στην"
-" ιστοσελίδα <a "
+"Από την πρώτη στιγμή η credativ έχει υποστηρίξει ενεργά το Σχέδιο Debian και "
+"θα συνεχίσει να το κάνει και στο μέλλον. Επιπλέον πολλοί/πολλές από τους/τις "
+"συμβούλους μας είναι ταυτόχρονα και προγραμματιστές/προγραμματίστριες του "
+"Debian και εμπλέκονται ενεργά στη συνεισφορά στο ελεύθερο λογισμικό "
+"παγκοσμίως. Περισσότερες πληροφορίες μπορούν να βρεθούν στην ιστοσελίδα <a "
"href=\"https://www.credativ.com/\">https://www.credativ.com/</a>."
#: ../../english/partners/partners.def:73
@@ -160,12 +150,10 @@ msgid ""
"connection. <a href=\"https://wiki.debian.org\">wiki.debian.org</a> received "
"an IBM x360 server. "
msgstr ""
-"Η <a href=\"http://www.dg-i.net/\">DG-i</a> παρέχει στο Σχέδιο Debian"
-" εξοπλισμό και "
-"υπηρεσίες φιλοξενίας από τα colocation κέντρα δεδομένων της μέσω δικτυακής"
-" σύνδεσης υψηλής ταχύτητας. To "
-"<a href=\"https://wiki.debian.org\">wiki.debian.org</a> έλαβε έναν"
-" εξυπηρετητή IBM x360. "
+"Η <a href=\"http://www.dg-i.net/\">DG-i</a> παρέχει στο Σχέδιο Debian "
+"εξοπλισμό και υπηρεσίες φιλοξενίας από τα colocation κέντρα δεδομένων της "
+"μέσω δικτυακής σύνδεσης υψηλής ταχύτητας. To <a href=\"https://wiki.debian."
+"org\">wiki.debian.org</a> έλαβε έναν εξυπηρετητή IBM x360. "
#: ../../english/partners/partners.def:77
msgid ""
@@ -178,19 +166,16 @@ msgid ""
"Commerce and financial services. DG-i holds the necessary hosting "
"infrastructure in their Munich and Dusseldorf data centers."
msgstr ""
-"Η Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) προσφέρει υπηρεσίες"
-" συμβουλευτικής σε "
-"υποδομές ΙΤ, ανάπτυξη λογισμικού και υπηρεσίες φιλοξενίας. Η DG-i υποστηρίζει"
-" τους πελάτες της "
-"με την ανάλυση του τεχνολογικού περιβάλλοντός τους, αναπτύσσοντας"
-" εξατομικευένες λύσεις λογισμικού και "
-"προσαρμόζοντας τις εφαρμογές τους ώστε να υπάρχει μια αδιάλειπτη μετάβαση"
-" στις υπηρεσίες φιλοξενίας. "
-"Η εταιρεία σχεδιάζει και υποστηρίζει εξατομικευένες λειτουργικές ιδέες που"
-" ικανοποιούν τα υψηλής ποιότητας στάνταρ "
-"ιδιαίτερα στο ηλεκτρονικό εμπόριο και τις χρηματοοικονομικές υπηρεσίες. Οι"
-" απαραίτητες υποδομές φιλοξενίας "
-"της DG-i βρίσκονται στα κέντρα δεδομένων της στο Μόναχο και του Ντύσσελντορφ."
+"Η Dembach Goo Informatik GmbH &amp; Co. KG (DG-i) προσφέρει υπηρεσίες "
+"συμβουλευτικής σε υποδομές ΙΤ, ανάπτυξη λογισμικού και υπηρεσίες φιλοξενίας. "
+"Η DG-i υποστηρίζει τους πελάτες της με την ανάλυση του τεχνολογικού "
+"περιβάλλοντός τους, αναπτύσσοντας εξατομικευένες λύσεις λογισμικού και "
+"προσαρμόζοντας τις εφαρμογές τους ώστε να υπάρχει μια αδιάλειπτη μετάβαση "
+"στις υπηρεσίες φιλοξενίας. Η εταιρεία σχεδιάζει και υποστηρίζει "
+"εξατομικευένες λειτουργικές ιδέες που ικανοποιούν τα υψηλής ποιότητας "
+"στάνταρ ιδιαίτερα στο ηλεκτρονικό εμπόριο και τις χρηματοοικονομικές "
+"υπηρεσίες. Οι απαραίτητες υποδομές φιλοξενίας της DG-i βρίσκονται στα κέντρα "
+"δεδομένων της στο Μόναχο και του Ντύσσελντορφ."
#: ../../english/partners/partners.def:83
msgid ""
@@ -199,12 +184,10 @@ msgid ""
"UPS and Power Devices support through the <a href=\"http://www."
"networkupstools.org/\">Network UPS Tools</a> and related packages."
msgstr ""
-"Η <a href=\"http://www.eaton.com/\">Eaton</a> βοηθά το Debian στην προστασία"
-" των υποδομών του από "
-"προβλήματα παροχής ισχύος και απασχολεί έναν προγραμματιστή του Debian για"
-" εργασία σχετικά με την "
-"υποστήριξη των UPS και συσκευών παροχής ισχύος μέσω του πακέτου <a"
-" href=\"http://www."
+"Η <a href=\"http://www.eaton.com/\">Eaton</a> βοηθά το Debian στην προστασία "
+"των υποδομών του από προβλήματα παροχής ισχύος και απασχολεί έναν "
+"προγραμματιστή του Debian για εργασία σχετικά με την υποστήριξη των UPS και "
+"συσκευών παροχής ισχύος μέσω του πακέτου <a href=\"http://www."
"networkupstools.org/\">Network UPS Tools</a> και άλλων σχετικών πακέτων."
#: ../../english/partners/partners.def:86
@@ -591,5 +574,3 @@ msgid ""
"fully custom designs. All of our products ship with open source tools and "
"operating systems."
msgstr ""
-
-
diff --git a/greek/po/ports.el.po b/greek/po/ports.el.po
index 1b5a03a5454..7d7561fa60b 100644
--- a/greek/po/ports.el.po
+++ b/greek/po/ports.el.po
@@ -12,22 +12,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian για Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian για PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "CD για Hurd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian για IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Επικοινωνία"
@@ -92,6 +76,22 @@ msgstr "Παροχή"
msgid "Systems"
msgstr "Συστήματα"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian για Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian για PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "CD για Hurd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian για IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD για i386"
diff --git a/greek/po/security.el.po b/greek/po/security.el.po
index 6b350520339..eafe4a80ec4 100644
--- a/greek/po/security.el.po
+++ b/greek/po/security.el.po
@@ -12,42 +12,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Ασφάλεια του Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Συμβουλές ασφάλειας"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "Ε"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"<a href=\\\"undated/\\\">μη χρονολογημένες</a> ειδοποιήσεις ασφαλείας, "
-"περιλαμβάνονται για ιστορικούς λόγους"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Στο λεξικό Mitre's CVE"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Βάση του Securityfocus Bugtraq"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Συμβουλές CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Σημειώσεις ευπάθειας απο το US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Κώδικας:"
@@ -130,3 +94,39 @@ msgstr "Σημειώσεις του CERT για περιστατικά και τ
msgid "No other external database security references currently available."
msgstr ""
"Δεν υπάρχουν διαθέσιμες άλλες εξωτερικές αναφορές στην βάση αυτή τη στιγμή."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Ε"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Ασφάλεια του Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Συμβουλές ασφάλειας"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Στο λεξικό Mitre's CVE"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Βάση του Securityfocus Bugtraq"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Συμβουλές CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Σημειώσεις ευπάθειας απο το US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"<a href=\\\"undated/\\\">μη χρονολογημένες</a> ειδοποιήσεις ασφαλείας, "
+"περιλαμβάνονται για ιστορικούς λόγους"
diff --git a/greek/po/stats.el.po b/greek/po/stats.el.po
index beee3ceae22..0dfcf8bb014 100644
--- a/greek/po/stats.el.po
+++ b/greek/po/stats.el.po
@@ -13,22 +13,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
-#: ../../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 bytes προς μετάφραση."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Υπάρχουν %d συμβολοσειρές προς μετάφραση."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Λανθασμένη έκδοση μετάφρασης"
@@ -46,13 +30,13 @@ msgid "The original no longer exists"
msgstr "Το πρωτότυπο δεν υπάρχει πλέον"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "Μη-διαθέσιμος αριθμός επισκέψεων"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "επισκέψεις"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "Μη-διαθέσιμος αριθμός επισκέψεων"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Πατήστε για να φέρετε δεδομένα διαφορών (diffstat data)"
@@ -65,15 +49,6 @@ msgstr "Δημιουργήθηκε με το <transstatslink>"
msgid "Translation summary for"
msgstr "Περίληψη μετάφρασης για"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Μη μεταφρασμένο"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Παρωχημένο"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Μεταφρασμένο"
@@ -83,6 +58,15 @@ msgstr "Μεταφρασμένο"
msgid "Up to date"
msgstr "Επικαιροποιημένο"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Παρωχημένο"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Μη μεταφρασμένο"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -233,3 +217,19 @@ msgstr "Μεταφρασμένες ιστοσελίδες (με βάση το μ
#: ../../stattrans.pl:790
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 bytes προς μετάφραση."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Υπάρχουν %d συμβολοσειρές προς μετάφραση."
diff --git a/greek/po/templates.el.po b/greek/po/templates.el.po
index 4eb18f2d15e..19f75b5b0f1 100644
--- a/greek/po/templates.el.po
+++ b/greek/po/templates.el.po
@@ -12,14 +12,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Ιστότοπος του Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Αναζήτηση στον ιστότοπο του Debian."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -263,6 +255,14 @@ msgstr "Η σελίδα αυτή είναι επίσης διαθέσιμη κα
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Πώς να <a href=m4_HOME/intro/cn>ορίσετε την προκαθορισμένη γλώσσα</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Το Debian Διεθνώς"
@@ -544,6 +544,14 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Πίσω στη σελίδα <a href=\"../\">Ποιος χρησιμοποιεί το Debian;</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Ιστότοπος του Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Αναζήτηση στον ιστότοπο του Debian."
+
#~ msgid "Select a server near you"
#~ msgstr "Επιλέξτε έναν κοντινό σας εξυπηρετητή"
diff --git a/greek/po/vote.el.po b/greek/po/vote.el.po
index 329bb6a2519..b18517f76a0 100644
--- a/greek/po/vote.el.po
+++ b/greek/po/vote.el.po
@@ -69,201 +69,231 @@ msgid "Proposal F Proposer"
msgstr "Πρόταση F Προτείνων/ουσα"
#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Πρόταση Α Προτείνων/ουσα"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Πρόταση Α Προτείνων/ουσα"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Μάρτυρες"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Μάρτυρες της Πρότασης Α"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Μάρτυρες της Πρότασης Β"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Μάρτυρες της Πρότασης C"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Μάρτυρες της Πρότασης D"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Μάρτυρες της Πρότασης E"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Μάρτυρες της Πρότασης F"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Μάρτυρες της Πρότασης Α"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Μάρτυρες της Πρότασης Α"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Αντίθεση"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Κείμενο"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Πρόταση Α"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Πρόταση B"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Πρόταση C"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Πρόταση D"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Πρόταση E"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Πρόταση F"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Πρόταση Α"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Πρόταση Α"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Επιλογές"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Τροπολογία Προτείνων/ουσα"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Μάρτυρες Τροπολογίας"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Τροπολογία Κείμενο"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Τροπολογία Προτείνων/ουσα Α"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Μάρτυρες Τροπολογίας Α"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Τροπολογία Κείμενο Α"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Τροπολογία Προτείνων/ουσα Β"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Μάρτυρες Τροπολογίας Β"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Τροπολογία Κείμενο Β"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "Τροπολογία Προτείνων/ουσα C"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "Μάρτυρες Τροπολογίας C"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "Τροπολογία Κείμενο C"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Τροπολογίες"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Πρακτικά"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Απαίτηση Πλειοψηφίας"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Δεδομένα και Στατιστικά"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Απαρτία"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Ελάχιστη Συζήτηση"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Ψηφοφορία"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Φόρουμ"
-#: ../../english/template/debian/votebar.wml:163
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Αποτέλεσμα"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Σε αναμονή χορηγών"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Σε εξέλιξη"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Έχει αρχίσει ψηφοφορία"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Έχει αποφασιστεί"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "αποσύρθηκε"
-#: ../../english/template/debian/votebar.wml:182
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Άλλα"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Κεντρική σελίδα ψηφοφορίας"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Πώς να ψηφίσετε"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Κάντε τις προτάσεις σας"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Πρόταση τροπολογίας"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Ακολουθία πρότασης"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Ανάγνωση αποτελεσμάτων"
-#: ../../english/template/debian/votebar.wml:204
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Ψηφοφορία"
diff --git a/hebrew/po/cdimage.he.po b/hebrew/po/cdimage.he.po
index 8df7a07c191..768fbdff003 100644
--- a/hebrew/po/cdimage.he.po
+++ b/hebrew/po/cdimage.he.po
@@ -9,20 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -117,3 +103,17 @@ msgid ""
"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
"a> for CDs/DVDs:"
msgstr ""
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/hebrew/po/consultants.he.po b/hebrew/po/consultants.he.po
index 32bc5910ad9..e59d35d9edf 100644
--- a/hebrew/po/consultants.he.po
+++ b/hebrew/po/consultants.he.po
@@ -9,6 +9,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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 ""
@@ -62,11 +70,3 @@ 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/hebrew/po/countries.he.po b/hebrew/po/countries.he.po
index 900640af60d..75980b9d108 100644
--- a/hebrew/po/countries.he.po
+++ b/hebrew/po/countries.he.po
@@ -218,214 +218,217 @@ msgid "Kenya"
msgstr "קניה"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "קזחסטאן"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "קוריאה"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "כוויית"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "קזחסטאן"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "סרי לנקה"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "ליטא"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "לוקסמבורג"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "לטביה"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "מרוקו"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr ""
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "מונטנגרו"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "מדגסקר"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
#, fuzzy
-#| msgid "Dominican Republic"
msgid "Macedonia, Republic of"
msgstr "הרפוליקה הדומיניקית"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr ""
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "מלטה"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "מקיסקו"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "מלזיה"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr ""
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "ניקרגוואה"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "הולנד"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "נורווגיה"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "ניו זילנד"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "פנמה"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "פרו"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr ""
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "פיליפינים"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "פקיסטאן"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "פולין"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "פורטוגל"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "רומניה"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "סרביה"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "רוסיה"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "ערב הסעודית"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "שוודיה"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "סינגפור"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "סלובניה"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "סלובקיה"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "אל סלוודור"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "תאילנד"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
#, fuzzy
-#| msgid "Pakistan"
msgid "Tajikistan"
msgstr "פקיסטאן"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "תוניס"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "תורכיה"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "טאיואן"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "אוקראינה"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "ארצות הברית"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "אורוגוואי"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "אוזבקיסטן"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "וונצואלה"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "ויאטנם"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr ""
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "דרום אפריקה"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "זימבבואה"
diff --git a/hebrew/po/distrib.he.po b/hebrew/po/distrib.he.po
index 8ade33961ea..a3a38e33c5d 100644
--- a/hebrew/po/distrib.he.po
+++ b/hebrew/po/distrib.he.po
@@ -9,111 +9,111 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
+#: ../../english/distrib/search_packages-form.inc:34
+msgid "Section"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
+#: ../../english/distrib/search_packages-form.inc:36
+msgid "main"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
+#: ../../english/distrib/search_packages-form.inc:37
+msgid "contrib"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
+#: ../../english/distrib/search_packages-form.inc:38
+msgid "non-free"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:34
-msgid "Section"
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:36
-msgid "main"
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:37
-msgid "contrib"
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:38
-msgid "non-free"
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
msgstr ""
#: ../../english/releases/arches.data:8
diff --git a/hebrew/po/doc.he.po b/hebrew/po/doc.he.po
index 4522cdae6b9..fa8acdbbcaa 100644
--- a/hebrew/po/doc.he.po
+++ b/hebrew/po/doc.he.po
@@ -9,96 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:32
-msgid ""
-"\n"
-" Debian 9 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:60 ../../english/doc/books.data:164
-#: ../../english/doc/books.data:217
-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:81
-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:102
-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:121
-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:141
-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 8) 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:192
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr ""
@@ -155,53 +65,146 @@ msgstr ""
msgid "plain text"
msgstr ""
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:183
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
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:161 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:185
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:170
-#: ../../english/doc/manuals.defs:178 ../../english/doc/manuals.defs:186
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:167
+#: ../../english/doc/manuals.defs:177
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:175
+#: ../../english/doc/manuals.defs:185
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:193
+#: ../../english/doc/manuals.defs:203
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:198
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:202 ../../english/doc/manuals.defs:206
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr ""
-#: ../../english/doc/manuals.defs:211 ../../english/doc/manuals.defs:215
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
msgid "Debian package (archived)"
msgstr ""
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/hebrew/po/newsevents.he.po b/hebrew/po/newsevents.he.po
index e466ea3ff88..aad8605ea87 100644
--- a/hebrew/po/newsevents.he.po
+++ b/hebrew/po/newsevents.he.po
@@ -9,68 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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/talks.defs:9
-msgid "Title:"
-msgstr ""
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr ""
-
-#: ../../english/events/talks.defs:15
-#, fuzzy
-#| msgid "Languages:"
-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 ""
@@ -127,6 +65,107 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr ""
+#: ../../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 ""
+
+#: ../../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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#: ../../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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -308,105 +347,65 @@ msgid ""
"the following topics:"
msgstr ""
-#: ../../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>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
msgstr ""
-#: ../../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."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
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>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
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>."
-msgstr ""
+#: ../../english/events/talks.defs:15
+#, fuzzy
+msgid "Language:"
+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>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
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>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:29
+msgid "source"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
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>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
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>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
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>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
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>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
msgstr ""
#~ msgid "Topics:"
diff --git a/hebrew/po/organization.he.po b/hebrew/po/organization.he.po
index 9a675d9697d..5f1174ddca0 100644
--- a/hebrew/po/organization.he.po
+++ b/hebrew/po/organization.he.po
@@ -42,359 +42,375 @@ msgid "manager"
msgstr "מנהל"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr ""
-
-#: ../../english/intro/organization.data:34
#, fuzzy
-#| msgid "Release Management"
msgid "Stable Release Manager"
msgstr "הנהלת השחרור"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr ""
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "אשף"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "יושב ראש"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "עוזר"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "מזכיר"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "קצינים"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "הפצה"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:236
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "יחסי ציבור"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:302
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "תמיכה ותשתית"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "מנהיג"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "וועדה טכנית"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "מזכיר"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "מיזמי פיתוח"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "ארכיוני FTP"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
#, fuzzy
-#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "מנהל ה-FTP"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "סייעי FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "חבילות עצמאיות"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "הנהלת השחרור"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "צוות השחרור"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "אבטחת איכות"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "צוות התקנת המערכת"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "הודעות שחרור"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr ""
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "הפקה"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "בחינה"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
#, fuzzy
-#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "תמיכה ותשתית"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:171
#, fuzzy
-#| msgid "System Administration"
msgid "Buildd administration"
msgstr "ניהול מערכת"
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "תיעוד"
-#: ../../english/intro/organization.data:181
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "עבודה נדרשת והצעות לאריזת תוכנה"
-#: ../../english/intro/organization.data:184
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:185
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:220
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "הגדרות מיוחדות"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "מחשבים ניידים"
-#: ../../english/intro/organization.data:223
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "חומות אש"
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "איש קשר לעיתונות"
-#: ../../english/intro/organization.data:241
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "דפי רשת"
-#: ../../english/intro/organization.data:251
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "פלאנט דביאן"
-#: ../../english/intro/organization.data:256
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:260
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr ""
-#: ../../english/intro/organization.data:268
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:273
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "אירועים"
-#: ../../english/intro/organization.data:280
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "וועדה טכנית"
-#: ../../english/intro/organization.data:287
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "שותפים לתוכנית"
-#: ../../english/intro/organization.data:292
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:305
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "תמיכת משתמשים"
-#: ../../english/intro/organization.data:372
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "מערכת מעקב באגים"
-#: ../../english/intro/organization.data:377
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "ניהול רשימות תפוצה וארכיון רשימות תפוצה"
-#: ../../english/intro/organization.data:385
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:391
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "מנהלי חשבונות דביאן"
-#: ../../english/intro/organization.data:395
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:396
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "צוות אבטחה"
-#: ../../english/intro/organization.data:412
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr ""
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr ""
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "מדיניות"
-#: ../../english/intro/organization.data:423
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "ניהול מערכת"
-#: ../../english/intro/organization.data:424
+#: ../../english/intro/organization.data:460
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:433
+#: ../../english/intro/organization.data:469
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:434
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr ""
-#: ../../english/intro/organization.data:442
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr ""
-#: ../../english/intro/organization.data:443
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:451
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:454
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "System Administration"
msgid "Salsa administrators"
msgstr "ניהול מערכת"
-#: ../../english/intro/organization.data:465
-msgid "Debian for children from 1 to 99"
-msgstr ""
-
-#: ../../english/intro/organization.data:468
-msgid "Debian for medical practice and research"
-msgstr ""
-
-#: ../../english/intro/organization.data:471
-msgid "Debian for education"
-msgstr ""
-
-#: ../../english/intro/organization.data:476
-msgid "Debian in legal offices"
-msgstr ""
-
-#: ../../english/intro/organization.data:480
-msgid "Debian for people with disabilities"
-msgstr ""
-
-#: ../../english/intro/organization.data:484
-msgid "Debian for science and related research"
-msgstr ""
-
-#: ../../english/intro/organization.data:487
-msgid "Debian for astronomy"
-msgstr ""
+#~ msgid "Individual Packages"
+#~ msgstr "חבילות עצמאיות"
#~ msgid "Testing Security Team"
#~ msgstr "צוות אבטחה להפצת הבחינה"
diff --git a/hebrew/po/others.he.po b/hebrew/po/others.he.po
index 55a1cb837c2..5a2c4552606 100644
--- a/hebrew/po/others.he.po
+++ b/hebrew/po/others.he.po
@@ -57,42 +57,6 @@ msgstr ""
msgid "Unavailable"
msgstr "לא זמין"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "צעד 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "צעד 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "צעד 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "צעד 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "צעד 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "צעד 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "צעד 7"
-
-#: ../../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> "
@@ -104,7 +68,6 @@ msgstr ""
#: ../../english/devel/website/tc.data:15
#: ../../english/devel/website/tc.data:16
#, fuzzy
-#| msgid "Additional Information"
msgid "More information"
msgstr "מידע נוסף"
@@ -116,19 +79,16 @@ msgstr ""
#: ../../english/distrib/pre-installed.defs:18
#, fuzzy
-#| msgid "Phone:"
msgid "Phone"
msgstr "טלפון:"
#: ../../english/distrib/pre-installed.defs:19
#, fuzzy
-#| msgid "Fax:"
msgid "Fax"
msgstr "פקס:"
#: ../../english/distrib/pre-installed.defs:21
#, fuzzy
-#| msgid "Address:"
msgid "Address"
msgstr "כתובת:"
@@ -160,131 +120,95 @@ msgstr ""
msgid "[Debian] (mini button)"
msgstr ""
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "כמו למעלה"
-
-#: ../../english/misc/merchandise.def:10
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "מוצרים"
-#: ../../english/misc/merchandise.def:13
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "חולצות טי"
-#: ../../english/misc/merchandise.def:16
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "כובעים"
-#: ../../english/misc/merchandise.def:19
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "מדבקות"
-#: ../../english/misc/merchandise.def:22
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "ספלים"
-#: ../../english/misc/merchandise.def:25
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "פרטי לבוש אחרים"
-#: ../../english/misc/merchandise.def:28
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "חולצות פולו"
-#: ../../english/misc/merchandise.def:31
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "צלחות מעופפות"
-#: ../../english/misc/merchandise.def:34
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "משטחים לעכבר"
-#: ../../english/misc/merchandise.def:37
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "תגים"
-#: ../../english/misc/merchandise.def:40
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:44
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "עגילים"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "מזוודות"
-#: ../../english/misc/merchandise.def:50
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:53
+#: ../../english/events/merchandise.def:53
#, fuzzy
-#| msgid "suitcases"
msgid "pillowcases"
msgstr "מזוודות"
-#: ../../english/misc/merchandise.def:56
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr ""
-#: ../../english/misc/merchandise.def:59
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr ""
-#: ../../english/misc/merchandise.def:62
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr ""
-#: ../../english/misc/merchandise.def:77
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:80
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:101
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:106
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "טוב"
@@ -329,6 +253,77 @@ msgstr "גרסה"
msgid "URL"
msgstr ""
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr ""
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "צעד 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "צעד 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "צעד 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "צעד 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "צעד 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "צעד 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "צעד 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "רשימת הצעדים של המועמד"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "כמו למעלה"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
#~ msgid "Wanted:"
#~ msgstr "דרושים:"
diff --git a/hebrew/po/partners.he.po b/hebrew/po/partners.he.po
index db8c9e99938..644cd23a422 100644
--- a/hebrew/po/partners.he.po
+++ b/hebrew/po/partners.he.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
diff --git a/hebrew/po/ports.he.po b/hebrew/po/ports.he.po
index 08aa2e2c046..c0b14b8ac59 100644
--- a/hebrew/po/ports.he.po
+++ b/hebrew/po/ports.he.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "דביאן עבור ארכיטקטורת Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "דביאן עבור ארכיטקטורת PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "תקליטורים של HURD"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "דביאן עבור ארכיטקטורת IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "צור קשר"
@@ -89,6 +73,22 @@ msgstr "אספקה"
msgid "Systems"
msgstr "מערכות"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "דביאן עבור ארכיטקטורת Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "דביאן עבור ארכיטקטורת PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "תקליטורים של HURD"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "דביאן עבור ארכיטקטורת IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "דביאן GNU/NetBSD עבור ארכיטקטורת i386"
diff --git a/hebrew/po/security.he.po b/hebrew/po/security.he.po
index 129419bece6..b1fda943748 100644
--- a/hebrew/po/security.he.po
+++ b/hebrew/po/security.he.po
@@ -9,40 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "אבטחת דביאן"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "צוות יועצי האבטחה של דביאן"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr ""
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr ""
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "מקור"
@@ -120,3 +86,37 @@ msgstr ""
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr "אין הפניות למאגרי אבטחת מידע זמינות בשלב זה"
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "אבטחת דביאן"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "צוות יועצי האבטחה של דביאן"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr ""
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/hebrew/po/stats.he.po b/hebrew/po/stats.he.po
index 6a5da6a6586..6bd8722f44d 100644
--- a/hebrew/po/stats.he.po
+++ b/hebrew/po/stats.he.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/hebrew/po/templates.he.po b/hebrew/po/templates.he.po
index 72e3f4aa8e0..e3764eb1363 100644
--- a/hebrew/po/templates.he.po
+++ b/hebrew/po/templates.he.po
@@ -11,20 +11,9 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-#, fuzzy
-#| msgid "Debian Project"
-msgid "Debian website"
-msgstr "פרויקט דביאן"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian"
msgstr "עזרו לדביאן"
@@ -46,10 +35,6 @@ msgstr "פרויקט דביאן"
#: ../../english/template/debian/common_translation.wml:13
#, fuzzy
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -90,7 +75,6 @@ msgstr "צור קשר"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "מידע על הפצות"
@@ -166,13 +150,11 @@ msgstr "הורדה"
#: ../../english/template/debian/common_translation.wml:91
#, fuzzy
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "ספרים על דביאן"
#: ../../english/template/debian/common_translation.wml:94
#, fuzzy
-#| msgid "Last Modified"
msgid "Last Updated"
msgstr "עודכן לאחרונה"
@@ -221,13 +203,8 @@ 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -239,27 +216,27 @@ msgstr ""
"www@lists.debian.org\">debian-www@lists.debian.org</a>. למידע נוסף על אפשרות "
"יצירת קשר, בקרו ב<a href=\"m4_HOME/contact\">דף הקשר</a> של דביאן."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "עודכן לאחרונה"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "כל הזכויות שמורות"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr ""
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -277,6 +254,14 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
"הוראות כיצד לקבוע <a href=m4_HOME/intro/cn>את שפת ברירת המחדל</a> של דף זה."
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "דביאן ברחבי העולם"
@@ -323,7 +308,6 @@ msgstr "ספרים על דביאן"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian Wiki"
msgstr "עזרו לדביאן"
@@ -357,7 +341,6 @@ msgstr "מאגר מידע על המפתחים"
#: ../../english/template/debian/links.tags.wml:64
#, fuzzy
-#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "ספרים על דביאן"
@@ -435,7 +418,6 @@ msgstr "ספקי תקליטורים"
#: ../../english/template/debian/links.tags.wml:125
#, fuzzy
-#| msgid "CD ISO images"
msgid "CD/USB ISO images"
msgstr "מדיה לצריבה על תקליטורים"
@@ -469,7 +451,6 @@ msgstr ""
#: ../../english/template/debian/navbar.wml:10
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "פרויקט דביאן"
@@ -557,6 +538,15 @@ msgstr ""
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "חזרה אל עמוד <a href=\"../\">מי משתמש בדביאן?</a>."
+#: ../../english/search.xml.in:7
+#, fuzzy
+msgid "Debian website"
+msgstr "פרויקט דביאן"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
#~ msgid "Visit the site sponsor"
#~ msgstr "בקרו באתר נותן החסות"
diff --git a/hebrew/po/vote.he.po b/hebrew/po/vote.he.po
index 16c00f07e40..7bb8109915c 100644
--- a/hebrew/po/vote.he.po
+++ b/hebrew/po/vote.he.po
@@ -26,237 +26,265 @@ msgid "Nominations"
msgstr ""
#: ../../english/template/debian/votebar.wml:25
-msgid "Debate"
+msgid "Withdrawals"
msgstr ""
#: ../../english/template/debian/votebar.wml:28
-msgid "Platforms"
+msgid "Debate"
msgstr ""
#: ../../english/template/debian/votebar.wml:31
-msgid "Proposer"
+msgid "Platforms"
msgstr ""
#: ../../english/template/debian/votebar.wml:34
-msgid "Proposal A Proposer"
+msgid "Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:37
-msgid "Proposal B Proposer"
+msgid "Proposal A Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:40
-msgid "Proposal C Proposer"
+msgid "Proposal B Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:43
-msgid "Proposal D Proposer"
+msgid "Proposal C Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:46
-msgid "Proposal E Proposer"
+msgid "Proposal D Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:49
-msgid "Proposal F Proposer"
+msgid "Proposal E Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:52
-msgid "Seconds"
+msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Proposal A Seconds"
+msgid "Proposal G Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal B Seconds"
+msgid "Proposal H Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal C Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal D Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal E Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Proposal F Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Opposition"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Text"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Proposal A"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal B"
+msgid "Proposal G Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal C"
+msgid "Proposal H Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal D"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal E"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Proposal F"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Choices"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Amendment Proposer"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Seconds"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Text"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Proposer A"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Seconds A"
+msgid "Proposal G"
msgstr ""
#: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Text A"
+msgid "Proposal H"
msgstr ""
#: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Proposer B"
+msgid "Choices"
msgstr ""
#: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Seconds B"
+msgid "Amendment Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:124
-msgid "Amendment Text B"
+msgid "Amendment Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:127
-msgid "Amendment Proposer C"
+msgid "Amendment Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:130
-msgid "Amendment Seconds C"
+msgid "Amendment Proposer A"
msgstr ""
#: ../../english/template/debian/votebar.wml:133
-msgid "Amendment Text C"
+msgid "Amendment Seconds A"
msgstr ""
#: ../../english/template/debian/votebar.wml:136
-msgid "Amendments"
+msgid "Amendment Text A"
msgstr ""
#: ../../english/template/debian/votebar.wml:139
-msgid "Proceedings"
+msgid "Amendment Proposer B"
msgstr ""
#: ../../english/template/debian/votebar.wml:142
-msgid "Majority Requirement"
+msgid "Amendment Seconds B"
msgstr ""
#: ../../english/template/debian/votebar.wml:145
-msgid "Data and Statistics"
+msgid "Amendment Text B"
msgstr ""
#: ../../english/template/debian/votebar.wml:148
-msgid "Quorum"
+msgid "Amendment Proposer C"
msgstr ""
#: ../../english/template/debian/votebar.wml:151
-msgid "Minimum Discussion"
+msgid "Amendment Seconds C"
msgstr ""
#: ../../english/template/debian/votebar.wml:154
-msgid "Ballot"
+msgid "Amendment Text C"
msgstr ""
#: ../../english/template/debian/votebar.wml:157
-msgid "Forum"
+msgid "Amendments"
msgstr ""
#: ../../english/template/debian/votebar.wml:160
+msgid "Proceedings"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:163
+msgid "Majority Requirement"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:166
+msgid "Data and Statistics"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:169
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:172
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:175
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:178
+msgid "Forum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr ""
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr ""
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr ""
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr ""
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr ""
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr ""
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr ""
diff --git a/hungarian/po/cdimage.hu.po b/hungarian/po/cdimage.hu.po
index b0e49441691..1cde107b13e 100644
--- a/hungarian/po/cdimage.hu.po
+++ b/hungarian/po/cdimage.hu.po
@@ -9,20 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "ISO képfájl"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo fájlok"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -119,3 +105,17 @@ msgid ""
msgstr ""
"Angol nyelvű <a href=\"/MailingLists/disclaimer\">nyilvános levelezőlista</"
"a> CD-ről/DVD-ről:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO képfájl"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo fájlok"
diff --git a/hungarian/po/consultants.hu.po b/hungarian/po/consultants.hu.po
index 283204b12ef..780a18b1d7d 100644
--- a/hungarian/po/consultants.hu.po
+++ b/hungarian/po/consultants.hu.po
@@ -9,6 +9,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Konzultánsok névsora"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Vissza a <a href=\"./\">Debian-konzultánsok oldalára</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Név:"
@@ -63,11 +71,3 @@ msgid ""
"worldwide."
msgstr ""
"A világ <total_country> országának <total_consultant> Debian-tanácsadója"
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Konzultánsok névsora"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Vissza a <a href=\"./\">Debian-konzultánsok oldalára</a>."
diff --git a/hungarian/po/countries.hu.po b/hungarian/po/countries.hu.po
index d1da4c9b264..1e0c5f09f64 100644
--- a/hungarian/po/countries.hu.po
+++ b/hungarian/po/countries.hu.po
@@ -218,210 +218,215 @@ msgid "Kenya"
msgstr "Kenya"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazahsztán"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Korea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuvait"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazahsztán"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Litvánia"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxemburg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Lettország"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Marokkó"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldova"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Montenegró"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaszkár"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Macedón Köztársaság"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongólia"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Málta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mexikó"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malajzia"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Új Kaledónia"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Hollandia"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norvégia"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Új-Zéland"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Francia Polinézia"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Fülöp-szigetek"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakisztán"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Lengyelország"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugália"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "Réunion"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Románia"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Szerbia"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Oroszország"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Szaud-Arábia"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Svédország"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Szingapúr"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Szlovénia"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Szlovákia"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "El Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Thaiföld"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tádzsikisztán"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunézia"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Törökország"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Tajvan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukrajna"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Egyesült Államok"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Üzbegisztán"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnám"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Dél-Afrika"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/hungarian/po/distrib.hu.po b/hungarian/po/distrib.hu.po
index 0d983b8927e..72d561c173e 100644
--- a/hungarian/po/distrib.hu.po
+++ b/hungarian/po/distrib.hu.po
@@ -9,99 +9,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Kulcsszó"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Jelenítsd meg"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Keresés helye"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "az útvonal a kulcsszóval végződik"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Csak csomagnevekben"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "azokat csomagokat, amelyek ilyen nevű fájlt tartalmaznak"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Leírásokban"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr ""
-"azokat a csomagokat, amelyek olyan fájlokat tartalmaznak, amelyek nevében "
-"benne van a kulcsszó"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Forráscsomagnevekben"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Csak a pontos egyezéseket mutasd"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Disztribúció"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "kísérleti"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Architektúra"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "mindegyik"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Keresés"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Visszaállítás"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Keresés helye"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Csak csomagnevekben"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Leírásokban"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Forráscsomagnevekben"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Csak a pontos egyezéseket mutasd"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Szekció"
@@ -118,6 +86,38 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Keresés"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Visszaállítás"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Jelenítsd meg"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "az útvonal a kulcsszóval végződik"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "azokat csomagokat, amelyek ilyen nevű fájlt tartalmaznak"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr ""
+"azokat a csomagokat, amelyek olyan fájlokat tartalmaznak, amelyek nevében "
+"benne van a kulcsszó"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Architektúra"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -132,13 +132,11 @@ 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
#, fuzzy
-#| msgid "EABI ARM"
msgid "EABI ARM (armel)"
msgstr "EABI ARM"
@@ -180,7 +178,6 @@ msgstr "MIPS (big endian)"
#: ../../english/releases/arches.data:22
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "MIPS (little endian)"
@@ -198,7 +195,6 @@ msgstr ""
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "MIPS (little endian)"
diff --git a/hungarian/po/doc.hu.po b/hungarian/po/doc.hu.po
index ab71fb2d3af..41b01c30c93 100644
--- a/hungarian/po/doc.hu.po
+++ b/hungarian/po/doc.hu.po
@@ -9,113 +9,28 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:31
-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:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
-msgid ""
-"Written by two Debian developers, this free book\n"
-" started as a translation of their French best-seller known as Cahier de\n"
-" 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:80
-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:101
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-" covers all aspects of the administration of Debian from the installation\n"
-" 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:120
-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:140
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment. It shows the full potential of "
-"the distribution (in its current version 8) 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:191
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Szerző:"
#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Debián csomag"
+
+#: ../../english/doc/books.def:44
msgid "email:"
msgstr "e-mail:"
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
msgid "Available at:"
msgstr "Elérhető:"
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
msgid "CD Included:"
msgstr "CD-t tartalmaz:"
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
msgid "Publisher:"
msgstr "Kiadó:"
@@ -139,47 +54,50 @@ msgstr "Státusz:"
msgid "Availability:"
msgstr "Elérhetőség:"
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
msgid "Latest version:"
msgstr "Utolsó verzió:"
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
msgid "(version <get-var version />)"
msgstr "(<get-var version />) verzió"
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
msgid "plain text"
msgstr "sima szöveg"
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
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:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:177
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
+#: ../../english/doc/manuals.defs:185
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:188
+#: ../../english/doc/manuals.defs:203
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -189,18 +107,108 @@ 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:193
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr "CVS a weben"
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr "Debián csomag"
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
msgid "Debian package (archived)"
msgstr "Debian csomag (archivált)"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/hungarian/po/newsevents.hu.po b/hungarian/po/newsevents.hu.po
index 15dffe572ba..81f8763af3a 100644
--- a/hungarian/po/newsevents.hu.po
+++ b/hungarian/po/newsevents.hu.po
@@ -9,96 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr ""
-
-#: ../../english/News/news.rdf.in:19
-#, fuzzy
-#| msgid "Latest News"
-msgid "Debian Latest News"
-msgstr "Legfrissebb hírek"
-
-#: ../../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 ""
-
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "Név:"
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "E-mail:"
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "Korábbi beszédek:"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Nyelv:"
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Hely:"
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Támakörök:"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr ""
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr ""
-
-#: ../../english/events/talks.defs:15
-#, fuzzy
-#| msgid "Languages:"
-msgid "Language:"
-msgstr "Nyelv:"
-
-#: ../../english/events/talks.defs:19
-#, fuzzy
-#| msgid "Name:"
-msgid "Date:"
-msgstr "Név:"
-
-#: ../../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 "Következő Előadás"
@@ -157,6 +67,124 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (nem működő hivatkozás)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "A hírlevél <a href=\"../..\">korábbi számai</a> elérhetőek."
+
+#. 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\" />A Debian Project Newst <a href=\"mailto:debian-"
+"publicity@lists.debian.org\">%s</a> szerkeszti."
+
+#. 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\" />A Debian Project Newst <a href=\"mailto:debian-"
+"publicity@lists.debian.org\">%s</a> szerkeszti."
+
+#. 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\" />Ezt a Debian Project Newst <a href=\"mailto:debian-"
+"publicity@lists.debian.org\">%s</a> szerkesztette."
+
+#. 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\" />Ezt a Debian Project Newst <a href=\"mailto:debian-"
+"publicity@lists.debian.org\">%s</a> szerkesztette."
+
+#. 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\" />Fordította: %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\" />Fordították: %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\" />Fordította: %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\" />Fordították: %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 ""
+"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>."
+
+#. 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 ""
+"A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+
+#. 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 ""
+"A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+
+#. 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 ""
+"A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkesztette."
+
+#. 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 ""
+"A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkesztette."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -338,135 +366,92 @@ msgid ""
"the following topics:"
msgstr ""
-#: ../../english/template/debian/projectnews/footer.wml:6
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
+
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr ""
+
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr ""
+
+#: ../../english/events/talks.defs:15
#, 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>."
+msgid "Language:"
+msgstr "Nyelv:"
+
+#: ../../english/events/talks.defs:19
+#, fuzzy
+msgid "Date:"
+msgstr "Név:"
+
+#: ../../english/events/talks.defs:23
+msgid "Event:"
msgstr ""
-"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
-msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-msgstr "A hírlevél <a href=\"../..\">korábbi számai</a> elérhetőek."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+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>."
+#: ../../english/events/talks.defs:29
+msgid "source"
msgstr ""
-"<void id=\"singular\" />A Debian Project Newst <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a> szerkeszti."
-#. 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>."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
msgstr ""
-"<void id=\"plural\" />A Debian Project Newst <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a> szerkeszti."
-#. 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>."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
msgstr ""
-"<void id=\"singular\" />Ezt a Debian Project Newst <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a> szerkesztette."
-#. 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>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
msgstr ""
-"<void id=\"plural\" />Ezt a Debian Project Newst <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a> szerkesztette."
-#. 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\" />Fordította: %s."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr ""
-#. 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\" />Fordították: %s."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr ""
-#. 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\" />Fordította: %s."
+#: ../../english/News/news.rdf.in:19
+#, fuzzy
+msgid "Debian Latest News"
+msgstr "Legfrissebb hírek"
-#. 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\" />Fordították: %s."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr ""
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Felszólalók listája:"
+#~ msgid "Name:"
+#~ msgstr "Név:"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Vissza a <a href=\"./\">Debian-előadók oldalára</a>."
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
-#: ../../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 ""
-"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>."
+#~ msgid "Previous Talks:"
+#~ msgstr "Korábbi beszédek:"
-#. 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 ""
-"A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#~ msgid "Languages:"
+#~ msgstr "Nyelv:"
-#. 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 ""
-"A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkeszti."
+#~ msgid "Location:"
+#~ msgstr "Hely:"
-#. 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 ""
-"A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkesztette."
+#~ msgid "Topics:"
+#~ msgstr "Támakörök:"
-#. 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 ""
-"A Debian Weekly Newst <a href=\"mailto:dwn@debian.org\">%s</a> szerkesztette."
+#~ msgid "List of Speakers"
+#~ msgstr "Felszólalók listája:"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Vissza a <a href=\"./\">Debian-előadók oldalára</a>."
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/hungarian/po/organization.hu.po b/hungarian/po/organization.hu.po
index 1d3595b7a8c..05d08c222e6 100644
--- a/hungarian/po/organization.hu.po
+++ b/hungarian/po/organization.hu.po
@@ -42,299 +42,336 @@ msgid "manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr ""
-
-#: ../../english/intro/organization.data:34
#, fuzzy
-#| msgid "Release Managers"
msgid "Stable Release Manager"
msgstr "Kiadásmenedzserek"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr ""
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr ""
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "elnök"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
#, fuzzy
-#| msgid "FTP Assistants"
msgid "assistant"
msgstr "FTP asszisztensek"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "titkár"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Tisztviselők"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Disztribúció"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Sajtó és nyilvánosság"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Felhasználói támogatás és infrastruktúra"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Vezető"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Szakmai bizottság"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Titkár"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Fejlesztési projektek"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP-archívumok"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
#, fuzzy
-#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "főnök"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "FTP asszisztensek"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Egyedi csomagok"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Kiadásmenedzsment"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
#, fuzzy
-#| msgid "Release Notes"
msgid "Release Team"
msgstr "Verzióinformációk"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Minőségbiztosítás"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "A telepítési rendszer karbantartói"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Verzióinformációk"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD-image-ek"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Gyártás"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Tesztelés"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
#, fuzzy
-#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Felhasználói támogatás és infrastruktúra"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
#, fuzzy
-#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Rendszeradminisztráció"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentáció"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "További munkát igénylő és jövőbeli csomagok"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Portolások"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Különleges konfigurációk"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Laptopok"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Tűzfalak"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Beágyazott rendszerek"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Sajtókapcsolatok"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Weboldalak"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
#, fuzzy
-#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Fejlesztési projektek"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Események"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Szakmai bizottság"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Partnerségi program"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Hardveradomány-koordinátorok"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Felhasználói támogatás"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Hibakövető rendszer"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
#, fuzzy
-#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "A levelezőlisták adminisztrátorai"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
#, fuzzy
-#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Új karbantartók felvétele"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Debian accountok kezelése"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Kulcscsomó-karbantartók (PGP és GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Biztonsági csoport"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Konzultánsok oldala"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "CD-terjesztők oldala"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Szabályzat"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Rendszeradminisztráció"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -342,7 +379,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:435
+#: ../../english/intro/organization.data:469
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 "
@@ -352,68 +389,63 @@ 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:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP fejlesztői adatbázis adminisztrátora"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Tükrözések"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "DNS-karbantartó"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Csomagkövető rendszer"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Alioth-felügyelet"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Debian gyerekeknek 1-től 99 éves korig"
+#~ msgid "Individual Packages"
+#~ msgstr "Egyedi csomagok"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Debian az orvosi gyakorlatban és kutatásban"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian gyerekeknek 1-től 99 éves korig"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Debian az oktatásban"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian az orvosi gyakorlatban és kutatásban"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Debian az ügyvédi irodákban"
+#~ msgid "Debian for education"
+#~ msgstr "Debian az oktatásban"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian az ügyvédi irodákban"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Debian a fogyatékkal élők számára"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian a fogyatékkal élők számára"
-#: ../../english/intro/organization.data:486
#, fuzzy
-#| msgid "Debian for medical practice and research"
-msgid "Debian for science and related research"
-msgstr "Debian az orvosi gyakorlatban és kutatásban"
+#~| msgid "Debian for medical practice and research"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian az orvosi gyakorlatban és kutatásban"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian az oktatásban"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian az oktatásban"
#, fuzzy
#~| msgid "Installation System Team"
diff --git a/hungarian/po/others.hu.po b/hungarian/po/others.hu.po
index 4fc52d41b35..65b49bde6d9 100644
--- a/hungarian/po/others.hu.po
+++ b/hungarian/po/others.hu.po
@@ -57,42 +57,6 @@ msgstr "Ismeretlen"
msgid "Unavailable"
msgstr "Nem elérhető"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Új Tagok Sarka"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Első lépés"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Második lépés"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Harmadik lépés"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Negyedik lépés"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Ötödik lépés"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Hatodik lépés"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Hetedik lépés"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Jelöltek ellenőrzési listája"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -156,131 +120,94 @@ msgstr "[Debian powered]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (mini gomb)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "mint fent"
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Termékek"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "T Pólók"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "sapkák"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "maricák"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "bögrék"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "más öltözékek"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "Pólók"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "frisbee-k"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "egérpadok"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "jelvények"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "kosárlabda gólok"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "fülbevalók"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "utitáskák"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "esernyők"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "párnahuzat"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "kulcstartók"
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "Svájci bicskák"
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr "USB kulcsok"
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr "rögzítők"
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr "mások"
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr "Debian-nak adományozott pénz"
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr "Szabad szoftver események szervezésére felhasznált pénz"
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Mióta használsz Debian-t?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Debian fejlesző vagy?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "A Debian melyik részével foglalkozol?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Miért kezdél a Debian-nal foglalkozni?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-"Van ötleted olyan hölgyeknek, akik mélyebben szeretnek Debian-nal "
-"foglalkozni?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr "Része vagy más női technológiai csoportnak? Melyik(ek)nek?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Picit több rólad..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -325,6 +252,79 @@ msgstr "Verzió"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Új Tagok Sarka"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Első lépés"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Második lépés"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Harmadik lépés"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Negyedik lépés"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Ötödik lépés"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Hatodik lépés"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Hetedik lépés"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Jelöltek ellenőrzési listája"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "mint fent"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Mióta használsz Debian-t?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Debian fejlesző vagy?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "A Debian melyik részével foglalkozol?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Miért kezdél a Debian-nal foglalkozni?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+"Van ötleted olyan hölgyeknek, akik mélyebben szeretnek Debian-nal "
+"foglalkozni?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr "Része vagy más női technológiai csoportnak? Melyik(ek)nek?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Picit több rólad..."
+
#~ msgid "Name:"
#~ msgstr "Név:"
diff --git a/hungarian/po/partners.hu.po b/hungarian/po/partners.hu.po
index 021ae624d61..644cd23a422 100644
--- a/hungarian/po/partners.hu.po
+++ b/hungarian/po/partners.hu.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/hungarian/po/ports.hu.po b/hungarian/po/ports.hu.po
index 7341155efd0..2ef88a32de1 100644
--- a/hungarian/po/ports.hu.po
+++ b/hungarian/po/ports.hu.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian Alpha-ra"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian PA-RISC-re"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd CD-k"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian IA-64-re"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Kapocslat"
@@ -89,6 +73,22 @@ msgstr "Ellátás"
msgid "Systems"
msgstr "Rendszerek"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian Alpha-ra"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian PA-RISC-re"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd CD-k"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian IA-64-re"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD i386-ra"
diff --git a/hungarian/po/security.hu.po b/hungarian/po/security.hu.po
index e17669314f3..0086c5fb362 100644
--- a/hungarian/po/security.hu.po
+++ b/hungarian/po/security.hu.po
@@ -9,42 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr ""
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr ""
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "K"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"<a href=\\\"undated/\\\">dátum nélküli</a> biztonsági figyelmeztetések, az "
-"utókor számára"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr ""
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Forrás:"
@@ -122,3 +86,39 @@ msgstr ""
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr ""
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "K"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr ""
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"<a href=\\\"undated/\\\">dátum nélküli</a> biztonsági figyelmeztetések, az "
+"utókor számára"
diff --git a/hungarian/po/stats.hu.po b/hungarian/po/stats.hu.po
index a81ecbcc61e..d1cec3c530c 100644
--- a/hungarian/po/stats.hu.po
+++ b/hungarian/po/stats.hu.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/hungarian/po/templates.hu.po b/hungarian/po/templates.hu.po
index 187fdefd0a1..b0f3e6e950a 100644
--- a/hungarian/po/templates.hu.po
+++ b/hungarian/po/templates.hu.po
@@ -9,20 +9,9 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-#, fuzzy
-#| msgid "Debian Project"
-msgid "Debian website"
-msgstr "Debian projekt"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian"
msgstr "Segíts a Debiannak"
@@ -44,10 +33,6 @@ msgstr "Debian projekt"
#: ../../english/template/debian/common_translation.wml:13
#, fuzzy
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -89,7 +74,6 @@ msgstr "Kapcsolatfelvétel"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Verziók"
@@ -165,10 +149,14 @@ msgstr "A Debian beszerzése"
#: ../../english/template/debian/common_translation.wml:91
#, fuzzy
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "Könyvek a Debianról"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Legutóbbi módosítás"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -212,13 +200,8 @@ 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -230,31 +213,29 @@ 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:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Legutóbbi módosítás"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr ""
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr ""
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
#, fuzzy
-#| msgid ""
-#| "Debian is a registered trademark of 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."
@@ -270,6 +251,14 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
"Hogyan állítsd be <a href=m4_HOME/intro/cn>az alapértelmezett nyelvet?</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr ""
@@ -288,13 +277,11 @@ msgstr "Heti hírek"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Project News"
msgstr "Debian projekt"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly News"
msgid "Project News"
msgstr "Heti hírek"
@@ -320,7 +307,6 @@ 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"
@@ -354,7 +340,6 @@ msgstr "Fejlesztők adatbázisa"
#: ../../english/template/debian/links.tags.wml:64
#, fuzzy
-#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Könyvek a Debianról"
@@ -464,7 +449,6 @@ msgstr ""
#: ../../english/template/debian/navbar.wml:10
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "Debian projekt"
@@ -508,6 +492,15 @@ msgstr ""
msgid "Report"
msgstr ""
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -542,10 +535,19 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Vissza a <a href=\"./\">ki használja a Debiant oldalra</a>."
+#: ../../english/search.xml.in:7
+#, fuzzy
+msgid "Debian website"
+msgstr "Debian projekt"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
#~ msgid "List of Consultants"
#~ msgstr "Konzultánsok névsora"
diff --git a/hungarian/po/vendors.hu.po b/hungarian/po/vendors.hu.po
index 52cbe7dc5d1..c9ee72e41ac 100644
--- a/hungarian/po/vendors.hu.po
+++ b/hungarian/po/vendors.hu.po
@@ -23,13 +23,11 @@ msgstr ""
#: ../../english/CD/vendors/vendors.CD.def:17
#, fuzzy
-#| msgid "Architectures:"
msgid "Architectures"
msgstr "Architektúrák:"
#: ../../english/CD/vendors/vendors.CD.def:18
#, fuzzy
-#| msgid "Ship International:"
msgid "Ship International"
msgstr "Nemzetközi szállítás:"
diff --git a/hungarian/po/vote.hu.po b/hungarian/po/vote.hu.po
index 6124778e881..1bdb24c0eb1 100644
--- a/hungarian/po/vote.hu.po
+++ b/hungarian/po/vote.hu.po
@@ -26,237 +26,265 @@ msgid "Nominations"
msgstr ""
#: ../../english/template/debian/votebar.wml:25
-msgid "Debate"
+msgid "Withdrawals"
msgstr ""
#: ../../english/template/debian/votebar.wml:28
-msgid "Platforms"
+msgid "Debate"
msgstr ""
#: ../../english/template/debian/votebar.wml:31
-msgid "Proposer"
+msgid "Platforms"
msgstr ""
#: ../../english/template/debian/votebar.wml:34
-msgid "Proposal A Proposer"
+msgid "Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:37
-msgid "Proposal B Proposer"
+msgid "Proposal A Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:40
-msgid "Proposal C Proposer"
+msgid "Proposal B Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:43
-msgid "Proposal D Proposer"
+msgid "Proposal C Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:46
-msgid "Proposal E Proposer"
+msgid "Proposal D Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:49
-msgid "Proposal F Proposer"
+msgid "Proposal E Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:52
-msgid "Seconds"
+msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Proposal A Seconds"
+msgid "Proposal G Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal B Seconds"
+msgid "Proposal H Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal C Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal D Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal E Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Proposal F Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Opposition"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Text"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Proposal A"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal B"
+msgid "Proposal G Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal C"
+msgid "Proposal H Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal D"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal E"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Proposal F"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Choices"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Amendment Proposer"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Seconds"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Text"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Proposer A"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Seconds A"
+msgid "Proposal G"
msgstr ""
#: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Text A"
+msgid "Proposal H"
msgstr ""
#: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Proposer B"
+msgid "Choices"
msgstr ""
#: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Seconds B"
+msgid "Amendment Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:124
-msgid "Amendment Text B"
+msgid "Amendment Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:127
-msgid "Amendment Proposer C"
+msgid "Amendment Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:130
-msgid "Amendment Seconds C"
+msgid "Amendment Proposer A"
msgstr ""
#: ../../english/template/debian/votebar.wml:133
-msgid "Amendment Text C"
+msgid "Amendment Seconds A"
msgstr ""
#: ../../english/template/debian/votebar.wml:136
-msgid "Amendments"
+msgid "Amendment Text A"
msgstr ""
#: ../../english/template/debian/votebar.wml:139
-msgid "Proceedings"
+msgid "Amendment Proposer B"
msgstr ""
#: ../../english/template/debian/votebar.wml:142
-msgid "Majority Requirement"
+msgid "Amendment Seconds B"
msgstr ""
#: ../../english/template/debian/votebar.wml:145
-msgid "Data and Statistics"
+msgid "Amendment Text B"
msgstr ""
#: ../../english/template/debian/votebar.wml:148
-msgid "Quorum"
+msgid "Amendment Proposer C"
msgstr ""
#: ../../english/template/debian/votebar.wml:151
-msgid "Minimum Discussion"
+msgid "Amendment Seconds C"
msgstr ""
#: ../../english/template/debian/votebar.wml:154
-msgid "Ballot"
+msgid "Amendment Text C"
msgstr ""
#: ../../english/template/debian/votebar.wml:157
-msgid "Forum"
+msgid "Amendments"
msgstr ""
#: ../../english/template/debian/votebar.wml:160
+msgid "Proceedings"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:163
+msgid "Majority Requirement"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:166
+msgid "Data and Statistics"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:169
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:172
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:175
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:178
+msgid "Forum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Szponzorokat keresünk"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Vita tárgya"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Szavazás alatt"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Eldőlt"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Egyéb"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Kezdőoldal - Szavazás"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Hogyan"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Adj be indítványt"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Módosíts indítványt"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Kövess indítványt"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Olvasd el a végeredményt"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Szavazz"
diff --git a/indonesian/po/blends.id.po b/indonesian/po/blends.id.po
index cfe3f52221b..1e33079fa44 100644
--- a/indonesian/po/blends.id.po
+++ b/indonesian/po/blends.id.po
@@ -47,9 +47,6 @@ msgstr ""
#: ../../english/blends/released.data:31
#, fuzzy
-#| msgid ""
-#| "The goal of Debian Games is to provide games in Debian from arcade and "
-#| "aventure to simulation and strategy."
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
diff --git a/indonesian/po/cdimage.id.po b/indonesian/po/cdimage.id.po
index 944684f3cc2..ba9ae54913f 100644
--- a/indonesian/po/cdimage.id.po
+++ b/indonesian/po/cdimage.id.po
@@ -11,20 +11,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../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:87
-msgid "ISO images"
-msgstr "image ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Berkas jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -121,3 +107,17 @@ msgid ""
msgstr ""
"English-language <a href=\"/MailingLists/disclaimer\">Milis publik</a> untuk "
"CD/DVD:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "image ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Berkas jigdo"
diff --git a/indonesian/po/consultants.id.po b/indonesian/po/consultants.id.po
index fcf444338e3..0dbafd1ab5c 100644
--- a/indonesian/po/consultants.id.po
+++ b/indonesian/po/consultants.id.po
@@ -12,6 +12,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Daftar Konsultan"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Kembali ke <a href=\"./\">halaman Konsultan</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Nama: "
@@ -67,11 +75,3 @@ msgid ""
msgstr ""
"<total_consultant> konsultan Debian yang terdaftar di <total_country> "
"negara di dunia."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Daftar Konsultan"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Kembali ke <a href=\"./\">halaman Konsultan</a>."
diff --git a/indonesian/po/countries.id.po b/indonesian/po/countries.id.po
index 3f73dd2395e..4cab7975418 100644
--- a/indonesian/po/countries.id.po
+++ b/indonesian/po/countries.id.po
@@ -220,210 +220,215 @@ msgid "Kenya"
msgstr "Kenya"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazakhstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Korea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuwait"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazakhstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Lituania"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxemburg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Latvia"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Maroko"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldova"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Serbia Montenegro"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Republik Dominika"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongolia"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Meksiko"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malaysia"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "New Caledonia"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nikaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Belanda"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norwegia"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Selandia Baru"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "French Polynesia"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipina"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polandia"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugal"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Rumania"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Serbia"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusia"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Arab Saudi"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Swedia"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapura"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovenia"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slowakia"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "El Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Thailand"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tajikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunisia"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turki"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Thailand"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukraina"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Amerika Serikat"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Afrika Selatan"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/indonesian/po/distrib.id.po b/indonesian/po/distrib.id.po
index 21a864feb9b..41e5d51dab2 100644
--- a/indonesian/po/distrib.id.po
+++ b/indonesian/po/distrib.id.po
@@ -11,99 +11,67 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Kata kunci"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Perlihatkan"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Cari di"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "lokasi diakhiri dengan kata kunci"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Hanya nama paket"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "paket yang mengandung nama berkas seperti ini"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Diskripsi"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr ""
-"paket yang mengandung berkas atau direktori yang mempunyai nama seperti kata "
-"kunci"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Nama paket sumber"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Hanya menampilkan hasil yang tepat"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribusi"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stabil"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Arsitektur"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "semua"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Cari"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Reset"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Cari di"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Hanya nama paket"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Diskripsi"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Nama paket sumber"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Hanya menampilkan hasil yang tepat"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Section"
@@ -120,6 +88,38 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Cari"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Reset"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Perlihatkan"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "lokasi diakhiri dengan kata kunci"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "paket yang mengandung nama berkas seperti ini"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr ""
+"paket yang mengandung berkas atau direktori yang mempunyai nama seperti kata "
+"kunci"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Arsitektur"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -138,13 +138,11 @@ msgstr "64-bit ARM (AArch64)"
#: ../../english/releases/arches.data:12
#, fuzzy
-#| msgid "EABI ARM"
msgid "EABI ARM (armel)"
msgstr "EABI ARM"
#: ../../english/releases/arches.data:13
#, fuzzy
-#| msgid "Hard Float ABI ARM"
msgid "Hard Float ABI ARM (armhf)"
msgstr "Hard Float ABI ARM"
@@ -182,7 +180,6 @@ msgstr "MIPS (big endian)"
#: ../../english/releases/arches.data:22
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "MIPS (little endian)"
@@ -200,7 +197,6 @@ msgstr "POWER Processors"
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "MIPS (little endian)"
diff --git a/indonesian/po/doc.id.po b/indonesian/po/doc.id.po
index 77430e35940..26e879deccd 100644
--- a/indonesian/po/doc.id.po
+++ b/indonesian/po/doc.id.po
@@ -13,10 +13,126 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.6.10\n"
-#: ../../english/doc/books.data:31
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Penulis:"
+
+#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Paket Debian"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "email:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Tersedia di:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "Termasuk CD:"
+
+#: ../../english/doc/books.def:54
+msgid "Publisher:"
+msgstr "Penernit:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Penulis:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Penyunting:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Pemelihara:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Ketersediaan:"
+
+#: ../../english/doc/manuals.defs:97
+msgid "Latest version:"
+msgstr "Versi terbaru:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(versi <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "plain text"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"Sumber terbaru <get-var srctype /> tersedia di repositori <a href=\"https://"
+"packages.debian.org/git\">Git</a>."
+
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Antar muka Web: "
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "Antar muka VCS: "
+
+#: ../../english/doc/manuals.defs:177
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+"Sumber terbaru <get-var srctype /> tersedia di repositori <a href=\"https://"
+"packages.debian.org/cvs\">Cvs</a>."
+
+#: ../../english/doc/manuals.defs:185
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a> repository."
+msgstr ""
+"Sumber terbaru <get-var srctype /> tersedia di repositori <a href=\"https://"
+"packages.debian.org/subversion\">Subversion</a>."
+
+#: ../../english/doc/manuals.defs:203
+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 ""
+"Sumber salinan pekerjaan CVS: mengatur <code>CVSROOT</code>\n"
+" 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:208
+msgid "CVS via web"
+msgstr "CVS melalui web"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Paket Debian"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Paket Debian (arsip)"
+
+#: ../../english/doc/books.data:32
msgid ""
"\n"
-" Debian 8 is the must-have handbook for learning Linux. Start on the\n"
+" Debian 9 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"
@@ -30,8 +146,8 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -46,7 +162,7 @@ msgid ""
" virtualization with Xen, KVM or LXC."
msgstr ""
-#: ../../english/doc/books.data:80
+#: ../../english/doc/books.data:83
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,7 +177,7 @@ msgstr ""
" dasar untuk pengguna yang menginstall dan memelihara sistemnya sendiri\n"
" (baik itu di rumah, kantor, klub, atau sekolah)."
-#: ../../english/doc/books.data:101
+#: ../../english/doc/books.data:105
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"
@@ -83,7 +199,7 @@ msgstr ""
"dengan\n"
" Debian."
-#: ../../english/doc/books.data:120
+#: ../../english/doc/books.data:125
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -95,7 +211,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:140
+#: ../../english/doc/books.data:146
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 "
@@ -103,7 +219,7 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
-#: ../../english/doc/books.data:191
+#: ../../english/doc/books.data:200
msgid ""
"Written by two penetration researcher - Annihilator, Firstblood.\n"
" This book teaches you how to build and configure Debian 8.x server system\n"
@@ -119,114 +235,6 @@ msgid ""
" intrusion detection system."
msgstr ""
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Penulis:"
-
-#: ../../english/doc/books.def:41
-msgid "email:"
-msgstr "email:"
-
-#: ../../english/doc/books.def:45
-msgid "Available at:"
-msgstr "Tersedia di:"
-
-#: ../../english/doc/books.def:48
-msgid "CD Included:"
-msgstr "Termasuk CD:"
-
-#: ../../english/doc/books.def:51
-msgid "Publisher:"
-msgstr "Penernit:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Penulis:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Penyunting:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Pemelihara:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Status:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Ketersediaan:"
-
-#: ../../english/doc/manuals.defs:92
-msgid "Latest version:"
-msgstr "Versi terbaru:"
-
-#: ../../english/doc/manuals.defs:108
-msgid "(version <get-var version />)"
-msgstr "(versi <get-var version />)"
-
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "plain text"
-
-#: ../../english/doc/manuals.defs:154 ../../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 ""
-"Sumber terbaru <get-var srctype /> tersedia di repositori <a href=\"https://"
-"packages.debian.org/git\">Git</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 "Antar muka 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 "Antar muka 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 ""
-"Sumber terbaru <get-var srctype /> tersedia di repositori <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 ""
-"Sumber terbaru <get-var srctype /> tersedia di repositori <a href=\"https://"
-"packages.debian.org/subversion\">Subversion</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 ""
-"Sumber salinan pekerjaan CVS: mengatur <code>CVSROOT</code>\n"
-" 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:193
-msgid "CVS via web"
-msgstr "CVS melalui web"
-
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
-msgid "Debian package"
-msgstr "Paket Debian"
-
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
-msgid "Debian package (archived)"
-msgstr "Paket Debian (arsip)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/indonesian/po/newsevents.id.po b/indonesian/po/newsevents.id.po
index 38430944ddb..127c0c6c0fa 100644
--- a/indonesian/po/newsevents.id.po
+++ b/indonesian/po/newsevents.id.po
@@ -11,90 +11,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Berita Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Berita Terbaru 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 "Newsletter untuk komunitas Debian"
-
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "Nama:"
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "Email:"
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "Pembicaraan Sebelumnya:"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Bahasa:"
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Lokasi:"
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Topik:"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Judul:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Penulis:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Bahasa:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Tanggal:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Acara:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Slide:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "sumber"
-
-#: ../../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 ""
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Acara mendatang"
@@ -153,6 +69,125 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (tautan mati)"
+#: ../../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 ""
+"Untuk menerima newsletter ini di email anda, silahkan <a href=\"https://"
+"lists.debian.org/debian-news/\">berlangganan ke milis 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 "Edisi lama newsletter ini tersedia di <a href=\"../../\">sini</a>."
+
+#. 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\" />Berita Proyek Debian disunting oleh <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\" />Berita Proyek Debian disunting oleh <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\" />Berita Proyek Debian edisi ini disunting oleh <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\" />Berita Proyek Debian edisi ini disunting oleh <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\" />Ini telah diterjemahkan oleh %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\" />Ini telah diterjemahkan oleh %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\" />Ini telah diterjemahkan oleh %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\" />Ini telah diterjemahkan oleh %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 ""
+
+#. 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\" />Berita Mingguan Debian disunting oleh <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\" />Berita Mingguan Debian disunting oleh <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\" />Berita Mingguan Debian edisi ini disunting oleh <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\" />Berita Mingguan Debian edisi ini disunting oleh <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -334,132 +369,89 @@ msgid ""
"the following topics:"
msgstr ""
-#: ../../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 ""
-"Untuk menerima newsletter ini di email anda, silahkan <a href=\"https://"
-"lists.debian.org/debian-news/\">berlangganan ke milis debian-news</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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 "Edisi lama newsletter ini tersedia di <a href=\"../../\">sini</a>."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Judul:"
-#. 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\" />Berita Proyek Debian disunting oleh <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Penulis:"
-#. 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\" />Berita Proyek Debian disunting oleh <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Bahasa:"
-#. 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\" />Berita Proyek Debian edisi ini disunting oleh <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Tanggal:"
-#. 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>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Acara:"
+
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Slide:"
+
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "sumber"
+
+#: ../../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 ""
-"<void id=\"plural\" />Berita Proyek Debian edisi ini disunting oleh <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\" />Ini telah diterjemahkan oleh %s."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Berita Debian"
-#. 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\" />Ini telah diterjemahkan oleh %s."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Berita Terbaru Debian"
-#. 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\" />Ini telah diterjemahkan oleh %s."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Newsletter untuk komunitas Debian"
-#. 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\" />Ini telah diterjemahkan oleh %s."
+#~ msgid "Name:"
+#~ msgstr "Nama:"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Daftar Pembicara"
+#~ msgid "Email:"
+#~ msgstr "Email:"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Kembali ke <a href=\"./\">halaman pembicara Debian</a>."
+#~ msgid "Previous Talks:"
+#~ msgstr "Pembicaraan Sebelumnya:"
-#: ../../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 ""
+#~ msgid "Languages:"
+#~ msgstr "Bahasa:"
-#. 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\" />Berita Mingguan Debian disunting oleh <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Location:"
+#~ msgstr "Lokasi:"
-#. 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\" />Berita Mingguan Debian disunting oleh <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#~ msgid "Topics:"
+#~ msgstr "Topik:"
-#. 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\" />Berita Mingguan Debian edisi ini disunting oleh <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "List of Speakers"
+#~ msgstr "Daftar Pembicara"
-#. 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\" />Berita Mingguan Debian edisi ini disunting oleh <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Kembali ke <a href=\"./\">halaman pembicara Debian</a>."
#, fuzzy
#~ msgid ""
diff --git a/indonesian/po/organization.id.po b/indonesian/po/organization.id.po
index 0dadd7db695..be4f21eab8a 100644
--- a/indonesian/po/organization.id.po
+++ b/indonesian/po/organization.id.po
@@ -45,299 +45,336 @@ msgid "manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr ""
-
-#: ../../english/intro/organization.data:34
#, fuzzy
-#| msgid "Release Managers"
msgid "Stable Release Manager"
msgstr "Manager Rilis"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr ""
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr ""
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "ketua"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
#, fuzzy
-#| msgid "FTP Assistants"
msgid "assistant"
msgstr "Asisten FTP"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "sekretaris"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Petugas"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribusi"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Publikasi"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Dukungan dan infrastruktur"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Ketua"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Komisi Teknis"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Sekretaris"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Proyek Pengembangan"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Arsip FTP"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
#, fuzzy
-#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP Master"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Asisten FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Paket individu"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Menagement rilis"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
#, fuzzy
-#| msgid "Release Notes"
msgid "Release Team"
msgstr "Catatan Rilis"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Jaminan Kualitas"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Tim Instalasi Sistem"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Catatan Rilis"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD Image"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produksi"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Pengujian"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
#, fuzzy
-#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Dukungan dan infrastruktur"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
#, fuzzy
-#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Administrasi sistem"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentasi"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Daftar paket yang butuh dikerjakan dan paket yang diharapkan"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Ports"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Konfigurasi Instimewa"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Laptop"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Firewall"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Sistem embedded"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Kontak press"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Halaman web"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
#, fuzzy
-#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Proyek Pengembangan"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Acara"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Komisi Teknis"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Program Partner"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Koordiasi donasi perangkat keras"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Dukungan pengguna"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Sistem Bug Tracking"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
#, fuzzy
-#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Asministrasi Milis"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
#, fuzzy
-#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "New Maintainers Front Desk"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Pengelola akun Debian"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Pengelola Keyring (PGP dan GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Tim keamanan"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Halaman konsultan"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "Halaman penyedia CD"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Peraturan"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Administrasi sistem"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -345,7 +382,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:435
+#: ../../english/intro/organization.data:469
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 "
@@ -355,68 +392,63 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">mesin Debian</a>, yang mengandung "
"informasi administrasi per mesin"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "Administrator Direktori LDAP pengembang"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Cermin"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "Pengelola DNS"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Sistem tracking paket"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Administrator Alioth"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Debian untuk anak kecil dari 1 sampai 99"
+#~ msgid "Individual Packages"
+#~ msgstr "Paket individu"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Debian untuk medis dan penelitian"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian untuk anak kecil dari 1 sampai 99"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Debian untuk edukasi"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian untuk medis dan penelitian"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Debian di kantor hukum"
+#~ msgid "Debian for education"
+#~ msgstr "Debian untuk edukasi"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian di kantor hukum"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Debian untuk penyandang cacat"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian untuk penyandang cacat"
-#: ../../english/intro/organization.data:486
#, fuzzy
-#| msgid "Debian for medical practice and research"
-msgid "Debian for science and related research"
-msgstr "Debian untuk medis dan penelitian"
+#~| msgid "Debian for medical practice and research"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian untuk medis dan penelitian"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian untuk edukasi"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian untuk edukasi"
#, fuzzy
#~| msgid "Installation System Team"
diff --git a/indonesian/po/others.id.po b/indonesian/po/others.id.po
index dd5d26b9607..0a094222895 100644
--- a/indonesian/po/others.id.po
+++ b/indonesian/po/others.id.po
@@ -59,50 +59,8 @@ msgstr "Tidak diketahui"
msgid "Unavailable"
msgstr "Tidak tersedia"
-#: ../../english/devel/join/nm-steps.inc:7
-#, fuzzy
-#| msgid "New Maintainers' Corner"
-msgid "New Members Corner"
-msgstr "Pojok Pengelola Baru"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Langkah 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Langkah 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Langkah 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Langkah 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Langkah 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Langkah 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Langkah 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Daftar pembanding pendaftar"
-
#: ../../english/devel/website/tc.data:11
#, fuzzy
-#| msgid ""
-#| "See <a href=\"m4_HOME/intl/french/index.fr.html\">https://www.debian.org/"
-#| "intl/french/index.fr.html</a> (only available in French) for more "
-#| "information."
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
"(only available in French) for more information."
@@ -128,19 +86,16 @@ msgstr ""
#: ../../english/distrib/pre-installed.defs:18
#, fuzzy
-#| msgid "Phone:"
msgid "Phone"
msgstr "Telepon:"
#: ../../english/distrib/pre-installed.defs:19
#, fuzzy
-#| msgid "Fax:"
msgid "Fax"
msgstr "Faks:"
#: ../../english/distrib/pre-installed.defs:21
#, fuzzy
-#| msgid "Address:"
msgid "Address"
msgstr "Alamat :"
@@ -172,131 +127,95 @@ msgstr "[Penggerak Debian]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (tombol mini)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "sama dengan atas"
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Produk"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "Kaos"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "topi"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "stiker"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "gelas"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "baju lainnya"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "baju polo"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "frisbees"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "landasan tetikus"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "badge"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "basketball goals"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "earrings"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "suitcases"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
#, fuzzy
-#| msgid "suitcases"
msgid "pillowcases"
msgstr "suitcases"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr ""
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr ""
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr ""
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -341,6 +260,78 @@ msgstr "Versi"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+#, fuzzy
+msgid "New Members Corner"
+msgstr "Pojok Pengelola Baru"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Langkah 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Langkah 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Langkah 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Langkah 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Langkah 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Langkah 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Langkah 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Daftar pembanding pendaftar"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "sama dengan atas"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
#~ msgid "Where:"
#~ msgstr "Dimana:"
diff --git a/indonesian/po/partners.id.po b/indonesian/po/partners.id.po
index 021ae624d61..644cd23a422 100644
--- a/indonesian/po/partners.id.po
+++ b/indonesian/po/partners.id.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/indonesian/po/ports.id.po b/indonesian/po/ports.id.po
index bd4d80eb5f2..0d703cfea2a 100644
--- a/indonesian/po/ports.id.po
+++ b/indonesian/po/ports.id.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian untuk Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian untuk PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd CD"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian untuk IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Kontak"
@@ -92,6 +76,22 @@ msgstr "Supply"
msgid "Systems"
msgstr "Systems"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian untuk Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian untuk PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd CD"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian untuk IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD untuk i386"
diff --git a/indonesian/po/security.id.po b/indonesian/po/security.id.po
index 903606ae12c..661adbc5a1b 100644
--- a/indonesian/po/security.id.po
+++ b/indonesian/po/security.id.po
@@ -9,41 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr ""
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr ""
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr ""
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:92
-#, fuzzy
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Rawan"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Sumber"
@@ -127,3 +92,38 @@ msgstr ""
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr ""
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:92
+#, fuzzy
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Rawan"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/indonesian/po/stats.id.po b/indonesian/po/stats.id.po
index 6f7ad3b1223..9c89ce55458 100644
--- a/indonesian/po/stats.id.po
+++ b/indonesian/po/stats.id.po
@@ -15,22 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Statistik penerjemahan web site Debian"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Ada %d halaman-halaman untuk diterjemahkan."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Ada %d bytes untuk diterjemahkan."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Ada %d strings untuk diterjemahkan."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Versi terjemahan yang salah"
@@ -48,13 +32,13 @@ msgid "The original no longer exists"
msgstr "Aslinya tidak ada lagi"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "jumlah hit N/A"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "hit"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "jumlah hit N/A"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Klik untuk mengambil data diffstat"
@@ -67,15 +51,6 @@ msgstr ""
msgid "Translation summary for"
msgstr "Ringkasan terjemahan untuk"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Tidak diterjemahkan"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Telah usang"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Telah diterjemahkan"
@@ -85,6 +60,15 @@ msgstr "Telah diterjemahkan"
msgid "Up to date"
msgstr "Mutakhir"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Telah usang"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Tidak diterjemahkan"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -235,6 +219,22 @@ msgstr "Halaman web telah diterjemahkan (berdasarkan ukuran)"
msgid "Translation Statistics by Page Size"
msgstr "Statistik Terjemahan berdasarkan Ukuran Halaman"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Statistik penerjemahan web site Debian"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Ada %d halaman-halaman untuk diterjemahkan."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Ada %d bytes untuk diterjemahkan."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Ada %d strings untuk diterjemahkan."
+
#~ msgid "Created with"
#~ msgstr "Dibuat dengan"
diff --git a/indonesian/po/templates.id.po b/indonesian/po/templates.id.po
index 85bd1f9f593..f4021ee3da6 100644
--- a/indonesian/po/templates.id.po
+++ b/indonesian/po/templates.id.po
@@ -10,20 +10,9 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-#, fuzzy
-#| msgid "Debian Project"
-msgid "Debian website"
-msgstr "Proyek Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian"
msgstr "Sokong Debian"
@@ -45,10 +34,6 @@ msgstr "Proyek Debian"
#: ../../english/template/debian/common_translation.wml:13
#, fuzzy
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -89,7 +74,6 @@ msgstr "Kontak kami"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Informasi Tentang Debian Rilis"
@@ -165,10 +149,14 @@ msgstr "Memperoleh Debian"
#: ../../english/template/debian/common_translation.wml:91
#, fuzzy
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "Buku-buku Tentang Debian"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Modifikasi terakhir"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -215,7 +203,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:107
+#: ../../english/template/debian/footer.wml:106
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -224,27 +212,27 @@ msgid ""
"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Modifikasi terakhir"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Hak Cipta"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr ""
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -262,6 +250,14 @@ msgstr ""
"Cara menentukan <a href=m4_HOME/intro/cn>bahasa utama untuk digunakan "
"browser anda</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian Internasional"
@@ -280,13 +276,11 @@ msgstr "Berita Mingguan"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Project News"
msgstr "Proyek Debian"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly News"
msgid "Project News"
msgstr "Berita Mingguan"
@@ -312,7 +306,6 @@ msgstr "Buku-buku Tentang Debian"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian Wiki"
msgstr "Sokong Debian"
@@ -346,7 +339,6 @@ msgstr "Basis Data Developer"
#: ../../english/template/debian/links.tags.wml:64
#, fuzzy
-#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Buku-buku Tentang Debian"
@@ -458,7 +450,6 @@ msgstr ""
#: ../../english/template/debian/navbar.wml:10
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "Proyek Debian"
@@ -505,6 +496,15 @@ msgstr ""
msgid "Report"
msgstr "Dilaporkan Pada"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -541,11 +541,20 @@ msgstr ""
msgid "URL"
msgstr ""
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
#, fuzzy
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Kembali ke <a href=\"./\">halaman Penasehat</a>."
+#: ../../english/search.xml.in:7
+#, fuzzy
+msgid "Debian website"
+msgstr "Proyek Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
#~ msgid "Select a server near you"
#~ msgstr "Pilih server terdekat"
diff --git a/indonesian/po/vote.id.po b/indonesian/po/vote.id.po
index 6b6aa0e141e..663156453b1 100644
--- a/indonesian/po/vote.id.po
+++ b/indonesian/po/vote.id.po
@@ -27,239 +27,269 @@ msgid "Nominations"
msgstr "Donasi"
#: ../../english/template/debian/votebar.wml:25
-msgid "Debate"
+msgid "Withdrawals"
msgstr ""
#: ../../english/template/debian/votebar.wml:28
-msgid "Platforms"
+msgid "Debate"
msgstr ""
#: ../../english/template/debian/votebar.wml:31
+msgid "Platforms"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:34
#, fuzzy
msgid "Proposer"
msgstr "telah diajukan"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+msgid "Proposal G Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:58
+msgid "Proposal H Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+msgid "Proposal G Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:85
+msgid "Proposal H Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr ""
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr ""
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr ""
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr ""
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr ""
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "telah diajukan"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "telah diajukan"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr ""
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr ""
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr ""
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr ""
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr ""
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr ""
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
#, fuzzy
msgid "Minimum Discussion"
msgstr "Sedang&nbsp;Didiskusikan"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr ""
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Menunggu&nbsp;Sponsor"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Sedang&nbsp;Didiskusikan"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Pemungutan&nbsp;Suara&nbsp;Berjalan"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Telah&nbsp;Diputuskan"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Lain-lain"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Halaman&nbsp;Utama&nbsp;Pemungutan&nbsp;Suara"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Bagaimana"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Mengajukan&nbsp;Proposal"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Mengubah&nbsp;Proposal"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Menindaklanjuti&nbsp;Proposal"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Lihat&nbsp;Hasil"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Pilih"
diff --git a/indonesian/po/wnpp.id.po b/indonesian/po/wnpp.id.po
index 4b976d2b2d0..2211dbbde12 100644
--- a/indonesian/po/wnpp.id.po
+++ b/indonesian/po/wnpp.id.po
@@ -91,38 +91,32 @@ msgstr "dipersiapkan dalam %s hari, aktivitas terakhir %s hari yang lalu."
#. timespans for request for adoption (RFAs)
#: ../../english/template/debian/wnpp.wml:85
#, fuzzy
-#| msgid "in adoption since today."
msgid "adoption requested since today."
msgstr "Diadopsi sejak hari ini."
#: ../../english/template/debian/wnpp.wml:89
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "adoption requested since yesterday."
msgstr "Diadopsi sejak kemarin."
#: ../../english/template/debian/wnpp.wml:93
#, fuzzy
-#| msgid "in adoption since today."
msgid "adoption requested since %s days."
msgstr "Diadopsi sejak hari ini."
#. timespans for orphaned packages (Os)
#: ../../english/template/debian/wnpp.wml:98
#, fuzzy
-#| msgid "in adoption since today."
msgid "orphaned since today."
msgstr "Diadopsi sejak hari ini."
#: ../../english/template/debian/wnpp.wml:102
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "orphaned since yesterday."
msgstr "Diadopsi sejak kemarin."
#: ../../english/template/debian/wnpp.wml:106
#, fuzzy
-#| msgid "in preparation since today."
msgid "orphaned since %s days."
msgstr "dipersiapkan mulai hari ini."
diff --git a/italian/po/blends.it.po b/italian/po/blends.it.po
index 8b919886aee..0d40467ec30 100644
--- a/italian/po/blends.it.po
+++ b/italian/po/blends.it.po
@@ -3,15 +3,15 @@
#
msgid ""
msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
"Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n"
"Language-Team: \n"
-"MIME-Version: 1.0\n"
"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.3\n"
#: ../../english/blends/blend.defs:15
diff --git a/italian/po/cdimage.it.po b/italian/po/cdimage.it.po
index f2404f93322..14c4ffdbbeb 100644
--- a/italian/po/cdimage.it.po
+++ b/italian/po/cdimage.it.po
@@ -15,20 +15,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Impronta digitale"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "Immagini ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "File jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -125,3 +111,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Lista di messaggi pubblica</a> in "
"lingua inglese per CD/DVD:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "Immagini ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "File jigdo"
diff --git a/italian/po/consultants.it.po b/italian/po/consultants.it.po
index de8837828a4..027fb8b4097 100644
--- a/italian/po/consultants.it.po
+++ b/italian/po/consultants.it.po
@@ -15,6 +15,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Elenco dei consulenti"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Ritorna alla <a href=\"./\">pagina dei consulenti Debian</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Nome:"
@@ -69,11 +77,3 @@ msgid ""
"worldwide."
msgstr ""
"<total_consultant> consulenti Debian elencati in <total_country> paesi."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Elenco dei consulenti"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Ritorna alla <a href=\"./\">pagina dei consulenti Debian</a>."
diff --git a/italian/po/distrib.it.po b/italian/po/distrib.it.po
index 480957760a2..ccba5c3a1bd 100644
--- a/italian/po/distrib.it.po
+++ b/italian/po/distrib.it.po
@@ -14,97 +14,67 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Parola chiave"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Mostra"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Cerca tra"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "percorsi che finiscono con la parola chiave"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Nomi dei pacchetti"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "pacchetti che contengono file con nomi simili"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Descrizioni"
-#: ../../english/distrib/search_contents-form.inc:22
-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:18
+msgid "Source package names"
+msgstr "Nomi dei pacchetti sorgente"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Mostra solo risultati esatti"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribuzione"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "sperimentale (experimental)"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "instabile (unstable)"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "di test (testing)"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stabile (stable)"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "tutte"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Cerca"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-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_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:21
-msgid "Only show exact matches"
-msgstr "Mostra solo risultati esatti"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Sezione"
@@ -121,6 +91,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Cerca"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Reimposta"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Mostra"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "percorsi che finiscono con la parola chiave"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "pacchetti che contengono file con nomi simili"
+
+#: ../../english/distrib/search_contents-form.inc:22
+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"
diff --git a/italian/po/doc.it.po b/italian/po/doc.it.po
index 47078c9337f..d217e35918a 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 - 2019.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: doc.it\n"
@@ -70,7 +70,8 @@ msgstr "(versione <get-var version />)"
msgid "plain text"
msgstr "solo testo"
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:183
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
"\"https://packages.debian.org/git\">Git</a> repository."
@@ -78,17 +79,19 @@ msgstr ""
"L'ultima <get-var srctype /> è disponibile tramite il repository <a href="
"\"https://packages.debian.org/git\">Git</a>."
-#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:185
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr "Interfaccia web:"
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:170
-#: ../../english/doc/manuals.defs:178 ../../english/doc/manuals.defs:186
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr "Interfaccia VCS:"
-#: ../../english/doc/manuals.defs:167
+#: ../../english/doc/manuals.defs:177
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
"\"https://packages.debian.org/cvs\">Cvs</a> repository."
@@ -96,7 +99,7 @@ msgstr ""
"L'ultima <get-var srctype /> è disponibile tramite il repository <a href="
"\"https://packages.debian.org/cvs\">Cvs</a>."
-#: ../../english/doc/manuals.defs:175
+#: ../../english/doc/manuals.defs:185
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
@@ -104,7 +107,7 @@ msgstr ""
"L'ultima <get-var srctype /> è disponibile tramite il repository <a href="
"\"https://packages.debian.org/subversion\">Subversion</a>."
-#: ../../english/doc/manuals.defs:193
+#: ../../english/doc/manuals.defs:203
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -114,15 +117,15 @@ msgstr ""
"<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:198
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr "CVS via web"
-#: ../../english/doc/manuals.defs:202 ../../english/doc/manuals.defs:206
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr "Pacchetto Debian"
-#: ../../english/doc/manuals.defs:211 ../../english/doc/manuals.defs:215
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
msgid "Debian package (archived)"
msgstr "Pacchetto Debian (archiviato)"
diff --git a/italian/po/newsevents.it.po b/italian/po/newsevents.it.po
index 7fe72955600..10ea6e39e01 100644
--- a/italian/po/newsevents.it.po
+++ b/italian/po/newsevents.it.po
@@ -15,90 +15,6 @@ 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"
@@ -157,6 +73,131 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (link inesistente)"
+#: ../../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 ""
@@ -412,138 +453,89 @@ msgstr ""
"news />\">notizie assortite per sviluppatori</a> è stato rilasciato, e copre "
"i seguenti argomenti:"
-#: ../../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/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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/talks.defs:9
+msgid "Title:"
+msgstr "Titolo:"
-#. 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:12
+msgid "Author:"
+msgstr "Autore:"
-#. 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:15
+msgid "Language:"
+msgstr "Lingua:"
-#. 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:19
+msgid "Date:"
+msgstr "Data:"
-#. 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:23
+msgid "Event:"
+msgstr "Evento:"
-#. 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:26
+msgid "Slides:"
+msgstr "Slide:"
-#. 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:29
+msgid "source"
+msgstr "sorgente"
-#. 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:32
+msgid "PDF"
+msgstr "PDF"
-#. 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:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Elenco dei relatori"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#: ../../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:41
+msgid "Abstract"
+msgstr "Abstract"
-#: ../../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/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Notizie Debian"
-#. 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:19
+msgid "Debian Latest News"
+msgstr "Ultime 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/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "La newsletter della comunità 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>."
+#~ msgid "Name:"
+#~ msgstr "Nome:"
-#. 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 "Email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "Interventi precedenti:"
+
+#~ msgid "Languages:"
+#~ msgstr "Lingue:"
+
+#~ msgid "Location:"
+#~ msgstr "Luogo:"
+
+#~ msgid "Topics:"
+#~ msgstr "Argomenti:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "Elenco dei relatori"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Ritorna alla <a href=\"./\">pagina dei relatori Debian</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 c063efd4023..3317f8ab0d4 100644
--- a/italian/po/organization.it.po
+++ b/italian/po/organization.it.po
@@ -81,27 +81,27 @@ msgid "role"
msgstr "ruolo"
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Direttori"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribuzione"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Comunicazione e sociale"
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr "Team protezione dei dati"
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Team Pubblicità"
@@ -115,138 +115,133 @@ msgstr "Appartenenza in altre organizzazioni"
msgid "Support and Infrastructure"
msgstr "Supporto e infrastruttura"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr "Debian Pure Blends"
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Leader"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Commissione tecnica"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Segretario"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Progetti di sviluppo"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Archivi FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "FTP Master"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Assistenti FTP"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Maghi FTP"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backport"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Team Backport"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Gestione del rilascio"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Team di rilascio"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Controllo qualità"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Team per il sistema d'installazione"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr "Team Debian Live"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Note di rilascio"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Immagini dei CD"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produzione"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Test"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr "Team Cloud"
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infrastruttura di compilazione automatica"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Team wanna-build"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Amministrazione di buildd"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Documentazione"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr ""
"Elenco dei pacchetti richiesti e di quelli che necessitano di manodopera "
"(WNPP)"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Port"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Configurazioni speciali"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Portatili"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Firewall"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Sistemi embedded"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Contatto per la stampa"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Pagine web"
@@ -417,44 +412,40 @@ msgstr "Sistema di tracciamento dei pacchetti"
msgid "Treasurer"
msgstr "Tesoriere"
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
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:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Amministratori di Salsa"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "Debian per bambini da 1 a 99 anni"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
+
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian per bambini da 1 a 99 anni"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "Debian per la pratica e la ricerca medica"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian per la pratica e la ricerca medica"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "Debian nell'educazione"
+#~ msgid "Debian for education"
+#~ msgstr "Debian nell'educazione"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "Debian negli uffici legali"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian negli uffici legali"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "Debian per disabili"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian per disabili"
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr "Debian per la scienza e la ricerca scientifica"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian per la scienza e la ricerca scientifica"
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr "Debian per l'astronomia"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian per l'astronomia"
#~ msgid "Individual Packages"
#~ msgstr "Pacchetti individuali"
diff --git a/italian/po/others.it.po b/italian/po/others.it.po
index 81746b46d95..f69592e3ed9 100644
--- a/italian/po/others.it.po
+++ b/italian/po/others.it.po
@@ -63,42 +63,6 @@ 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> "
@@ -162,129 +126,94 @@ 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
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Prodotti"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "Magliette"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "cappelli"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "adesivi"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "tazze"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "altro abbigliamento"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "magliette polo"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "frisbee"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "tappetini per il mouse"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "tessere"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "cesti da pallacanestro"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "orecchini"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "valigie rigide"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "ombrelli"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "federe per cuscini"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "portachiavi"
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "Coltellini svizzeri"
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr "Chiavette USB"
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr "cordini"
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr "altro"
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr "Fare donazioni a Debian"
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr "I fondi sono usati per organizzare eventi legati al software libero"
-#: ../../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"
@@ -329,6 +258,77 @@ 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/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/ports.it.po b/italian/po/ports.it.po
index b12f3cf3174..3bba86ed18c 100644
--- a/italian/po/ports.it.po
+++ b/italian/po/ports.it.po
@@ -14,22 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian per Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian per PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "CD di Hurd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian per IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Contatti"
@@ -94,6 +78,22 @@ msgstr "Fornitura"
msgid "Systems"
msgstr "Sistemi"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian per Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian per PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "CD di Hurd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian per IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD per i386"
diff --git a/italian/po/security.it.po b/italian/po/security.it.po
index 3ef54a95957..abfb3ddfb65 100644
--- a/italian/po/security.it.po
+++ b/italian/po/security.it.po
@@ -14,40 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Sicurezza Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Annunci della sicurezza Debian"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "D"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr "<a href=\\\"undated/\\\">obsoleti</a> ma inclusi per i posteri "
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Dizionario CVE di Mitre"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Database BugTraq di SecurityFocus"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Notifiche del CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Note sulle vulnerabilità di US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Sorgente:"
@@ -131,3 +97,37 @@ msgid "No other external database security references currently available."
msgstr ""
"Non sono disponibili altri riferimenti legati alla sicurezza in database "
"esterni."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "D"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Sicurezza Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Annunci della sicurezza Debian"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Dizionario CVE di Mitre"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Database BugTraq di SecurityFocus"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Notifiche del CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Note sulle vulnerabilità di US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr "<a href=\\\"undated/\\\">obsoleti</a> ma inclusi per i posteri "
diff --git a/italian/po/stats.it.po b/italian/po/stats.it.po
index ca22b6ff5cd..2bab5ac042e 100644
--- a/italian/po/stats.it.po
+++ b/italian/po/stats.it.po
@@ -14,22 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Versione della traduzione errata"
@@ -47,13 +31,13 @@ msgid "The original no longer exists"
msgstr "L'originale non esiste più"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "numero di visite non disponibile"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "visite"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "numero di visite non disponibile"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Fare clic per recuperare i dati diffstat"
@@ -66,15 +50,6 @@ msgstr "Creato con <transstatslink>"
msgid "Translation summary for"
msgstr "Riepilogo delle traduzioni per"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Non tradotte"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Da aggiornare"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Tradotte"
@@ -84,6 +59,15 @@ msgstr "Tradotte"
msgid "Up to date"
msgstr "Aggiornate"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Da aggiornare"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Non tradotte"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -234,6 +218,22 @@ msgstr "Pagine web tradotte (per dimensione)"
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."
+
#~ msgid "Created with"
#~ msgstr "Creato con"
diff --git a/japanese/po/blends.ja.po b/japanese/po/blends.ja.po
index c2badbc1de0..46b4effaacd 100644
--- a/japanese/po/blends.ja.po
+++ b/japanese/po/blends.ja.po
@@ -38,9 +38,6 @@ msgstr ""
#: ../../english/blends/released.data:31
#, fuzzy
-#| msgid ""
-#| "The goal of Debian Games is to provide games in Debian from arcade and "
-#| "aventure to simulation and strategy."
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
diff --git a/japanese/po/cdimage.ja.po b/japanese/po/cdimage.ja.po
index b0db8acf611..db87e53a280 100644
--- a/japanese/po/cdimage.ja.po
+++ b/japanese/po/cdimage.ja.po
@@ -9,20 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " 指紋"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "ISO イメージ"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo ファイル"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -119,3 +105,17 @@ msgid ""
msgstr ""
"英語での CD/DVD 用<a href=\"/MailingLists/disclaimer\">公開メーリングリスト</"
"a>:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO イメージ"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo ファイル"
diff --git a/japanese/po/consultants.ja.po b/japanese/po/consultants.ja.po
index c668ce9e8e2..32ea78532e9 100644
--- a/japanese/po/consultants.ja.po
+++ b/japanese/po/consultants.ja.po
@@ -9,6 +9,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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 "<a href=\"./\">Debian コンサルタントのページ</a>に戻る。"
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "氏名"
@@ -64,11 +72,3 @@ msgid ""
msgstr ""
"世界中の <total_country> の国の <total_consultant> の Debian コンサルタントが"
"掲載されています。"
-
-#: ../../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 "<a href=\"./\">Debian コンサルタントのページ</a>に戻る。"
diff --git a/japanese/po/countries.ja.po b/japanese/po/countries.ja.po
index afe2f2bb598..c9f2190d01c 100644
--- a/japanese/po/countries.ja.po
+++ b/japanese/po/countries.ja.po
@@ -219,210 +219,215 @@ msgid "Kenya"
msgstr "ケニア"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "カザフスタン"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "韓国"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "クウェート"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "カザフスタン"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "スリランカ"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "リトアニア"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "ルクセンブルグ"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "ラトビア"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "モロッコ"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "モルドバ共和国"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "モンテネグロ"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "マダガスカル"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "マケドニア共和国"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "モンゴル"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "マルタ"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "メキシコ"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "マレーシア"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "ニューカレドニア"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "ニカラグア"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "オランダ"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "ノルウェー"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "ニュージーランド"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "パナマ"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "ペルー"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "フランス領ポリネシア"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "フィリピン"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "パキスタン"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "ポーランド"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "ポルトガル"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "ルーマニア"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "セルビア"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "ロシア"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "サウジアラビア"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "スウェーデン"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "シンガポール"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "スロベニア"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "スロバキア"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "エルサルバドル"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "タイ"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "タジキスタン"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "チュニジア"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "トルコ"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "台湾"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "ウクライナ"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "アメリカ合衆国"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "ウルグアイ"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "ウズベキスタン"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "ベネズエラ"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "ベトナム"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "バヌアツ"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "南アフリカ"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "ジンバブエ"
diff --git a/japanese/po/distrib.ja.po b/japanese/po/distrib.ja.po
index 8e3c25576bb..219160f80a3 100644
--- a/japanese/po/distrib.ja.po
+++ b/japanese/po/distrib.ja.po
@@ -10,97 +10,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "キーワード"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "結果表示方法"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "検索対象"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "キーワードを末尾に持つパス"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "パッケージ名のみ"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "キーワードに似た名前のファイルを含むパッケージ"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "パッケージ説明文"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "キーワードを含む名前のファイルを含むパッケージ"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "ソースパッケージ名"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "完全にマッチするもののみを表示"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "ディストリビューション"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "不安定版 (unstable)"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "テスト版 (testing)"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "安定版 (stable)"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "旧安定版 (oldstable)"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "アーキテクチャ"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "すべて"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "検索"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-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"
-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:21
-msgid "Only show exact matches"
-msgstr "完全にマッチするもののみを表示"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "セクション"
@@ -117,6 +87,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "検索"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "リセット"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "結果表示方法"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "キーワードを末尾に持つパス"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "キーワードに似た名前のファイルを含むパッケージ"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "キーワードを含む名前のファイルを含むパッケージ"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "アーキテクチャ"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -191,7 +191,6 @@ msgstr "POWER プロセッサ"
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "64-bit MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "64 ビット MIPS (リトルエンディアン)"
diff --git a/japanese/po/doc.ja.po b/japanese/po/doc.ja.po
index 4e8420b2819..570da7d0844 100644
--- a/japanese/po/doc.ja.po
+++ b/japanese/po/doc.ja.po
@@ -10,27 +10,128 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:31
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "著者名:"
+
+#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Debian パッケージ"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "電子メール:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "入手先:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "収録される CD:"
+
+#: ../../english/doc/books.def:54
+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:97
+msgid "Latest version:"
+msgstr "最新バージョン:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(バージョン <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "プレーンテキスト"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+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:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "ウェブインターフェイス: "
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "VCS インターフェイス: "
+
+#: ../../english/doc/manuals.defs:177
+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:185
+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:203
+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:208
+msgid "CVS via web"
+msgstr "ウェブ経由で CVS を見る"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Debian パッケージ"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Debian パッケージ (アーカイブ)"
+
+#: ../../english/doc/books.data:32
#, fuzzy
-#| 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."
msgid ""
"\n"
-" Debian 8 is the must-have handbook for learning Linux. Start on the\n"
+" Debian 9 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"
@@ -56,22 +157,9 @@ msgstr ""
" ネットワークマネージャ等を利用してホームネットワークを管理します。\n"
" この本による利益の1割が Debian プロジェクトに寄付されます。"
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
#, fuzzy
-#| 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."
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -97,7 +185,7 @@ msgstr ""
"た\n"
" 新しい事項についても見落とすことなく触れています。"
-#: ../../english/doc/books.data:80
+#: ../../english/doc/books.data:83
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"
@@ -112,7 +200,7 @@ msgstr ""
" 自らシステムをインストールしてメンテナンスするユーザのための、\n"
" 基本的なサポートを網羅しています。"
-#: ../../english/doc/books.data:101
+#: ../../english/doc/books.data:105
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"
@@ -132,17 +220,8 @@ msgstr ""
" Debian を使って信頼性のあるネットワークを構築したい管理者など、\n"
" 多くの人々にとって興味深いものとなっています。"
-#: ../../english/doc/books.data:120
+#: ../../english/doc/books.data:125
#, fuzzy
-#| 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"
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -159,14 +238,8 @@ msgstr ""
"フォーマット: e-book (オンライン、HTML、PDF、ePub、Mobi)\n"
"書籍化の予定もあります。\n"
-#: ../../english/doc/books.data:140
+#: ../../english/doc/books.data:146
#, fuzzy
-#| 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."
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 "
@@ -178,7 +251,7 @@ msgstr ""
"ン 6.0) のあらゆる潜在能力を示し、Debian およびその対応業務の範囲について理解"
"しようとする全ユーザに実用的なマニュアルを提供します。"
-#: ../../english/doc/books.data:191
+#: ../../english/doc/books.data:200
msgid ""
"Written by two penetration researcher - Annihilator, Firstblood.\n"
" This book teaches you how to build and configure Debian 8.x server system\n"
@@ -194,115 +267,6 @@ msgid ""
" intrusion detection system."
msgstr ""
-#: ../../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:38
-msgid "plain text"
-msgstr "プレーンテキスト"
-
-#: ../../english/doc/manuals.defs:154 ../../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: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: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:36
msgid "HTML"
msgstr "HTML"
diff --git a/japanese/po/newsevents.ja.po b/japanese/po/newsevents.ja.po
index f777dcf7109..01f931550fe 100644
--- a/japanese/po/newsevents.ja.po
+++ b/japanese/po/newsevents.ja.po
@@ -10,90 +10,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Debian ニュース"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Debian 最新ニュース"
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "<get-var page /> ページ"
-
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr "Debian コミュニティのニューズレター"
-
-#: ../../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 "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 "要約"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "近日開催されるイベント"
@@ -152,6 +68,128 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (リンク切れ)"
+#: ../../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 ""
+"このニューズレターを電子メールで受け取りたい方は、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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "<a href=\"../../\">バックナンバー</a>もご利用いただけます。"
+
+#. 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 プロジェクトニュースは <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 プロジェクトニュースは <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\" />今週号の Debian プロジェクトニュースは <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\" />今週号の Debian プロジェクトニュースは <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\" />%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=\"singular\" />%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=\"singular\" />%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=\"singular\" />%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 ""
+"このニューズレターを毎週電子メールで受け取りたい方は、debian-newsメーリングリ"
+"ストを<a href=\"https://lists.debian.org/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\" />Debian ウィークリーニュースは <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 ウィークリーニュースは <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\" />今週号の Debian ウィークリーニュースは <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=\"singular\" />今週号の Debian ウィークリーニュースは <a href="
+"\"mailto:dwn@debian.org\">%s</a> が編集しました。"
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -400,132 +438,86 @@ msgstr ""
"<a href=\"<get-var url-devel-news />\">開発ニュース寄せ集め</a>の第 <get-var "
"issue-devel-news /> 号が発行され、以下の話題が取り上げられました。"
-#: ../../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 ""
-"このニューズレターを電子メールで受け取りたい方は、debian-newsメーリングリスト"
-"を<a href=\"https://lists.debian.org/debian-news/\">購読</a>してください。"
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "<get-var page /> ページ"
-#: ../../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=\"../../\">バックナンバー</a>もご利用いただけます。"
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+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>."
-msgstr ""
-"<void id=\"singular\" />Debian プロジェクトニュースは <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a> が編集しています。"
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+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>."
-msgstr ""
-"<void id=\"plural\" />Debian プロジェクトニュースは <a href=\"mailto:debian-"
-"publicity@lists.debian.org\">%s</a> が編集しています。"
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+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>."
-msgstr ""
-"<void id=\"singular\" />今週号の Debian プロジェクトニュースは <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> が編集しました。"
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+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>."
-msgstr ""
-"<void id=\"plural\" />今週号の Debian プロジェクトニュースは <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a> が編集しました。"
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "イベント:"
-#. 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\" />%s が翻訳しました。"
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "スライド:"
-#. 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=\"singular\" />%s が翻訳しました。"
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "ソース"
-#. 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=\"singular\" />%s が翻訳しました。"
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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=\"singular\" />%s が翻訳しました。"
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "講演者一覧"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "<a href=\"./\">Debian 講演者ページ</a>に戻る。"
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+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>."
-msgstr ""
-"このニューズレターを毎週電子メールで受け取りたい方は、debian-newsメーリングリ"
-"ストを<a href=\"https://lists.debian.org/debian-news/\">購読</a>してくださ"
-"い。"
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Debian ニュース"
-#. 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 ウィークリーニュースは <a href=\"mailto:"
-"dwn@debian.org\">%s</a> が編集しています。"
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "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\" />Debian ウィークリーニュースは <a href=\"mailto:"
-"dwn@debian.org\">%s</a> が編集しています。"
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "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\" />今週号の Debian ウィークリーニュースは <a href="
-"\"mailto:dwn@debian.org\">%s</a> が編集しました。"
+#~ msgid "Name:"
+#~ 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 ""
-"<void id=\"singular\" />今週号の Debian ウィークリーニュースは <a href="
-"\"mailto:dwn@debian.org\">%s</a> が編集しました。"
+#~ msgid "Email:"
+#~ msgstr "電子メール"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "以前の講演:"
+
+#~ msgid "Languages:"
+#~ msgstr "言語:"
+
+#~ msgid "Location:"
+#~ msgstr "場所:"
+
+#~ msgid "Topics:"
+#~ msgstr "話題:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "講演者一覧"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "<a href=\"./\">Debian 講演者ページ</a>に戻る。"
diff --git a/japanese/po/organization.ja.po b/japanese/po/organization.ja.po
index bb0906afc78..ede5c77fb65 100644
--- a/japanese/po/organization.ja.po
+++ b/japanese/po/organization.ja.po
@@ -43,249 +43,296 @@ msgid "manager"
msgstr "マネージャー"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "安定版リリース管理者"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "ウィザード"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "委員長"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "補佐"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "書記"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "執行部"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "ディストリビューション"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "広報チーム"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "サポートと設備"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr "Debian Pure Blends"
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "リーダー"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "技術委員会"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "書記"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "開発プロジェクト"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP アーカイブ"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "FTP マスター"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "FTP アシスタント"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "FTP ウィザード"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Backports チーム"
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "個々のパッケージ"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "リリース管理"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "リリースチーム"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "品質保証"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "インストールシステムチーム"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "リリースノート"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD イメージ"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "製品"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "テスト"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "オートビルドインフラ"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "ビルド要求チーム"
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "ビルドデーモン管理"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "ドキュメンテーション"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "作業の必要なパッケージ一覧"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "移植"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "特殊な設定"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "ラップトップ"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "ファイアウォール"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "組み込みシステム"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "広報窓口"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "ウェブページ"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr "教育"
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Debian Women プロジェクト"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr "嫌がらせ反対"
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "イベント"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "技術委員会"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "パートナープログラム"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "ハードウェア寄付コーディネーション"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "ユーザサポート"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "バグ追跡システム (BTS)"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "メーリングリスト管理とメーリングリストアーカイブ"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr "新規メンバー受付"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Debian アカウント管理者"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -293,31 +340,31 @@ msgstr ""
"(全) DAM に私信のメールを送る際には 57731224A9762EA155AB2A530CA8D15BB24D96F2 "
"の GPG 鍵を使ってください。"
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "公開鍵管理者 (PGP および GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "セキュリティチーム"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "コンサルタントページ"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "CD ベンダページ"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "ポリシー"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "システム管理"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -326,7 +373,7 @@ msgstr ""
"ストールの依頼など、Debianマシンのいずれかに何か問題のある際に用いる連絡先で"
"す。"
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:469
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 "
@@ -336,66 +383,64 @@ msgstr ""
"\">Debian マシン</a>のページを参照してください。そこにはマシンごとの管理情報"
"があります。"
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP 開発者ディレクトリ管理者"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "ミラー"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "DNS 管理"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "パッケージ追跡システム"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
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:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Alioth 管理者"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "1歳から99歳までのこどものための Debian"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "臨床医学と医学研究のための Debian"
+#~ msgid "Individual Packages"
+#~ msgstr "個々のパッケージ"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "教育のための Debian"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "1歳から99歳までのこどものための Debian"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "法律事務所のための Debian"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "臨床医学と医学研究のための Debian"
+
+#~ msgid "Debian for education"
+#~ msgstr "教育のための Debian"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "法律事務所のための Debian"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "障害者のための Debian"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "障害者のための Debian"
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr "科学研究のための Debian"
+#~ msgid "Debian for science and related research"
+#~ msgstr "科学研究のための Debian"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "教育のための Debian"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "教育のための Debian"
#~ msgid "Live System Team"
#~ msgstr "ライブシステムチーム"
diff --git a/japanese/po/others.ja.po b/japanese/po/others.ja.po
index e41ec0dc39d..0bfa2e3ac87 100644
--- a/japanese/po/others.ja.po
+++ b/japanese/po/others.ja.po
@@ -57,42 +57,6 @@ msgstr "<void id=\"d-i\" />不明"
msgid "Unavailable"
msgstr "利用不可"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "新規メンバーのコーナー"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "手順 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "手順 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "手順 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "手順 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "手順 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "手順 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "手順 7"
-
-#: ../../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> "
@@ -156,129 +120,94 @@ msgstr "[Debian 使用]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (小さなボタン)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "同上"
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "製品"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "Tシャツ"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "帽子"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "ステッカー"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "マグカップ"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "その他衣類"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "ポロシャツ"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "フリスビー"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "マウスパッド"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "バッジ"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "バスケットボールのゴール"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "イヤリング"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "スーツケース"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "傘"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "枕カバー"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "キーチェーン"
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "十徳ナイフ"
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr "USBメモリ"
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Debian を使い始めてどれくらいになりますか?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Debian 開発者ですか?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "Debian のどの分野に関わっていますか?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Debian での作業に興味を持ったきっかけは何ですか?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr "Debian にもっと関わることに関心のある女性に何か一言あれば"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr "技術系のグループで他の女性と共同作業をしていますか? あればどこですか?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "他に何か一言あれば"
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "対応"
@@ -323,6 +252,77 @@ msgstr "バージョン"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "新規メンバーのコーナー"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "手順 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "手順 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "手順 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "手順 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "手順 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "手順 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "手順 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "応募者のチェックリスト"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "同上"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Debian を使い始めてどれくらいになりますか?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Debian 開発者ですか?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "Debian のどの分野に関わっていますか?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Debian での作業に興味を持ったきっかけは何ですか?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr "Debian にもっと関わることに関心のある女性に何か一言あれば"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr "技術系のグループで他の女性と共同作業をしていますか? あればどこですか?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "他に何か一言あれば"
+
#~ msgid "Where:"
#~ msgstr "場所:"
diff --git a/japanese/po/partners.ja.po b/japanese/po/partners.ja.po
index 021ae624d61..644cd23a422 100644
--- a/japanese/po/partners.ja.po
+++ b/japanese/po/partners.ja.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/japanese/po/ports.ja.po b/japanese/po/ports.ja.po
index 67f2fc68ea0..b34b2e3a43f 100644
--- a/japanese/po/ports.ja.po
+++ b/japanese/po/ports.ja.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Alpha 用 Debian"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "PA-RISC 用 Debian"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd の CD"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "IA-64 用 Debian"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "連絡"
@@ -89,6 +73,22 @@ msgstr "供給"
msgid "Systems"
msgstr "システム"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Alpha 用 Debian"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "PA-RISC 用 Debian"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd の CD"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "IA-64 用 Debian"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "i386 用 Debian GNU/NetBSD"
diff --git a/japanese/po/security.ja.po b/japanese/po/security.ja.po
index 15c918017da..1141565f45a 100644
--- a/japanese/po/security.ja.po
+++ b/japanese/po/security.ja.po
@@ -9,41 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Debian セキュリティ"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Debian セキュリティ勧告"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "質問"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"記録として残されている<a href=\\\"undated/\\\">日付不詳</a>のセキュリティ勧告"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre の CVE 辞書"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus の Bugtraq データベース"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT の勧告"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT の脆弱性通達"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "ソース:"
@@ -125,3 +90,38 @@ msgstr "CERT の脆弱性リスト、勧告および付加情報:"
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr "現時点では、その他の外部参考セキュリティデータベースはありません。"
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "質問"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Debian セキュリティ"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Debian セキュリティ勧告"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitre の CVE 辞書"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus の Bugtraq データベース"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT の勧告"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT の脆弱性通達"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"記録として残されている<a href=\\\"undated/\\\">日付不詳</a>のセキュリティ勧告"
diff --git a/japanese/po/stats.ja.po b/japanese/po/stats.ja.po
index 6b989577eff..e5ddf0ccc34 100644
--- a/japanese/po/stats.ja.po
+++ b/japanese/po/stats.ja.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "翻訳のバージョン番号が変です"
@@ -42,13 +26,13 @@ msgid "The original no longer exists"
msgstr "原版がなくなっています"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "ヒットカウント無し"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "ヒット"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "ヒットカウント無し"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "クリックすると diffstat データを取得します"
@@ -61,15 +45,6 @@ msgstr ""
msgid "Translation summary for"
msgstr "翻訳状況:"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "未翻訳"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "未更新"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "翻訳済"
@@ -79,6 +54,15 @@ msgstr "翻訳済"
msgid "Up to date"
msgstr "最新"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "未更新"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "未翻訳"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,6 +213,22 @@ msgstr "翻訳済ページ (サイズ)"
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"
+
#~ msgid "Created with"
#~ msgstr "Created with"
diff --git a/japanese/po/templates.ja.po b/japanese/po/templates.ja.po
index c57475db4ed..b6d488ec1a1 100644
--- a/japanese/po/templates.ja.po
+++ b/japanese/po/templates.ja.po
@@ -10,14 +10,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Debian ウェブサイト"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Debian ウェブサイトを検索する。"
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -79,7 +71,6 @@ msgstr "私たちと連絡を取る"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "リリース情報"
@@ -157,6 +148,11 @@ msgstr "Debian を入手する"
msgid "The Debian Blog"
msgstr "Debian ブログ"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "最終更新"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -202,14 +198,8 @@ 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
-#| "using_cvs\">available</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -223,29 +213,29 @@ msgstr ""
"ご覧ください。ウェブサイトのソースコードも<a href=\"m4_HOME/devel/website/"
"using_cvs\">あります</a>。"
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "最終更新"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Copyright"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> と多くの人々;"
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -262,6 +252,14 @@ msgstr "このページは以下の言語でもご覧になれます。"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "<a href=m4_HOME/intro/cn>デフォルトの言語を設定するには</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian の国際化"
@@ -490,6 +488,15 @@ msgstr "(新しいリビジョン)"
msgid "Report"
msgstr "レポート"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -522,10 +529,18 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr ""
"<a href=\"./\">「Debian を使用しているのはどんな人たち?」のページ</a>に戻る。"
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Debian ウェブサイト"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Debian ウェブサイトを検索する。"
+
#~ msgid "Visit the site sponsor"
#~ msgstr "このサイトのスポンサー"
diff --git a/japanese/po/vote.ja.po b/japanese/po/vote.ja.po
index dbf3981caf9..d974d207228 100644
--- a/japanese/po/vote.ja.po
+++ b/japanese/po/vote.ja.po
@@ -26,237 +26,272 @@ msgid "Nominations"
msgstr "候補者"
#: ../../english/template/debian/votebar.wml:25
+#, fuzzy
+msgid "Withdrawals"
+msgstr "撤回された案件"
+
+#: ../../english/template/debian/votebar.wml:28
msgid "Debate"
msgstr "討論会"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr "選挙公約"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposer"
msgstr "提案者"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr "提案 A の提案者"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr "提案 B の提案者"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr "提案 C の提案者"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr "提案 D の提案者"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr "提案 E の提案者"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr "提案 F の提案者"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "提案 A の提案者"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "提案 A の提案者"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "支持者"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "提案 A の支持者"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "提案 B の支持者"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "提案 C の支持者"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "提案 D の支持者"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "提案 E の支持者"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "提案 F の支持者"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "提案 A の支持者"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "提案 A の支持者"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "反対者"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "本文"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "提案 A"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "提案 B"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "提案 C"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "提案 D"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "提案 E"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "提案 F"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "提案 A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "提案 A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "選択肢"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "修正提案者"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "修正支持者"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "修正文"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "修正提案者 A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "修正支持者 A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "修正文 A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "修正提案者 B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "修正支持者 B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "修正文 B"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "修正提案者 C"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "修正支持者 C"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "修正文 C"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "修正"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "進行状態"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "多数の要請"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "データと統計"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "定足数"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "最短の討論"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "投票用紙"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "フォーラム"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "結果"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "スポンサー募集中"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "議論中"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "投票受付中"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "決定事項"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "撤回された案件"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "その他"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "投票情報ホームページ"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "利用方法"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "提案の提出"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "提案の修正"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "提案への意見"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "結果の閲覧"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "投票"
diff --git a/korean/po/bugs.ko.po b/korean/po/bugs.ko.po
index 5e593658738..9e8235eab86 100644
--- a/korean/po/bugs.ko.po
+++ b/korean/po/bugs.ko.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-10-03 08:34+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: debian-l10n-korean <debian-l10n-korean@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 2.2.1\n"
#: ../../english/Bugs/pkgreport-opts.inc:17
diff --git a/korean/po/cdimage.ko.po b/korean/po/cdimage.ko.po
index 25f894405fa..919ae7331a9 100644
--- a/korean/po/cdimage.ko.po
+++ b/korean/po/cdimage.ko.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-10-03 18:56+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: debian-l10n-korean <debian-l10n-korean@lists.debian.org>\n"
@@ -12,23 +13,8 @@ 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 2.2.1\n"
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../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:87
-msgid "ISO images"
-msgstr "ISO 이미지"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -123,3 +109,17 @@ msgid ""
"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
"a> for CDs/DVDs:"
msgstr ""
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO 이미지"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/korean/po/consultants.ko.po b/korean/po/consultants.ko.po
index 52db27f5bce..405f2539e77 100644
--- a/korean/po/consultants.ko.po
+++ b/korean/po/consultants.ko.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-10-06 16:51+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: debian-l10n-korean@lists.debian.org\n"
@@ -12,10 +13,17 @@ 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 2.2.1\n"
"Plural-Forms: nplurals=1; plural=0;\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 "<a href=\"./\">Debian 컨설턴트 페이지</a>로 돌아가기."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "이름:"
@@ -69,11 +77,3 @@ 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 "<a href=\"./\">Debian 컨설턴트 페이지</a>로 돌아가기."
diff --git a/korean/po/countries.ko.po b/korean/po/countries.ko.po
index edb20cf712e..170507a2067 100644
--- a/korean/po/countries.ko.po
+++ b/korean/po/countries.ko.po
@@ -226,209 +226,214 @@ msgid "Kenya"
msgstr "케냐"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "카자흐스탄"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "대한민국"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "쿠웨이트"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "카자흐스탄"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "스리랑카"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "리투아니아"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "룩셈부르크"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "라트비아"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "모로코"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "몰도바"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "몬테그레노"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "마다가스카르"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "마케도니아"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "몽골"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "몰타"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "멕시코"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "말레이시아"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "뉴 칼레도니아"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "니카라과"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "네덜란드"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "노르웨이"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "뉴질랜드"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "파나마"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "페루"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "프랑스령 폴리네시아"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "필리핀"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "파키스탄"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "폴란드"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "포르투갈"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "레위니옹"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "루마니아"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "세르비아"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "러시아"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "사우디아라비아"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "스웨덴"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "싱가포르"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "슬로베니아"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "슬로바키아"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "엘살바도르"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "타이"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "타지키스탄"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "튀니지"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "터키"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "타이완"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "우크라이나"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "미국"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "우루과이"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "우즈베키스탄"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "베네수엘라"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "베트남"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "바누아투"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "남아프리카 공화국"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "짐바브웨"
diff --git a/korean/po/date.ko.po b/korean/po/date.ko.po
index ef52d70437c..dcba06bbf09 100644
--- a/korean/po/date.ko.po
+++ b/korean/po/date.ko.po
@@ -6,6 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-08-29 13:57+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: debian-l10n-korean <debian-l10n-korean@lists.debian.org>\n"
@@ -13,7 +14,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 2.2.1\n"
#. List of weekday names (used in modification dates)
@@ -45,7 +45,7 @@ msgstr "금요일"
msgid "Sat"
msgstr "토요일"
-#. List of month names (used in modification dates, and may be used in news
+#. List of month names (used in modification dates, and may be used in news
#. listings)
#: ../../english/template/debian/ctime.wml:23
msgid "Jan"
diff --git a/korean/po/distrib.ko.po b/korean/po/distrib.ko.po
index 793147557a7..21c28338526 100644
--- a/korean/po/distrib.ko.po
+++ b/korean/po/distrib.ko.po
@@ -15,112 +15,112 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7.1\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "키워드"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "배포본"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "실험적"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "불안정"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "테스팅"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "안정"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:48
+#: ../../english/distrib/search_packages-form.inc:34
+msgid "Section"
+msgstr "섹션"
+
+#: ../../english/distrib/search_packages-form.inc:36
+msgid "main"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:37
+msgid "contrib"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:38
+msgid "non-free"
+msgstr ""
+
#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
msgid "Search"
msgstr "검색"
-#: ../../english/distrib/search_contents-form.inc:49
#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
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"
-msgstr ""
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr ""
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:34
-msgid "Section"
-msgstr "섹션"
-
-#: ../../english/distrib/search_packages-form.inc:36
-msgid "main"
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:37
-msgid "contrib"
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:38
-msgid "non-free"
-msgstr ""
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "아키텍처"
#: ../../english/releases/arches.data:8
msgid "Alpha"
diff --git a/korean/po/doc.ko.po b/korean/po/doc.ko.po
index a5c5f63d734..8080aa951a0 100644
--- a/korean/po/doc.ko.po
+++ b/korean/po/doc.ko.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-10-03 14:16+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: debian-l10n-korean <debian-l10n-korean@lists.debian.org>\n"
@@ -12,116 +13,30 @@ 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 2.2.1\n"
-#: ../../english/doc/books.data:31
-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:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
-msgid ""
-"Written by two Debian developers, this free book\n"
-" started as a translation of their French best-seller known as Cahier de\n"
-" 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:80
-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:101
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-" covers all aspects of the administration of Debian from the installation\n"
-" 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:120
-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:140
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment. It shows the full potential of "
-"the distribution (in its current version 8) 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:191
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "저자"
#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "데비안 패키지"
+
+#: ../../english/doc/books.def:44
msgid "email:"
msgstr "전자우편"
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
msgid "Available at:"
msgstr ""
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
msgid "CD Included:"
msgstr "CD 포함"
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
msgid "Publisher:"
msgstr "출판사"
@@ -145,67 +60,159 @@ msgstr "상태:"
msgid "Availability:"
msgstr ""
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
msgid "Latest version:"
msgstr "최근버전:"
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
msgid "(version <get-var version />)"
msgstr ""
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
msgid "plain text"
msgstr "단순 텍스트"
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
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:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:177
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
+#: ../../english/doc/manuals.defs:185
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:188
+#: ../../english/doc/manuals.defs:203
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
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr "데비안 패키지"
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
#, fuzzy
-#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "데비안 패키지"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/korean/po/legal.ko.po b/korean/po/legal.ko.po
index 294688f39c2..4a2fefa9a98 100644
--- a/korean/po/legal.ko.po
+++ b/korean/po/legal.ko.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-10-03 18:52+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: debian-l10n-korean <debian-l10n-korean@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 2.2.1\n"
#: ../../english/template/debian/legal.wml:15
diff --git a/korean/po/mailinglists.ko.po b/korean/po/mailinglists.ko.po
index 4cacdef63a2..860e095426e 100644
--- a/korean/po/mailinglists.ko.po
+++ b/korean/po/mailinglists.ko.po
@@ -6,6 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-10-01 23:15+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: Debian L10n Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -13,7 +14,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.8.11\n"
"Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/korean/po/newsevents.ko.po b/korean/po/newsevents.ko.po
index 27c60ca404c..dc0e486faa1 100644
--- a/korean/po/newsevents.ko.po
+++ b/korean/po/newsevents.ko.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-10-03 14:11+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: debian-l10n-korean <debian-l10n-korean@lists.debian.org>\n"
@@ -12,93 +13,8 @@ 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 2.2.1\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 "곧 개최될 이벤트"
@@ -155,6 +71,118 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr ""
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"이 뉴스를 매주 받아 보려면, <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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr ""
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+#, fuzzy
+msgid ""
+"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"데비안 주간 뉴스는 <a href=\"mailto:dwn@debian.org\">Joey Hess</a>가 편집하"
+"고 있습니다."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+#, fuzzy
+msgid ""
+"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+"debian-publicity@lists.debian.org\">%s</a>."
+msgstr ""
+"데비안 주간 뉴스는 <a href=\"mailto:dwn@debian.org\">Joey Hess</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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#: ../../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 ""
+"이 뉴스를 매주 받아 보려면, <a href=\"https://lists.debian.org/debian-news/"
+"\">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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -336,126 +364,74 @@ msgid ""
"the following topics:"
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 in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
msgstr ""
-"이 뉴스를 매주 받아 보려면, <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
-msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
-msgstr ""
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "제목:"
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
-#, fuzzy
-msgid ""
-"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"데비안 주간 뉴스는 <a href=\"mailto:dwn@debian.org\">Joey Hess</a>가 편집하"
-"고 있습니다."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "지은이:"
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-#, fuzzy
-msgid ""
-"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
-msgstr ""
-"데비안 주간 뉴스는 <a href=\"mailto:dwn@debian.org\">Joey Hess</a>가 편집하"
-"고 있습니다."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+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>."
-msgstr ""
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+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>."
-msgstr ""
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "이벤트:"
-#. 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."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
msgstr ""
-#. 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 ""
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "소스"
-#. 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."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
msgstr ""
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
msgstr ""
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr ""
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+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>."
-msgstr ""
-"이 뉴스를 매주 받아 보려면, <a href=\"https://lists.debian.org/debian-news/"
-"\">debian-news 메일링 리스트에 가입</a>하세요."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+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>."
-msgstr ""
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
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>."
-msgstr ""
+#~ msgid "Name:"
+#~ 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 ""
+#~ msgid "Email:"
+#~ msgstr "전자우편:"
+
+#~ msgid "Languages:"
+#~ msgstr "언어:"
+
+#~ msgid "Topics:"
+#~ msgstr "주제:"
diff --git a/korean/po/organization.ko.po b/korean/po/organization.ko.po
index d68776984ca..47aa71dd411 100644
--- a/korean/po/organization.ko.po
+++ b/korean/po/organization.ko.po
@@ -48,343 +48,385 @@ msgid "manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "안정 릴리스 관리자"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr ""
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
msgid "chair"
msgstr ""
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr ""
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr ""
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr ""
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr ""
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr ""
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
-msgid "Support and Infrastructure"
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
msgstr ""
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
+msgid "Support and Infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr ""
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "기술 위원회"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr ""
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "개발 프로젝트"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP 저장소"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "백포트"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "백포트 팀"
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "개별 패키지"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "릴리스 관리"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "릴리스 팀"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "품질 보증"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "설치 시스템 팀"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr "데비안 라이브 팀"
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "릴리스 노트"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD 이미지"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr ""
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "문서"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr "데비안 라이브 팀"
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "포트"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "특별한 설정"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "랩톱"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "방화벽"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "웹 페이지"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "데비안 여성 프로젝트"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "행사"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
msgid "DebConf Committee"
msgstr "Debconf 기술위원회"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "사용자 지원"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "버그 추적 시스템"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "개발자 계정 관리자"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "키링 관리자(PGP와 GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "보안 팀"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "자문 페이지"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "CD 판매사 페이지"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "정책"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "시스템 관리"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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:435
+#: ../../english/intro/organization.data:469
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:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "미러"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "DNS 관리자"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "패키지 추적 시스템"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Salsa 관리자"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr ""
+#~ msgid "Individual Packages"
+#~ msgstr "개별 패키지"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "의학 실습과 연구를 위한 데비안"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "의학 실습과 연구를 위한 데비안"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "교육을 위한 데비안"
+#~ msgid "Debian for education"
+#~ msgstr "교육을 위한 데비안"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "법률 사무소 안의 데비안"
+#~ msgid "Debian in legal offices"
+#~ msgstr "법률 사무소 안의 데비안"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "장애인을 위한 데비안"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "장애인을 위한 데비안"
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr "과학 및 관련 연구를 위한 데비안"
+#~ msgid "Debian for science and related research"
+#~ msgstr "과학 및 관련 연구를 위한 데비안"
-#: ../../english/intro/organization.data:489
-msgid "Debian for astronomy"
-msgstr "천문학을 위한 데비안"
+#~ msgid "Debian for astronomy"
+#~ msgstr "천문학을 위한 데비안"
#, fuzzy
#~| msgid "Security Team"
diff --git a/korean/po/others.ko.po b/korean/po/others.ko.po
index 557b98193f2..65e7c5997d4 100644
--- a/korean/po/others.ko.po
+++ b/korean/po/others.ko.po
@@ -6,6 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-10-01 23:28+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: debian-kr <debian-l10n-korean@lists.debian.org>\n"
@@ -13,7 +14,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.8.11\n"
#: ../../english/banners/index.tags:7
@@ -64,42 +64,6 @@ msgstr ""
msgid "Unavailable"
msgstr ""
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr ""
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "1단계"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "2단계"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "3단계"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "4단계"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "5단계"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "6단계"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "7단계"
-
-#: ../../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> "
@@ -159,129 +123,94 @@ msgstr ""
msgid "[Debian] (mini button)"
msgstr ""
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr ""
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr ""
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr ""
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "모자"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr ""
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr ""
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr ""
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr ""
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr ""
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr ""
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr ""
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "귀고리"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr ""
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr ""
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr ""
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr ""
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr ""
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr ""
@@ -326,3 +255,73 @@ msgstr ""
msgid "URL"
msgstr ""
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr ""
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "1단계"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "2단계"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "3단계"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "4단계"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "5단계"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "6단계"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "7단계"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr ""
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
diff --git a/korean/po/partners.ko.po b/korean/po/partners.ko.po
index 9820556833e..a0ffbaa7b07 100644
--- a/korean/po/partners.ko.po
+++ b/korean/po/partners.ko.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/korean/po/ports.ko.po b/korean/po/ports.ko.po
index d2a401b60da..ffd24edd145 100644
--- a/korean/po/ports.ko.po
+++ b/korean/po/ports.ko.po
@@ -15,22 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "알파를 위한 데비안"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "PA-RISC를 위한 데비안"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "허드 CD"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "IA-64를 위한 데비안"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "연락처"
@@ -95,6 +79,22 @@ msgstr "공급"
msgid "Systems"
msgstr "시스템"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "알파를 위한 데비안"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "PA-RISC를 위한 데비안"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "허드 CD"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "IA-64를 위한 데비안"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "i386을 위한 데비안 GNU/NetBSD"
diff --git a/korean/po/security.ko.po b/korean/po/security.ko.po
index 68ea90ad1af..03ea356825c 100644
--- a/korean/po/security.ko.po
+++ b/korean/po/security.ko.po
@@ -17,40 +17,6 @@ msgstr ""
"X-Generator: Poedit 1.8.11\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "데비안 보안"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "데비안 보안 권고"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "질문"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre CVE 사전"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus Bugtraq 데이터베이스"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT 권고"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT 취약성 노트"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "소스:"
@@ -132,3 +98,37 @@ msgstr "CERT의 취약성, 자문 및 문제 참고 사항:"
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr "현재 사용 가능한 다른 외부 데이터베이스 보안 참조가 없습니다."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "질문"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "데비안 보안"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "데비안 보안 권고"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitre CVE 사전"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus Bugtraq 데이터베이스"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT 권고"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT 취약성 노트"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/korean/po/stats.ko.po b/korean/po/stats.ko.po
index b5ff01f080f..e7f0e6072b1 100644
--- a/korean/po/stats.ko.po
+++ b/korean/po/stats.ko.po
@@ -15,22 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.1\n"
-#: ../../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 "번역할 페이지 수 %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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "그른 번역 버전"
@@ -48,13 +32,13 @@ msgid "The original no longer exists"
msgstr "원본이 더이상 없음"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "조회수 N/A"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "조회"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "조회수 N/A"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr ""
@@ -67,15 +51,6 @@ msgstr ""
msgid "Translation summary for"
msgstr "번역 요약"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "번역 안 됨"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "오래됨"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "번역됨"
@@ -85,6 +60,15 @@ msgstr "번역됨"
msgid "Up to date"
msgstr "최근"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "오래됨"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "번역 안 됨"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -234,3 +218,19 @@ msgstr "번역된 웹 페이지 (크기)"
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr "페이지 크기순 번역 통계"
+
+#: ../../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 "번역할 페이지 수 %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개."
diff --git a/korean/po/templates.ko.po b/korean/po/templates.ko.po
index 00d742bcaeb..9b52958b196 100644
--- a/korean/po/templates.ko.po
+++ b/korean/po/templates.ko.po
@@ -16,14 +16,6 @@ msgstr ""
"X-Generator: Poedit 2.2.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "데비안 웹사이트"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "데비안 웹사이트 검색."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -161,6 +153,11 @@ msgstr "데비안 얻기"
msgid "The Debian Blog"
msgstr "데비안 블로그"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "마지막 바꿈"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -206,7 +203,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:107
+#: ../../english/template/debian/footer.wml:106
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -214,38 +211,38 @@ msgid ""
"href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href="
"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
-"웹 사이트 문제를 알리려면, <a href=\"mailto:"
-"debian-www@lists.debian.org\">debian-www@lists.debian.org</a>에 영어로 메일 "
-"보내세요. 다른 연락 정보는, 데비안 <a href=\"m4_HOME/contact\">연락 페이지</"
-"a>를 보세요. 웹 사이트 소스 코드 <a href=\"https://salsa.debian.org/"
-"webmaster-team/webwml\">가능</a>."
+"웹 사이트 문제를 알리려면, <a href=\"mailto:debian-www@lists.debian.org"
+"\">debian-www@lists.debian.org</a>에 영어로 메일 보내세요. 다른 연락 정보는, "
+"데비안 <a href=\"m4_HOME/contact\">연락 페이지</a>를 보세요. 웹 사이트 소스 "
+"코드 <a href=\"https://salsa.debian.org/webmaster-team/webwml\">가능</a>."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "마지막 바꿈"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr "마지막 만듦"
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "저작권"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr ""
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
-msgstr "Debian은 Software in the Public Interest, Inc의 <a "
-"href=\"m4_HOME/trademark\">등록상표</a>입니다."
+msgstr ""
+"Debian은 Software in the Public Interest, Inc의 <a href=\"m4_HOME/trademark"
+"\">등록상표</a>입니다."
#: ../../english/template/debian/languages.wml:196
#: ../../english/template/debian/languages.wml:232
@@ -256,6 +253,14 @@ msgstr "이 페이지는 다음 언어로 볼 수도 있습니다:"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "<a href=m4_HOME/intro/cn>원하는 언어로 보려면 어떻게 하나?</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "데비안 국제화"
@@ -484,6 +489,15 @@ msgstr "(새 리비전)"
msgid "Report"
msgstr "보고"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -516,6 +530,14 @@ msgstr "그른 번역 버전!"
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "<a href=\"../\">Who's using Debian 페이지</a>로 돌아갑니다."
+
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "데비안 웹사이트"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "데비안 웹사이트 검색."
diff --git a/korean/po/vendors.ko.po b/korean/po/vendors.ko.po
index 2a26981c240..93e0e8f407b 100644
--- a/korean/po/vendors.ko.po
+++ b/korean/po/vendors.ko.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-10-03 18:48+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: debian-l10n-korean <debian-l10n-korean@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 2.2.1\n"
#: ../../english/CD/vendors/vendors.CD.def:14
diff --git a/korean/po/vote.ko.po b/korean/po/vote.ko.po
index 6b827292f8c..0f4a1713629 100644
--- a/korean/po/vote.ko.po
+++ b/korean/po/vote.ko.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-10-03 18:44+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: debian-l10n-korean <debian-l10n-korean@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 2.2.1\n"
#: ../../english/template/debian/votebar.wml:13
@@ -32,237 +32,265 @@ msgid "Nominations"
msgstr ""
#: ../../english/template/debian/votebar.wml:25
-msgid "Debate"
+msgid "Withdrawals"
msgstr ""
#: ../../english/template/debian/votebar.wml:28
+msgid "Debate"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr "플랫폼"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+msgid "Proposal G Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:58
+msgid "Proposal H Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+msgid "Proposal G Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:85
+msgid "Proposal H Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr ""
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "텍스트"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr ""
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr ""
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr ""
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+msgid "Proposal G"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:115
+msgid "Proposal H"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr ""
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr ""
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr ""
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr ""
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr ""
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr ""
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr ""
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr ""
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr ""
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr ""
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr ""
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr ""
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr ""
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "투표"
diff --git a/korean/po/wnpp.ko.po b/korean/po/wnpp.ko.po
index b115a76c1b3..6f2b48f7be6 100644
--- a/korean/po/wnpp.ko.po
+++ b/korean/po/wnpp.ko.po
@@ -5,6 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-10-03 08:57+0900\n"
"Last-Translator: Sebul <sebuls@gmail.com>\n"
"Language-Team: debian-l10n-korean <debian-l10n-korean@lists.debian.org>\n"
@@ -13,7 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"POT-Creation-Date: \n"
"X-Generator: Poedit 2.2.1\n"
#: ../../english/template/debian/wnpp.wml:8
diff --git a/lithuanian/po/cdimage.lt.po b/lithuanian/po/cdimage.lt.po
index 970275baad9..bae63295b3d 100644
--- a/lithuanian/po/cdimage.lt.po
+++ b/lithuanian/po/cdimage.lt.po
@@ -11,20 +11,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -72,7 +58,6 @@ msgstr "Rsync Veidrodžiai"
#: ../../english/template/debian/cdimage.wml:43
#, fuzzy
-#| msgid "<void id=\"dc_misc\" />Misc"
msgid "<void id=\"dc_verify\" />Verify"
msgstr "Įvairūs"
@@ -123,3 +108,17 @@ msgid ""
msgstr ""
"Anlgakalbė <a href=\"/MailingLists/disclaimer\">vieša el. pašto "
"konferencija</a> skirta CD ir DVD:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/lithuanian/po/consultants.lt.po b/lithuanian/po/consultants.lt.po
index 58f6bca12d2..24a64636d2e 100644
--- a/lithuanian/po/consultants.lt.po
+++ b/lithuanian/po/consultants.lt.po
@@ -11,6 +11,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Konsultantų sąrašas"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Grįžti į <a href=\"./\">Debian konsultantų puslapį</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Vardas:"
@@ -66,11 +74,3 @@ msgid ""
msgstr ""
"<total_consultant> Debian konsultantų yra <total_country> šiose pasaulio "
"šalyse "
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Konsultantų sąrašas"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Grįžti į <a href=\"./\">Debian konsultantų puslapį</a>."
diff --git a/lithuanian/po/countries.lt.po b/lithuanian/po/countries.lt.po
index f1b0b0da650..fcfc3c50bf7 100644
--- a/lithuanian/po/countries.lt.po
+++ b/lithuanian/po/countries.lt.po
@@ -220,214 +220,217 @@ msgid "Kenya"
msgstr "Kenija"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazachstanas"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Korėja"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuveitas"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazachstanas"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Šri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Lietuva"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Liuksemburgas"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Latvija"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Marokas"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr ""
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Juodkalnija"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskaras"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
#, fuzzy
-#| msgid "Dominican Republic"
msgid "Macedonia, Republic of"
msgstr "Dominykos Respublika"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr ""
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Meksika"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malaizija"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Naujoji Kaledonija"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nikaragva"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Olandija"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norvegija"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Naujoji Zelandija"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Prancūzijos Polinezija"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipinai"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistanas"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Lenkija"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugalija"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Rumunija"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Serbija"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusija"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Saudo Arabija"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Švedija"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapūras"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovėnija"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovakija"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "Salvadoras"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Tailandas"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
#, fuzzy
-#| msgid "Pakistan"
msgid "Tajikistan"
msgstr "Pakistanas"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunisas"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turkija"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taivanas"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukraina"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Jungtinės Valstijos"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Urugvajus"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Uzbekistanas"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venesuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnamas"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr ""
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Pietų Afrika"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabvė"
diff --git a/lithuanian/po/date.lt.po b/lithuanian/po/date.lt.po
index 31f7fd8277f..53bb39e5b52 100644
--- a/lithuanian/po/date.lt.po
+++ b/lithuanian/po/date.lt.po
@@ -195,7 +195,6 @@ msgstr "q{[%]d [%]s}, $mday, $mon_str"
#. replace all % by [%]
#: ../../english/template/debian/ctime.wml:99
#, fuzzy
-#| msgid "q{[%]02d [%]s [%]d}, $mday, $mon_str, $year"
msgid "q{[%]s [%]s}, $mon_str, $year"
msgstr "q{[%]02d [%]s [%]d}, $mday, $mon_str, $year"
diff --git a/lithuanian/po/distrib.lt.po b/lithuanian/po/distrib.lt.po
index af58de874cd..f9be7a9540a 100644
--- a/lithuanian/po/distrib.lt.po
+++ b/lithuanian/po/distrib.lt.po
@@ -11,97 +11,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Žodis paieškai"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Parodyti"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Ieškoti"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "Keliai, kurie baigiasi su ieškomu žodžiu"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Tik paketų pavadinimuose"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "paketai, kurie turi failų pavadinimus kaip šis"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Aprašymai"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "Paketai, turintys failų, kurių pavadinimas turi ieškomą žodį"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Paketo išeities teksto pavadinimai"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Rodyti tik tikslius sutapimus"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribucija"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Architektūra"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "koks nors"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Ieškoti"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Iš naujo"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Ieškoti"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Tik paketų pavadinimuose"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Aprašymai"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Paketo išeities teksto pavadinimai"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Rodyti tik tikslius sutapimus"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Sekcija"
@@ -118,6 +88,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Ieškoti"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Iš naujo"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Parodyti"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "Keliai, kurie baigiasi su ieškomu žodžiu"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "paketai, kurie turi failų pavadinimus kaip šis"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "Paketai, turintys failų, kurių pavadinimas turi ieškomą žodį"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Architektūra"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -144,13 +144,11 @@ msgstr ""
#: ../../english/releases/arches.data:14
#, fuzzy
-#| msgid "HP PA/RISC"
msgid "HP PA-RISC"
msgstr "HP PA/RISC"
#: ../../english/releases/arches.data:15
#, fuzzy
-#| msgid "Hurd (i386)"
msgid "Hurd 32-bit PC (i386)"
msgstr "Hurd (i386)"
@@ -160,7 +158,6 @@ msgstr ""
#: ../../english/releases/arches.data:17
#, fuzzy
-#| msgid "Intel IA-64"
msgid "Intel Itanium IA-64"
msgstr "Intel IA-64"
@@ -182,7 +179,6 @@ msgstr "MIPS (big endian)"
#: ../../english/releases/arches.data:22
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "MIPS (little endian)"
@@ -200,7 +196,6 @@ msgstr ""
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "MIPS (little endian)"
diff --git a/lithuanian/po/doc.lt.po b/lithuanian/po/doc.lt.po
index 15672c0bbd6..778d2df3f4d 100644
--- a/lithuanian/po/doc.lt.po
+++ b/lithuanian/po/doc.lt.po
@@ -11,113 +11,28 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:31
-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:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
-msgid ""
-"Written by two Debian developers, this free book\n"
-" started as a translation of their French best-seller known as Cahier de\n"
-" 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:80
-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:101
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-" covers all aspects of the administration of Debian from the installation\n"
-" 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:120
-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:140
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment. It shows the full potential of "
-"the distribution (in its current version 8) 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:191
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Autorius:"
#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Debian paketas"
+
+#: ../../english/doc/books.def:44
msgid "email:"
msgstr "el. paštas:"
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
msgid "Available at:"
msgstr "Pasiekiamas"
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
msgid "CD Included:"
msgstr "CD įtrauktas:"
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
msgid "Publisher:"
msgstr "Leidėjas:"
@@ -141,47 +56,50 @@ msgstr "Statusas:"
msgid "Availability:"
msgstr "Prieinamumas"
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
msgid "Latest version:"
msgstr "Naujausia versija:"
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
msgid "(version <get-var version />)"
msgstr "(versija <get-var version />)"
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
msgid "plain text"
msgstr "grynas tekstas"
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
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:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:177
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
+#: ../../english/doc/manuals.defs:185
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:188
+#: ../../english/doc/manuals.defs:203
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -191,20 +109,109 @@ 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:193
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr "CVS web sąsaja"
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr "Debian paketas"
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
#, fuzzy
-#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Debian paketas"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/lithuanian/po/newsevents.lt.po b/lithuanian/po/newsevents.lt.po
index 8f55013c154..365f77e29f3 100644
--- a/lithuanian/po/newsevents.lt.po
+++ b/lithuanian/po/newsevents.lt.po
@@ -11,94 +11,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr ""
-
-#: ../../english/News/news.rdf.in:19
-#, fuzzy
-#| msgid "Latest News"
-msgid "Debian Latest News"
-msgstr "Paskutinės naujienos"
-
-#: ../../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 ""
-
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "Vardas"
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "El. paštas"
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "Ankstyvesni pokalbiai"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Kalbos"
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Padėtis:"
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Temos"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr ""
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr ""
-
-#: ../../english/events/talks.defs:15
-#, fuzzy
-#| msgid "Languages:"
-msgid "Language:"
-msgstr "Kalbos"
-
-#: ../../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 "Ateinantys įvykiai"
@@ -157,6 +69,131 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (mirusi nuoroda)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr ""
+"<a href=\"../../\">Ankstesnės naujienos</a> galimos iš šio naujienlaiškio."
+
+#. 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 Projekto Naujienas leidžiama <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 Projekto Naujienas leidžia <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\" />Šį Debian projekto Naujienų leidinį išleido <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\" /> Šį Debian Projekto Naujienų leidinį išleido <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\" />Išvertė %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\" />išvertė %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\" />išvertė %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\" />išvertė %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 ""
+"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. "
+
+#. 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 Savaitines Naujienas leidžia <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 Savaitines Naujienas leidžia <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\" />Šį Savaitinį Debian Naujienų leidinį išleido <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=\"singular\" />Šį Savaitinį Debian Naujienų leidinį išleido <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -338,142 +375,91 @@ msgid ""
"the following topics:"
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 in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
+
+#: ../../english/events/talks.defs:9
+msgid "Title:"
msgstr ""
-"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
-msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
msgstr ""
-"<a href=\"../../\">Ankstesnės naujienos</a> galimos iš šio naujienlaiškio."
-#. 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>."
+#: ../../english/events/talks.defs:15
+#, fuzzy
+msgid "Language:"
+msgstr "Kalbos"
+
+#: ../../english/events/talks.defs:19
+msgid "Date:"
msgstr ""
-"<void id=\"singular\" />Debian Projekto Naujienas leidžiama <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>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
msgstr ""
-"<void id=\"plural\" />Debian Projekto Naujienas leidžia <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>."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
msgstr ""
-"<void id=\"singular\" />Šį Debian projekto Naujienų leidinį išleido <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>."
+#: ../../english/events/talks.defs:29
+msgid "source"
msgstr ""
-"<void id=\"plural\" /> Šį Debian Projekto Naujienų leidinį išleido <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\" />Išvertė %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr ""
-#. 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\" />išvertė %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr ""
-#. 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\" />išvertė %s."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr ""
-#. 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\" />išvertė %s."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr ""
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Kalbėtojų sąrašas "
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr ""
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Grįžti į<a href=\"./\">Debian kalbėtojų puslapį</a>."
+#: ../../english/News/news.rdf.in:19
+#, fuzzy
+msgid "Debian Latest News"
+msgstr "Paskutinės naujienos"
-#: ../../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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
msgstr ""
-"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. "
-#. 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 Savaitines Naujienas leidžia <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#~ msgid "Name:"
+#~ msgstr "Vardas"
-#. 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 Savaitines Naujienas leidžia <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#~ msgid "Email:"
+#~ msgstr "El. paštas"
-#. 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\" />Šį Savaitinį Debian Naujienų leidinį išleido <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Previous Talks:"
+#~ msgstr "Ankstyvesni pokalbiai"
-#. 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=\"singular\" />Šį Savaitinį Debian Naujienų leidinį išleido <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Languages:"
+#~ msgstr "Kalbos"
+
+#~ msgid "Location:"
+#~ msgstr "Padėtis:"
+
+#~ msgid "Topics:"
+#~ msgstr "Temos"
+
+#~ msgid "List of Speakers"
+#~ msgstr "Kalbėtojų sąrašas "
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Grįžti į<a href=\"./\">Debian kalbėtojų puslapį</a>."
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/lithuanian/po/organization.lt.po b/lithuanian/po/organization.lt.po
index e953b2bbab7..a8d0401c877 100644
--- a/lithuanian/po/organization.lt.po
+++ b/lithuanian/po/organization.lt.po
@@ -43,291 +43,332 @@ msgid "manager"
msgstr "vedėjas"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr ""
-
-#: ../../english/intro/organization.data:34
#, fuzzy
-#| msgid "Release Managers"
msgid "Stable Release Manager"
msgstr "Išleidimo Valdytojai"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr ""
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "vedlys"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "pirmininkas"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "asistentas"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "sekretorius"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Pareigūnai"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribucija"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Viešieji_ryšiai"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Palaikymas ir Infrastruktūra"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Lyderis"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Techninis Komitetas"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Sekretorius"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Plėtojimo Projektai"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP Archyvai"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
#, fuzzy
-#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "FTP Meistras"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "FTP Asistentai"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Individualūs paketai"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Vadovavimas Išleidimui"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Išleidimo komanda"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Kokybės Užtikrinimas"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Įdiegimo sistemos komanda"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Išleidimo pastabos"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD atvaizdai"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produkcija"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testuojama"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
#, fuzzy
-#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Palaikymas ir Infrastruktūra"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
#, fuzzy
-#| msgid "Buildd Administration"
msgid "Buildd administration"
msgstr "Buildd Administracija"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentacija"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Reikalaujantis darbo ir Laukiamas paketų sąrašas"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Pernešimai"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Specialios konfigūracijos"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Nešiojami kompiuteriai"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Saugos siena"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Įdiegtos sistemos"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Ryšiai su žiniasklaida"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Tinkalalapiai "
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Debian Planeta"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Moterys Debian projekte"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Įvykiai"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Techninis Komitetas"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Partnerio Programa"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Kompiuterinės įrangos aukojimo koordinatorius"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Vartotojų palaikymas"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Klaidų stebėjimo sistema"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Pašto konferencijų administracija ir Pašto konferencijų archyvai"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
#, fuzzy
-#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Naujo plėtojo registracinis stalas"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Debian sąskaitos valdytojai"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Raktinės valdytojai (PGP ir GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Saugumo komanda"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Konsultantų puslapis"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "CD Pardavėjų puslapis"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Politika"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Sistemos administracija"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -335,7 +376,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:435
+#: ../../english/intro/organization.data:469
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 "
@@ -345,68 +386,63 @@ 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:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP plėtotojų direktorijos administratorius"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Veidrodžiai"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "DNS prižiūrėtojas"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Paketų stebėjimo sistema"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Alioth administratoriai"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Debian vaikams nuo 1 iki 99"
+#~ msgid "Individual Packages"
+#~ msgstr "Individualūs paketai"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Debian medicinos praktikai ir jų tyrimams"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian vaikams nuo 1 iki 99"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Debian švietimui"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian medicinos praktikai ir jų tyrimams"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Debian teisėje"
+#~ msgid "Debian for education"
+#~ msgstr "Debian švietimui"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian teisėje"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Debian neįgaliems žmonėms"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian neįgaliems žmonėms"
-#: ../../english/intro/organization.data:486
#, fuzzy
-#| msgid "Debian for medical practice and research"
-msgid "Debian for science and related research"
-msgstr "Debian medicinos praktikai ir jų tyrimams"
+#~| msgid "Debian for medical practice and research"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian medicinos praktikai ir jų tyrimams"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian švietimui"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian švietimui"
#~ msgid "Live System Team"
#~ msgstr "Live sistemos komanda"
diff --git a/lithuanian/po/others.lt.po b/lithuanian/po/others.lt.po
index 19d20e289ad..259b6523241 100644
--- a/lithuanian/po/others.lt.po
+++ b/lithuanian/po/others.lt.po
@@ -59,44 +59,6 @@ msgstr "<void id=\"d-i\" />Nežinoma"
msgid "Unavailable"
msgstr "Negalimas"
-#: ../../english/devel/join/nm-steps.inc:7
-#, fuzzy
-#| msgid "New Maintainers' Corner"
-msgid "New Members Corner"
-msgstr "Naujo Plėtotojo Kampelis "
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "1 žingsnis"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "2 žingsnis"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "3 žingsnis"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "4 žingsnis"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "5 žingsnis"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "6 žingsnis"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "7 žingsnis"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Pretendentų kontrolinis sąrašas"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -122,19 +84,16 @@ msgstr ""
#: ../../english/distrib/pre-installed.defs:18
#, fuzzy
-#| msgid "Phone:"
msgid "Phone"
msgstr "Telefonas:"
#: ../../english/distrib/pre-installed.defs:19
#, fuzzy
-#| msgid "Fax:"
msgid "Fax"
msgstr "Faksas:"
#: ../../english/distrib/pre-installed.defs:21
#, fuzzy
-#| msgid "Address:"
msgid "Address"
msgstr "Adresas:"
@@ -166,131 +125,95 @@ msgstr "[Debian naudojamas]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (mini mygtukas)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "Tas pats kaip ir viršuje"
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Prekės"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "Marškinėliai"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "kepurės"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "lipdukai"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "puodukai"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "Kita apranga"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "sportiniai marškiniai"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "Skrendančios lėkštės"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "pelės kilimėliai"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "ženkliukai"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "krepšinio lentos"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "auskarai"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "lagaminai"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
#, fuzzy
-#| msgid "suitcases"
msgid "pillowcases"
msgstr "lagaminai"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr ""
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr ""
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr ""
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "gerai"
@@ -335,6 +258,78 @@ msgstr "Versija"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+#, fuzzy
+msgid "New Members Corner"
+msgstr "Naujo Plėtotojo Kampelis "
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "1 žingsnis"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "2 žingsnis"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "3 žingsnis"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "4 žingsnis"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "5 žingsnis"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "6 žingsnis"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "7 žingsnis"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Pretendentų kontrolinis sąrašas"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "Tas pats kaip ir viršuje"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
#~ msgid "Where:"
#~ msgstr "Kur:"
diff --git a/lithuanian/po/partners.lt.po b/lithuanian/po/partners.lt.po
index 021ae624d61..644cd23a422 100644
--- a/lithuanian/po/partners.lt.po
+++ b/lithuanian/po/partners.lt.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/lithuanian/po/ports.lt.po b/lithuanian/po/ports.lt.po
index 2bc2ab2c498..e3078f841ac 100644
--- a/lithuanian/po/ports.lt.po
+++ b/lithuanian/po/ports.lt.po
@@ -11,22 +11,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd CD"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Kontaktas"
@@ -91,6 +75,22 @@ msgstr "Aprūpinimas"
msgid "Systems"
msgstr "Sistemos"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd CD"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD i386"
diff --git a/lithuanian/po/security.lt.po b/lithuanian/po/security.lt.po
index b55ceaa847e..b110b6ad11d 100644
--- a/lithuanian/po/security.lt.po
+++ b/lithuanian/po/security.lt.po
@@ -11,40 +11,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Debian Saugumas"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Debian saugumo patarimai"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "Klausimas"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre CVE žodyne"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus Bugtraq duomenų bazė"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT patarimai"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT pažeidžiamumų infornacija"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Išeities tekstai:"
@@ -126,3 +92,37 @@ msgstr "CERT pažeidimai, patarimai ir atsitikimų pasakojimai:"
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr "Jokių kitų išorinių saugumo duomenų bazių šaltinių šiuo metų nėra"
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Klausimas"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Debian Saugumas"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Debian saugumo patarimai"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitre CVE žodyne"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus Bugtraq duomenų bazė"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT patarimai"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT pažeidžiamumų infornacija"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/lithuanian/po/stats.lt.po b/lithuanian/po/stats.lt.po
index 8a767e7cacd..1db9b98dd90 100644
--- a/lithuanian/po/stats.lt.po
+++ b/lithuanian/po/stats.lt.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/lithuanian/po/templates.lt.po b/lithuanian/po/templates.lt.po
index 2e292c55e3e..3a2e91de675 100644
--- a/lithuanian/po/templates.lt.po
+++ b/lithuanian/po/templates.lt.po
@@ -11,20 +11,9 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-#, fuzzy
-#| msgid "Debian Security"
-msgid "Debian website"
-msgstr "Debian Saugumas"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian"
msgstr "Pagalba Debian"
@@ -46,10 +35,6 @@ msgstr "Debian Projektas"
#: ../../english/template/debian/common_translation.wml:13
#, fuzzy
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -89,7 +74,6 @@ msgstr "Susisiekite su mumis"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Leidimo informacija"
@@ -165,10 +149,14 @@ msgstr "Kaip gauti Debian"
#: ../../english/template/debian/common_translation.wml:91
#, fuzzy
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "Knygos apie Debian"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Paskutinė redagavimo data"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -214,13 +202,8 @@ 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -233,29 +216,29 @@ msgstr ""
"kitą kontaktinę informaciją, žiūrėkite Debian <a href=\"m4_HOME/contact\"> "
"kontaktų puslapį</a>."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Paskutinė redagavimo data"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Autorinės teisės"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr ""
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -273,6 +256,14 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
"Kaip nustatyti <a href=m4_HOME/intro/cn>standartinę dokumento kalbą</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian Pasaulyje"
@@ -319,7 +310,6 @@ msgstr "Knygos apie Debian"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian Wiki"
msgstr "Pagalba Debian"
@@ -353,7 +343,6 @@ msgstr "Kūrėjų duomenų bazė"
#: ../../english/template/debian/links.tags.wml:64
#, fuzzy
-#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Knygos apie Debian"
@@ -463,7 +452,6 @@ msgstr "Debian plėtotuojų paketų apžiūra"
#: ../../english/template/debian/navbar.wml:10
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "Debian Projektas"
@@ -507,6 +495,15 @@ msgstr "(nauja revizija)"
msgid "Report"
msgstr "Pranešimas"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -542,10 +539,19 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Grįžti į <a href=\"./\">Kas naudoja Debian?</a>."
+#: ../../english/search.xml.in:7
+#, fuzzy
+msgid "Debian website"
+msgstr "Debian Saugumas"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
#~ msgid "More information"
#~ msgstr "Daugiau informacijos"
diff --git a/lithuanian/po/vendors.lt.po b/lithuanian/po/vendors.lt.po
index ef50f819915..ecad514f27e 100644
--- a/lithuanian/po/vendors.lt.po
+++ b/lithuanian/po/vendors.lt.po
@@ -20,7 +20,6 @@ msgstr "Leidžia įnašus"
#: ../../english/CD/vendors/vendors.CD.def:16
#, fuzzy
-#| msgid "CD/DVD"
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD"
diff --git a/lithuanian/po/vote.lt.po b/lithuanian/po/vote.lt.po
index 220a64daaa9..ffb0a455a00 100644
--- a/lithuanian/po/vote.lt.po
+++ b/lithuanian/po/vote.lt.po
@@ -28,243 +28,275 @@ msgid "Nominations"
msgstr "Paskyrimai"
#: ../../english/template/debian/votebar.wml:25
+#, fuzzy
+msgid "Withdrawals"
+msgstr "Atšaukta"
+
+#: ../../english/template/debian/votebar.wml:28
msgid "Debate"
msgstr "Debatai"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr "Platformos"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposer"
msgstr "Siūlytojas"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr "Siūlytojo Pasiūlymas A"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr "Siūlytojo Pasiūlymas B"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr "Siūlytojo Pasiūlymas C"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr "Siūlytojo Pasiūlymas D"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr "Siūlytojo Pasiūlymas E"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr "Siūlytojo Pasiūlymas F"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Siūlytojo Pasiūlymas A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Siūlytojo Pasiūlymas A"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Palaikantieji"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Palaikantys Pasiūlymą A"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Palaikantys Pasiūlymą B"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Palaikantys Pasiūlymą C"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Palaikantys Pasiūlymą D"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Palaikantys Pasiūlymą E"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Palaikantys Pasiūlymą F"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Palaikantys Pasiūlymą A"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Palaikantys Pasiūlymą A"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Opozicija"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Tekstas"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Pasiūlymas A"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Pasiūlymas B"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Pasiūlymas C"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Pasiūlymas D"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Pasiūlymas E"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Pasiūlymas F"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Pasiūlymas A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Pasiūlymas A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Pasirinkimai"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Pataisos Siūlytojas"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Palaikantys pataisą"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Pataisos Tekstas"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Pataisos Siūlytojas A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Pataisos palaikytojai A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Pataisos Tekstas A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Pataisos Siūlytojas B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Pataisos palaikytojai B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Pataisos Tekstas B"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
#, fuzzy
-#| msgid "Amendment Proposer A"
msgid "Amendment Proposer C"
msgstr "Pataisos Siūlytojas A"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
#, fuzzy
-#| msgid "Amendment Seconds A"
msgid "Amendment Seconds C"
msgstr "Pataisos palaikytojai A"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
#, fuzzy
-#| msgid "Amendment Text A"
msgid "Amendment Text C"
msgstr "Pataisos Tekstas A"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Pataisos"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Posėdžiai"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Daugumos reikalavimas"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Duomenys ir Statistika"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Kvorumas"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Minimalios diskusijos"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Balsavimo kortelė"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Forumas"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Rezultatas"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Laukia&nbsp;rėmėjų"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Vyksta&nbsp;diskusijos"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Atviras&nbsp;balsavimas"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Nuspręsta"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Atšaukta"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Kita"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Pradinis&nbsp;balsavimo&nbsp;puslapis"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Kaip"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Pateikti&nbsp;siūlymą"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Keisti&nbsp;siūlymą"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Sekti&nbsp;siūlymą"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Skaityti&nbsp;rezultatą"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Balsuoti"
diff --git a/lithuanian/po/wnpp.lt.po b/lithuanian/po/wnpp.lt.po
index 1cf2a4d0389..451cfc4811b 100644
--- a/lithuanian/po/wnpp.lt.po
+++ b/lithuanian/po/wnpp.lt.po
@@ -50,13 +50,11 @@ msgstr "%s dienų yra įsūnytas "
#: ../../english/template/debian/wnpp.wml:46
#, fuzzy
-#| msgid "%s days in adoption."
msgid "%s days in adoption, last activity today."
msgstr "%s dienų yra įsūnytas "
#: ../../english/template/debian/wnpp.wml:50
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "%s days in adoption, last activity yesterday."
msgstr "įsūnytas nuo vakar"
@@ -79,57 +77,48 @@ msgstr "ruošiami %s dienų."
#: ../../english/template/debian/wnpp.wml:72
#, fuzzy
-#| msgid "%s days in preparation."
msgid "%s days in preparation, last activity today."
msgstr "ruošiami %s dienų."
#: ../../english/template/debian/wnpp.wml:76
#, fuzzy
-#| msgid "in preparation since yesterday."
msgid "%s days in preparation, last activity yesterday."
msgstr "ruošiami nuo vakar."
#: ../../english/template/debian/wnpp.wml:80
#, fuzzy
-#| msgid "%s days in preparation."
msgid "%s days in preparation, last activity %s days ago."
msgstr "ruošiami %s dienų."
#. timespans for request for adoption (RFAs)
#: ../../english/template/debian/wnpp.wml:85
#, fuzzy
-#| msgid "in adoption since today."
msgid "adoption requested since today."
msgstr "įsūnytas nuo šiandien."
#: ../../english/template/debian/wnpp.wml:89
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "adoption requested since yesterday."
msgstr "įsūnytas nuo vakar"
#: ../../english/template/debian/wnpp.wml:93
#, fuzzy
-#| msgid "in adoption since today."
msgid "adoption requested since %s days."
msgstr "įsūnytas nuo šiandien."
#. timespans for orphaned packages (Os)
#: ../../english/template/debian/wnpp.wml:98
#, fuzzy
-#| msgid "in adoption since today."
msgid "orphaned since today."
msgstr "įsūnytas nuo šiandien."
#: ../../english/template/debian/wnpp.wml:102
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "orphaned since yesterday."
msgstr "įsūnytas nuo vakar"
#: ../../english/template/debian/wnpp.wml:106
#, fuzzy
-#| msgid "in preparation since today."
msgid "orphaned since %s days."
msgstr "ruošiami nuo šiandien."
diff --git a/norwegian/po/cdimage.nb.po b/norwegian/po/cdimage.nb.po
index 9b47e38e732..5eb1be866d9 100644
--- a/norwegian/po/cdimage.nb.po
+++ b/norwegian/po/cdimage.nb.po
@@ -9,20 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Nøkkelfingeravtrykk"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "ISO-bilder"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo-filer"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -119,3 +105,17 @@ msgid ""
msgstr ""
"Engelskspråklige <a href=\"/MailingLists/disclaimer\">åpne postlister</a> "
"for CD-er/DVD-er:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO-bilder"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo-filer"
diff --git a/norwegian/po/consultants.nb.po b/norwegian/po/consultants.nb.po
index 00fb36c5c34..cfdbc2d9349 100644
--- a/norwegian/po/consultants.nb.po
+++ b/norwegian/po/consultants.nb.po
@@ -9,6 +9,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Konsulentliste"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Tilbake til <a href=\"./\">Debians konsulentliste</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Navn:"
@@ -62,11 +70,3 @@ msgid ""
"<total_consultant> Debian consultants listed in <total_country> countries "
"worldwide."
msgstr "<total_consultant> Debian-konsulenter i <total_country> land vist."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Konsulentliste"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Tilbake til <a href=\"./\">Debians konsulentliste</a>."
diff --git a/norwegian/po/countries.nb.po b/norwegian/po/countries.nb.po
index 8fcf0c1a168..5166094154e 100644
--- a/norwegian/po/countries.nb.po
+++ b/norwegian/po/countries.nb.po
@@ -218,210 +218,215 @@ msgid "Kenya"
msgstr "Kenya"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kasakhstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Korea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuwait"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kasakhstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Litauen"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxembourg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Latvia"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Marokko"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldova"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Montenegro"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Den makedonske republikk"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongolia"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mexico"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malaysia"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Ny-Caledonia"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Nederland"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norge"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "New Zealand"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Fransk Polynesia"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filippinene"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polen"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugal"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Romania"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Serbia"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Russland"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Saudiarabia"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Sverige"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapore"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovenia"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovakia"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "El Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Thailand"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tadsjikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunisia"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Tyrkia"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taiwan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukraina"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Forente stater"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Usbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Sørafrika"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/norwegian/po/distrib.nb.po b/norwegian/po/distrib.nb.po
index 2799eab871b..f4ad3dd2a49 100644
--- a/norwegian/po/distrib.nb.po
+++ b/norwegian/po/distrib.nb.po
@@ -9,97 +9,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Nøkkelord"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Visning"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Søk etter"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "stier som slutter med nøkkelordet"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Kun pakkenavn"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "pakker som inneholder file med navn som"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Beskrivelser"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "pakker som inneholder file med navn som inneholder nøkkelordet"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Kildepakkenavn"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Vis kun eksakte treff"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribusjon"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "eksperimentell"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Arkitektur"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "hva som helst"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Søk"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Nullstill"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Søk etter"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Kun pakkenavn"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Beskrivelser"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Kildepakkenavn"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Vis kun eksakte treff"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Avsnitt"
@@ -116,6 +86,36 @@ msgstr "Bidrag"
msgid "non-free"
msgstr "ikke-fri"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Søk"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Nullstill"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Visning"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "stier som slutter med nøkkelordet"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "pakker som inneholder file med navn som"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "pakker som inneholder file med navn som inneholder nøkkelordet"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Arkitektur"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -130,13 +130,11 @@ 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
#, fuzzy
-#| msgid "EABI ARM"
msgid "EABI ARM (armel)"
msgstr "EABI ARM"
@@ -178,7 +176,6 @@ msgstr "MIPS (big endian)"
#: ../../english/releases/arches.data:22
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "MIPS (little endian)"
@@ -196,7 +193,6 @@ msgstr ""
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "MIPS (little endian)"
diff --git a/norwegian/po/doc.nb.po b/norwegian/po/doc.nb.po
index ceb372f2fc4..66a5a5f1cc7 100644
--- a/norwegian/po/doc.nb.po
+++ b/norwegian/po/doc.nb.po
@@ -9,113 +9,28 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:31
-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:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
-msgid ""
-"Written by two Debian developers, this free book\n"
-" started as a translation of their French best-seller known as Cahier de\n"
-" 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:80
-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:101
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-" covers all aspects of the administration of Debian from the installation\n"
-" 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:120
-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:140
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment. It shows the full potential of "
-"the distribution (in its current version 8) 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:191
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Forfatter:"
#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Debianpakke"
+
+#: ../../english/doc/books.def:44
msgid "email:"
msgstr "e-post:"
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
msgid "Available at:"
msgstr "Tilgjengelig hos:"
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
msgid "CD Included:"
msgstr "Inkludert CD:"
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
msgid "Publisher:"
msgstr "Forlag:"
@@ -139,47 +54,50 @@ msgstr "Status:"
msgid "Availability:"
msgstr "Tilgjengelighet:"
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
msgid "Latest version:"
msgstr "Siste versjon:"
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
msgid "(version <get-var version />)"
msgstr "(versjon <get-var version />)"
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
msgid "plain text"
msgstr "ren tekst"
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
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:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:177
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
+#: ../../english/doc/manuals.defs:185
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:188
+#: ../../english/doc/manuals.defs:203
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -189,18 +107,108 @@ 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:193
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr "CVS via nettet"
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr "Debianpakke"
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
msgid "Debian package (archived)"
msgstr "Debianpakke (arkivert)"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/norwegian/po/newsevents.nb.po b/norwegian/po/newsevents.nb.po
index 480dffec07b..40c33cfdf54 100644
--- a/norwegian/po/newsevents.nb.po
+++ b/norwegian/po/newsevents.nb.po
@@ -9,90 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Nyheter om Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Siste nytt om Debian"
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "s.<get-var page />"
-
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr ""
-
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "Navn:"
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "E-post:"
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "Tidligere foredrag"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Språk"
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Adresse:"
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Emner:"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Tittel:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Forfatter:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Språk:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Dato:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Begivenhet"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Lysark:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "kilde"
-
-#: ../../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 "Sammendrag"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Kommende begivenheter"
@@ -152,6 +68,127 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (død peker)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"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
+#: ../../english/template/debian/weeklynews/footer.wml:10
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr ""
+"<a href=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
+
+#. 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 Project News blir redigert av <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 Project News blir redigert av <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\" />Dette nummeret av Debian Project News ble redigert "
+"av <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=\"singular\" />Dette nummeret av Debian Project News ble redigert "
+"av <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\" />Den ble oversatt av %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\" />Den ble oversatt av %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=\"plural\" />Den ble oversatt av %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=\"plural\" />Den ble oversatt av %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 ""
+"For å få dette nyhetsbrevet per e-post hver uke, <a href=\"https://lists."
+"debian.org/debian-news/\">abonner</a> på postlisten debian-news."
+
+#. 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 av Debian Weekly News er <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 av Debian Weekly News er <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\" />Dette nummeret av Debian Weekly News ble redigert <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\" />Dette nummeret av Debian Weekly News ble redigert <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -333,138 +370,89 @@ msgid ""
"the following topics:"
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 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 hver uke, <a href=\"https://lists."
-"debian.org/debian-news/\">abonner</a> på postlisten debian-news."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "s.<get-var page />"
-#: ../../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=\"../../\">Tidligere utgaver</a> av nyhetsbrevet er tilgjengelige."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Tittel:"
-#. 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 Project News blir redigert av <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Forfatter:"
-#. 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 Project News blir redigert av <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Språk:"
-#. 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\" />Dette nummeret av Debian Project News ble redigert "
-"av <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Dato:"
-#. 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=\"singular\" />Dette nummeret av Debian Project News ble redigert "
-"av <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Begivenhet"
-#. 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\" />Den ble oversatt av %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Lysark:"
-#. 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\" />Den ble oversatt av %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "kilde"
-#. 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=\"plural\" />Den ble oversatt av %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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=\"plural\" />Den ble oversatt av %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Liste over talere"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Tilbake til <a href=\"./\">Debian talesiden</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Sammendrag"
-#: ../../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 ""
-"For å få dette nyhetsbrevet per e-post hver uke, <a href=\"https://lists."
-"debian.org/debian-news/\">abonner</a> på postlisten debian-news."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Nyheter om Debian"
-#. 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 av Debian Weekly News er <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Siste nytt om 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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
msgstr ""
-"Redaktører av Debian Weekly News er <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\" />Dette nummeret av Debian Weekly News ble redigert <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Name:"
+#~ msgstr "Navn:"
-#. 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\" />Dette nummeret av Debian Weekly News ble redigert <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Email:"
+#~ msgstr "E-post:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "Tidligere foredrag"
+
+#~ msgid "Languages:"
+#~ msgstr "Språk"
+
+#~ msgid "Location:"
+#~ msgstr "Adresse:"
+
+#~ msgid "Topics:"
+#~ msgstr "Emner:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "Liste over talere"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Tilbake til <a href=\"./\">Debian talesiden</a>."
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/norwegian/po/organization.nb.po b/norwegian/po/organization.nb.po
index 4620e486325..51b1e23d8f8 100644
--- a/norwegian/po/organization.nb.po
+++ b/norwegian/po/organization.nb.po
@@ -42,281 +42,327 @@ msgid "manager"
msgstr "bestyrer"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr ""
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Koordinator for stabil utgave"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr ""
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "wizard"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "styreformann"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "assistent"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "sekretær"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Styremedlemmer"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribusjon"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Publisitet"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Støtte og infrastruktur"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Leder"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Teknisk komité"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Sekretær"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Utviklingsprosjekter"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP-arkiv"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "FTP-ansvarlige"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "FTP-assistenter"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Individuelle pakker"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Utgavekoordinering"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Utgiverlag"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Kvalitetskontroll"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Installasjonsystems-gruppen"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Utgivelsesnotater"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD-avtrykk"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produksjon"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testing"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infrastruktur for automatisk bygging"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Buildd-administrasjon"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentasjon"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "List over pakker som trenger arbeid og mulige pakker"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Porteringer"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Spesielle systemer"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Bærbare"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Brannvegger"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Innebygde system"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Pressekontakt"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Nettsider"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Debian kvinneprosjekt"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Begivenheter"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Teknisk komité"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Partnerprogram"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Koordinering av maskinvaredonasjon"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Brukerstøtte"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Feilrapportsystem"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Postlisteadministrasjon og -arkiv"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr "Resepsjon for nye medlemmer"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Debian kontoforvaltere"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Nøkkelring-koordinatore (PGP og GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Sikkerhetsgruppen"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Konsulentsiden"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "Side med CD-leverandører"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Retningslinjer"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Systemadministrasjon"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -325,7 +371,7 @@ msgstr ""
"maskiner, slik som passordproblemer eller behov for å ha en særskilt pakke "
"installert."
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:469
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 "
@@ -335,66 +381,61 @@ msgstr ""
"debian.org/machines.cgi\">Debians maskinside</a>. Denne skulle inneholde "
"adminstrator-opplysninger for hver maskin."
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "Administrator av LDAP-utviklerlisten"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Blåkopier"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "DNS-forvalter"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Pakkesporingssystem"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Alioth-administratorer"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Debian for barn mellom 1 og 99"
+#~ msgid "Individual Packages"
+#~ msgstr "Individuelle pakker"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Debian for medisinsk praksis og forskning"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian for barn mellom 1 og 99"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Debian for utdanning"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian for medisinsk praksis og forskning"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Debian på juridiske kontor"
+#~ msgid "Debian for education"
+#~ msgstr "Debian for utdanning"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian på juridiske kontor"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Debian for folk med funksjonshemning"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian for folk med funksjonshemning"
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr "Debian for naturvitenskap og relatert forskning"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian for naturvitenskap og relatert forskning"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian for utdanning"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian for utdanning"
#~ msgid "Live System Team"
#~ msgstr "Gruppen for «live»-system"
diff --git a/norwegian/po/others.nb.po b/norwegian/po/others.nb.po
index 2e3567f1689..78f0a3fb591 100644
--- a/norwegian/po/others.nb.po
+++ b/norwegian/po/others.nb.po
@@ -57,42 +57,6 @@ msgstr "<void id=\"d-i\" />Ukjent"
msgid "Unavailable"
msgstr "Utilgjengelig"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Hjørnet for nye medlemmer"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Steg 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Steg 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Steg 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Steg 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Steg 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Steg 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Steg 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Sjekkliste for søkere"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -152,131 +116,94 @@ msgstr "[Debian drevet]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (miniknapp)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "samme som over"
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Produkter"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "T-skjorter"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "hatter"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "klisterlapper"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "krus"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "andre klær"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "poloskjorter"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "frisbee"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "musmatter"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "merker"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "basketballmål"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "øreringer"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "dresser"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "paraplyer"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "putevar"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr ""
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr ""
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr ""
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Hvor lenge har du brukt Debian?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Er du en Debian-utvilker?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "Hvilke områder i Debian er du involvert i?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Hva fikk deg interessert i å jobbe 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 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?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Litt mer om deg ..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -321,6 +248,79 @@ msgstr "Versjon"
msgid "URL"
msgstr "Nettadresse"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Hjørnet for nye medlemmer"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Steg 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Steg 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Steg 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Steg 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Steg 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Steg 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Steg 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Sjekkliste for søkere"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "samme som over"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Hvor lenge har du brukt Debian?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Er du en Debian-utvilker?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "Hvilke områder i Debian er du involvert i?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Hva fikk deg interessert i å jobbe 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 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?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Litt mer om deg ..."
+
#~ msgid "p<get-var page />"
#~ msgstr "s.<get-var page />"
diff --git a/norwegian/po/partners.nb.po b/norwegian/po/partners.nb.po
index 021ae624d61..644cd23a422 100644
--- a/norwegian/po/partners.nb.po
+++ b/norwegian/po/partners.nb.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/norwegian/po/ports.nb.po b/norwegian/po/ports.nb.po
index bf64dcee7b2..01a1432996d 100644
--- a/norwegian/po/ports.nb.po
+++ b/norwegian/po/ports.nb.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian for Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian for PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd CD-er"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian for IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Kontakt"
@@ -89,6 +73,22 @@ msgstr "Tilgjengelighet"
msgid "Systems"
msgstr "Systemer"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian for Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian for PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd CD-er"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian for IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD for i386"
diff --git a/norwegian/po/security.nb.po b/norwegian/po/security.nb.po
index 2d1d3c0c94a..ca533b07714 100644
--- a/norwegian/po/security.nb.po
+++ b/norwegian/po/security.nb.po
@@ -9,42 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Sikkerhet i Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Sikkerhetsmeldinger fra 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 ""
-" <a href=\\\"undated/\\\">udaterte</a> sikkerhetsmeldinger bevart for "
-"ettertiden"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre CVE-ordbok"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus Bugtraq database"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT sikkerhetsmeldinger"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT sårbarhetsnotater"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Kildekode:"
@@ -127,3 +91,39 @@ msgstr "CERTs 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."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Q"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Sikkerhet i Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Sikkerhetsmeldinger fra Debian"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitre CVE-ordbok"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus Bugtraq database"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT sikkerhetsmeldinger"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT sårbarhetsnotater"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+" <a href=\\\"undated/\\\">udaterte</a> sikkerhetsmeldinger bevart for "
+"ettertiden"
diff --git a/norwegian/po/stats.nb.po b/norwegian/po/stats.nb.po
index 3de9b320ab8..c4bd18a75ee 100644
--- a/norwegian/po/stats.nb.po
+++ b/norwegian/po/stats.nb.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Statistikk for oversettelsen av Debian sitt nettsted"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Det er %d sider å oversette."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Det er %d byte å oversette."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Det er %d strenger å oversette."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Feil oversettelsesversjon"
@@ -42,13 +26,13 @@ msgid "The original no longer exists"
msgstr "Originalen fins ikke lenger"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "antall treff fins ikke"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "treff"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "antall treff fins ikke"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr ""
@@ -61,15 +45,6 @@ msgstr ""
msgid "Translation summary for"
msgstr "Oversettelsessammendrag for"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Ikke oversatt"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Utdatert"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Oversatt"
@@ -79,6 +54,15 @@ msgstr "Oversatt"
msgid "Up to date"
msgstr "Oppdatert"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Utdatert"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Ikke oversatt"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,6 +213,22 @@ msgstr "Oversatte nettsider (etter størrelse)"
msgid "Translation Statistics by Page Size"
msgstr "Oversettelsesstatistikk etter sidestørrelse"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Statistikk for oversettelsen av Debian sitt nettsted"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Det er %d sider å oversette."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Det er %d byte å oversette."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Det er %d strenger å oversette."
+
#~ msgid "Created with"
#~ msgstr "Opprettet med"
diff --git a/norwegian/po/templates.nb.po b/norwegian/po/templates.nb.po
index 5dd49bfd410..6f4105dda90 100644
--- a/norwegian/po/templates.nb.po
+++ b/norwegian/po/templates.nb.po
@@ -10,14 +10,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Debians nettsted"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Søk gjennom Debians nettstedet."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -79,7 +71,6 @@ msgstr "Ta kontakt med oss"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Informasjon om utgaver"
@@ -157,6 +148,11 @@ msgstr "Få tak i Debian"
msgid "The Debian Blog"
msgstr "Debians blogg"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Sist oppdatert"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -203,14 +199,8 @@ 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
-#| "using_cvs\">available</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -224,27 +214,27 @@ msgstr ""
"\">kontaktside</a>.Nettstedets kildekode er <a href=\"m4_HOME/devel/website/"
"using_cvs\">tilgjengelig</a>."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Sist oppdatert"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Opphavsrett"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> og andre;"
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -261,6 +251,14 @@ msgstr "Denne siden er også tilgjengelig på følgende språk:"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Slik velger du <a href=m4_HOME/intro/cn>standard språk</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian internasjonal"
@@ -490,6 +488,15 @@ msgstr "(ny versjon)"
msgid "Report"
msgstr "Rapport"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -524,10 +531,18 @@ msgstr ""
msgid "URL"
msgstr "Nettadresse"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Tilbake til <a href=\"../\">Hvem bruker Debian? siden</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Debians nettsted"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Søk gjennom Debians nettstedet."
+
#~ msgid "List of Consultants"
#~ msgstr "Konsulentliste"
diff --git a/norwegian/po/vote.nb.po b/norwegian/po/vote.nb.po
index 207f0685cf4..84536d4e7f5 100644
--- a/norwegian/po/vote.nb.po
+++ b/norwegian/po/vote.nb.po
@@ -28,239 +28,270 @@ msgstr "Donasjoner"
#: ../../english/template/debian/votebar.wml:25
#, fuzzy
+msgid "Withdrawals"
+msgstr "Tilbaketrukket"
+
+#: ../../english/template/debian/votebar.wml:28
+#, fuzzy
msgid "Debate"
msgstr "Debians cd-gruppe"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr ""
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
#, fuzzy
msgid "Proposer"
msgstr "foreslått"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+msgid "Proposal G Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:58
+msgid "Proposal H Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+msgid "Proposal G Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:85
+msgid "Proposal H Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr ""
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr ""
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr ""
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr ""
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr ""
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "foreslått"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "foreslått"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr ""
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr ""
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr ""
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr ""
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr ""
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr ""
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
#, fuzzy
msgid "Minimum Discussion"
msgstr "Under&nbsp;diskusjon"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr ""
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Venter&nbsp;på&nbsp;sponsorer"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Under&nbsp;diskusjon"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Avstemming&nbsp;pågår"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Besluttet"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Tilbaketrukket"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Annet"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Hjem&nbsp;Avstemmingssiden"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Hvordan..."
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Send&nbsp;inn&nbsp;et&nbsp;forslag"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Legg&nbsp;til&nbsp;et&nbsp;forslag"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Følg&nbsp;et&nbsp;forslag"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Les&nbsp;et&nbsp;resultat"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Stem"
diff --git a/persian/po/cdimage.fa.po b/persian/po/cdimage.fa.po
index 4141fa4fc75..2690bb991cc 100644
--- a/persian/po/cdimage.fa.po
+++ b/persian/po/cdimage.fa.po
@@ -13,20 +13,6 @@ msgstr ""
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "ISO images"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "فایل های Jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -123,3 +109,17 @@ msgid ""
msgstr ""
" <a href=\"/MailingLists/disclaimer\">لیست پستی عمومی</a> انگلیسی زبان، برای "
"سی دی ها و دی وی دی ها:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO images"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "فایل های Jigdo"
diff --git a/persian/po/consultants.fa.po b/persian/po/consultants.fa.po
index 7c5ef4b03b9..138373e676f 100644
--- a/persian/po/consultants.fa.po
+++ b/persian/po/consultants.fa.po
@@ -13,6 +13,14 @@ msgstr ""
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-SourceCharset: utf-8\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 "بازگشت به <a href=\"./\">صفحه مشاوران دبیان</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "نام:"
@@ -68,11 +76,3 @@ msgid ""
msgstr ""
"<total_consultant> مشاور دبیان در <total_country> کشور در سطح جهان لیست "
"شده‌اند."
-
-#: ../../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 "بازگشت به <a href=\"./\">صفحه مشاوران دبیان</a>."
diff --git a/persian/po/countries.fa.po b/persian/po/countries.fa.po
index d151de8f728..32d5afa8cf9 100644
--- a/persian/po/countries.fa.po
+++ b/persian/po/countries.fa.po
@@ -223,214 +223,217 @@ msgid "Kenya"
msgstr "کنیا"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "قزاقستان"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "کره"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "کویت"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "قزاقستان"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "سریلانکا"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "لیتوانی"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "لوکزامبورگ"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "لتونی"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "مراکش"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "مالدیو"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "مونته‌نگرو"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "ماداگاسکار"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
#, fuzzy
-#| msgid "Dominican Republic"
msgid "Macedonia, Republic of"
msgstr "جمهوری دومینیکن"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "مونگولیا"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "مالتا"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "مکزیک"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "مالزی"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "کالدونیای جدید"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "نیکاراگوئه"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "هلند"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "نروژ"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "زلاند نو"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "پاناما"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "پرو"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "پلینزی فرانسوی"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "فیلیپین"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "پاکستان"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "لهستان"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "پرتغال"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "رومانی"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "صربستان"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "روسیه"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "عربستان سعودی"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "سوئد"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "سنگاپور"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "اسلوونی"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "اسلواکی"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "السالوادور"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "تایلند"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
#, fuzzy
-#| msgid "Pakistan"
msgid "Tajikistan"
msgstr "پاکستان"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "تونس"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "ترکیه"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "تایوان"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "اکراین"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "ایالات متحده"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "اروگوئه"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "ازبکستان"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "ونزوئلا"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "ویتنام"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "وانواتو"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "آفریقای جنوبی"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "زیمبابوه"
diff --git a/persian/po/distrib.fa.po b/persian/po/distrib.fa.po
index 33617b1a163..a46952108cd 100644
--- a/persian/po/distrib.fa.po
+++ b/persian/po/distrib.fa.po
@@ -14,97 +14,67 @@ msgstr ""
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "کلیدواژه"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "نمایش"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "جستجو در"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "مسیر های منتهی به کلیدواژه"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "فقط نام بسته‌ها"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "بسته‌هایی که شامل پرونده‌هایی با این نام باشند"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "توضیحات"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "بسته‌هایی که فایل های داخل آن شامل این کلیدواژه باشد"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "نام بسته‌های کد منبع"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "تنها موارد کاملا منطبق را نشان بده"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "توزیع"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "تجربی"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "ناپایدار"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "آزمایشی"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "پایدار"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "همه"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "جستجو"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-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"
-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:21
-msgid "Only show exact matches"
-msgstr "تنها موارد کاملا منطبق را نشان بده"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "بخش"
@@ -121,6 +91,36 @@ msgstr "وابسته"
msgid "non-free"
msgstr "غیر آزاد"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "جستجو"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "بازنشانی"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "نمایش"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "مسیر های منتهی به کلیدواژه"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "بسته‌هایی که شامل پرونده‌هایی با این نام باشند"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "بسته‌هایی که فایل های داخل آن شامل این کلیدواژه باشد"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "معماری"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "آلفا"
@@ -135,19 +135,16 @@ 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
#, fuzzy
-#| msgid "EABI ARM"
msgid "EABI ARM (armel)"
msgstr "EABI ARM"
#: ../../english/releases/arches.data:13
#, fuzzy
-#| msgid "Hard Float ABI ARM"
msgid "Hard Float ABI ARM (armhf)"
msgstr "Hard Float ABI ARM"
@@ -185,7 +182,6 @@ msgstr "MIPS (big endian)"
#: ../../english/releases/arches.data:22
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "MIPS (little endian)"
@@ -203,7 +199,6 @@ msgstr ""
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "MIPS (little endian)"
diff --git a/persian/po/doc.en.po b/persian/po/doc.en.po
index 1fe1ba7328c..966a944e825 100644
--- a/persian/po/doc.en.po
+++ b/persian/po/doc.en.po
@@ -1,79 +1,208 @@
msgid ""
msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.def:15
+#: ../../english/doc/books.def:38
msgid "Author:"
msgstr ""
-#: ../../english/doc/books.def:18
-msgid "email:"
+#: ../../english/doc/books.def:41
+msgid "Debian Release:"
msgstr ""
-#: ../../english/doc/books.def:22
-msgid "Available at:"
+#: ../../english/doc/books.def:44
+msgid "email:"
msgstr ""
-#: ../../english/doc/books.def:25
-msgid "Language:"
+#: ../../english/doc/books.def:48
+msgid "Available at:"
msgstr ""
-#: ../../english/doc/books.def:29
+#: ../../english/doc/books.def:51
msgid "CD Included:"
msgstr ""
-#: ../../english/doc/books.def:32
+#: ../../english/doc/books.def:54
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:81
+#: ../../english/doc/manuals.defs:97
msgid "Latest version:"
msgstr ""
-#: ../../english/doc/manuals.defs:95
+#: ../../english/doc/manuals.defs:113
msgid "(version <get-var version />)"
msgstr ""
-#: ../../english/doc/manuals.defs:125
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
msgid "plain text"
msgstr ""
-#. The ddp_pkg_loc variable contains
-#. <a href="http://cvs.debian.org/ddp/manuals.sgml/[package]/?cvsroot=debian-doc">[package]</a>
-#: ../../english/doc/manuals.defs:144
-msgid "Use <a href=\"cvs\">CVS</a> to download the SGML source text for <get-var ddp_pkg_loc />."
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+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:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:150
-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:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr ""
+
+#: ../../english/doc/manuals.defs:177
+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:155
+#: ../../english/doc/manuals.defs:185
+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:203
+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:208
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:159
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr ""
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr ""
+
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
+#: ../../english/releases/arches.data:36
+msgid "HTML"
+msgstr ""
+
+#: ../../english/releases/arches.data:37
+msgid "PDF"
+msgstr ""
diff --git a/persian/po/doc.fa.po b/persian/po/doc.fa.po
index cd87ad55974..b8fc4d8808f 100644
--- a/persian/po/doc.fa.po
+++ b/persian/po/doc.fa.po
@@ -13,113 +13,28 @@ msgstr ""
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../../english/doc/books.data:31
-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:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
-msgid ""
-"Written by two Debian developers, this free book\n"
-" started as a translation of their French best-seller known as Cahier de\n"
-" 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:80
-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:101
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-" covers all aspects of the administration of Debian from the installation\n"
-" 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:120
-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:140
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment. It shows the full potential of "
-"the distribution (in its current version 8) 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:191
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "نویسنده:"
#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "بسته‌ی دبیان"
+
+#: ../../english/doc/books.def:44
msgid "email:"
msgstr "پست الکترونیکی:"
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
msgid "Available at:"
msgstr "در دسترس است در:"
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
msgid "CD Included:"
msgstr "سی دی شامل:"
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
msgid "Publisher:"
msgstr "منتشر کننده:"
@@ -143,47 +58,50 @@ msgstr "وضعیت:"
msgid "Availability:"
msgstr "دسترس پذیری:"
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
msgid "Latest version:"
msgstr "آخرین نسخه:"
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
msgid "(version <get-var version />)"
msgstr "(نسخه‌ی <get-var version />)"
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
msgid "plain text"
msgstr "متن خالص"
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
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:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:177
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
+#: ../../english/doc/manuals.defs:185
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:188
+#: ../../english/doc/manuals.defs:203
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -193,18 +111,108 @@ 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:193
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr "CVS از طریق وب"
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr "بسته‌ی دبیان"
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
msgid "Debian package (archived)"
msgstr "بسته‌ٔ دبیان (بایگانی شده)"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/persian/po/newsevents.fa.po b/persian/po/newsevents.fa.po
index 8de56c8cf47..4006406e7d3 100644
--- a/persian/po/newsevents.fa.po
+++ b/persian/po/newsevents.fa.po
@@ -13,90 +13,6 @@ msgstr ""
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-SourceCharset: utf-8\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 "p<get-var page />"
-
-#: ../../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 "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 "چکیده"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr ""
@@ -153,6 +69,107 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr ""
+#: ../../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 ""
+
+#: ../../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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#: ../../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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -334,111 +351,83 @@ msgid ""
"the following topics:"
msgstr ""
-#: ../../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 ""
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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 ""
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+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>."
-msgstr ""
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+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>."
-msgstr ""
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+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>."
-msgstr ""
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+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>."
-msgstr ""
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "رویداد:"
-#. 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 ""
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "اسلاید ها:"
-#. 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 ""
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "منبع"
-#. 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 ""
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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 ""
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "فهرست سخنرانان"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr ""
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+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>."
-msgstr ""
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+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>."
-msgstr ""
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
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>."
-msgstr ""
+#~ msgid "Name:"
+#~ 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 ""
+#~ msgid "Email:"
+#~ msgstr "پست الکترونیکی:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "صحبت‌های قبلی:"
+
+#~ msgid "Languages:"
+#~ msgstr "زبان‌ها:"
+
+#~ msgid "Location:"
+#~ msgstr "مکان:"
+
+#~ msgid "Topics:"
+#~ msgstr "سرفصل‌ها:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "فهرست سخنرانان"
diff --git a/persian/po/organization.fa.po b/persian/po/organization.fa.po
index b93811c2e05..553c6e7f012 100644
--- a/persian/po/organization.fa.po
+++ b/persian/po/organization.fa.po
@@ -46,350 +46,368 @@ msgid "manager"
msgstr "مدیر"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "مدیر انتشار نسخه پایدار"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "wizard"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
msgid "chair"
msgstr ""
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "دستیار"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "منشی"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr ""
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr ""
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr ""
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
-msgid "Support and Infrastructure"
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
msgstr ""
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
+msgid "Support and Infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "رهبر"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "شورای فنی"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "منشی"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "پروژه توسعه"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "بایگانی FTP"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
#, fuzzy
-#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "مدیر FTP"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "دستیار FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr ""
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "مدیریت انتشار"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "تیم انتشار"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "کنترل کیفیت"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "تیم سیستم نصب"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "نکته های انتشار"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD Images"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "محصول"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr ""
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr ""
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr ""
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr ""
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr ""
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr ""
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "تنظیمات خاص"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "لپ تاپ ها"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "فایروال ها"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr ""
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "صفحات وب"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "سیاره دبیان"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr ""
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "رویدادها"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "شورای فنی"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr ""
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "پشتیبانی کاربران"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr ""
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr ""
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr ""
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr ""
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "تیم امنیت"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "صفحه مشاوره ها"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "صفحه فروشندگان CD"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "سیاست"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "مدیر سیستم"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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:435
+#: ../../english/intro/organization.data:469
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:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr ""
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "آینه های دریافت"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "نگهدارنده DNS"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr ""
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "System Administration"
msgid "Salsa administrators"
msgstr "مدیر سیستم"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr ""
-
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr ""
-
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr ""
-
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr ""
-
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr ""
-
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr ""
-
-#: ../../english/intro/organization.data:489
-msgid "Debian for astronomy"
-msgstr ""
-
#~ msgid "Volatile Team"
#~ msgstr "تیم Volatile"
diff --git a/persian/po/others.fa.po b/persian/po/others.fa.po
index 3c719427313..67891bfdebc 100644
--- a/persian/po/others.fa.po
+++ b/persian/po/others.fa.po
@@ -62,44 +62,6 @@ msgstr "<void id=\"d-i\" />نا مشخص"
msgid "Unavailable"
msgstr "غیر قابل دسترس"
-#: ../../english/devel/join/nm-steps.inc:7
-#, fuzzy
-#| msgid "New Maintainers' Corner"
-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> "
@@ -113,7 +75,6 @@ msgstr ""
#: ../../english/devel/website/tc.data:15
#: ../../english/devel/website/tc.data:16
#, fuzzy
-#| msgid "Additional Information"
msgid "More information"
msgstr "اطلاعات اضافی"
@@ -128,19 +89,16 @@ msgstr ""
#: ../../english/distrib/pre-installed.defs:18
#, fuzzy
-#| msgid "Phone:"
msgid "Phone"
msgstr "تلفن:"
#: ../../english/distrib/pre-installed.defs:19
#, fuzzy
-#| msgid "Fax:"
msgid "Fax"
msgstr "نمابر:"
#: ../../english/distrib/pre-installed.defs:21
#, fuzzy
-#| msgid "Address:"
msgid "Address"
msgstr "آدرس:"
@@ -172,131 +130,95 @@ msgstr "[بر اساس دبیان]"
msgid "[Debian] (mini button)"
msgstr "[دبیان] (دکمه کوچک)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "مانند آنچه در بالا آمده است"
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "محصولات"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "تی-شرت‌ها"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "کلاه‌ها"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "برچسب‌ها"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "لیوان‌ها"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "لباس‌های دیگر"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "پیراهن‌های چوگان"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "بشقاب پرنده"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "پدهای موس"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "علائم"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "گل‌های بسکتبال"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "گوشواره‌ها"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "چمدانها"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
#, fuzzy
-#| msgid "suitcases"
msgid "pillowcases"
msgstr "چمدانها"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr ""
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr ""
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr ""
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "خوب"
@@ -341,6 +263,78 @@ msgstr "نسخه"
msgid "URL"
msgstr "نشانی اینترنتی"
+#: ../../english/devel/join/nm-steps.inc:7
+#, fuzzy
+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/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "مانند آنچه در بالا آمده است"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
#~ msgid "Name:"
#~ msgstr "نام:"
diff --git a/persian/po/partners.fa.po b/persian/po/partners.fa.po
index 021ae624d61..644cd23a422 100644
--- a/persian/po/partners.fa.po
+++ b/persian/po/partners.fa.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/persian/po/ports.fa.po b/persian/po/ports.fa.po
index 75f7d1a4ba8..759892b86bf 100644
--- a/persian/po/ports.fa.po
+++ b/persian/po/ports.fa.po
@@ -13,22 +13,6 @@ msgstr ""
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "دبیان برای Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "دبیان برای PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "سی دی های هورد"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "دبیان برای IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "تماس"
@@ -93,6 +77,22 @@ msgstr "تهیه کردن"
msgid "Systems"
msgstr "سیستم ها"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "دبیان برای Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "دبیان برای PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "سی دی های هورد"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "دبیان برای IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "دبیان گنو/نت بی اس دی برای i386"
diff --git a/persian/po/security.fa.po b/persian/po/security.fa.po
index 36363a9bd14..bc0698cf3cd 100644
--- a/persian/po/security.fa.po
+++ b/persian/po/security.fa.po
@@ -13,40 +13,6 @@ msgstr ""
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "امنیت دبیان"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "مشاوره های امنیتی دبیان"
-
-#: ../../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 ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre CVE dictionary"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "بانک اطلاعات Securityfocus"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "مشاوره های CERT:"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "یادداشت های آسیب پذیری US-CERT:"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "منبع: "
@@ -124,3 +90,37 @@ msgstr ""
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr "مرجع بانک اطلاعات امنیت خارجی دیگری در دسترس نیست."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Q"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "امنیت دبیان"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "مشاوره های امنیتی دبیان"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitre CVE dictionary"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "بانک اطلاعات Securityfocus"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "مشاوره های CERT:"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "یادداشت های آسیب پذیری US-CERT:"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/persian/po/stats.fa.po b/persian/po/stats.fa.po
index a259e12c2bb..de2f82bd177 100644
--- a/persian/po/stats.fa.po
+++ b/persian/po/stats.fa.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/persian/po/templates.fa.po b/persian/po/templates.fa.po
index 098fc8cc4d4..65baeb1ba89 100644
--- a/persian/po/templates.fa.po
+++ b/persian/po/templates.fa.po
@@ -13,20 +13,9 @@ msgstr ""
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../../english/search.xml.in:7
-#, fuzzy
-#| msgid "Debian Project"
-msgid "Debian website"
-msgstr "پروژه دبیان"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian"
msgstr "کمک به دبیان"
@@ -48,10 +37,6 @@ msgstr "پروژه دبیان"
#: ../../english/template/debian/common_translation.wml:13
#, fuzzy
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -91,7 +76,6 @@ msgstr "تماس با ما"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "اطلاعات انتشار"
@@ -167,10 +151,14 @@ msgstr "دریافت دبیان"
#: ../../english/template/debian/common_translation.wml:91
#, fuzzy
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "کتاب های دبیان "
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "آخرین تغییرات انجام شده"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -216,13 +204,8 @@ 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -234,28 +217,28 @@ msgstr ""
"\">debian-www@lists.debian.org</a> نامه بزنید. برای دیدن اطلاعات تماس دیگر, "
"به <a href=\"m4_HOME/contact\">صفحه تماس</a> مراجعه کنید."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "آخرین تغییرات انجام شده"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "حق انتشار"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr ""
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -272,6 +255,14 @@ msgstr "این صفحه در زبان های زیر نیز قابل دسترس
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "نحوه تنظیم <a href=m4_HOME/intro/cn>زبان پیش فرض اسناد</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "دبیان بین المللی"
@@ -318,7 +309,6 @@ msgstr "کتاب های دبیان "
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian Wiki"
msgstr "کمک به دبیان"
@@ -352,7 +342,6 @@ msgstr "پایگاه داده توسعه دهندگان"
#: ../../english/template/debian/links.tags.wml:64
#, fuzzy
-#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "کتاب های دبیان "
@@ -430,7 +419,6 @@ msgstr "فروشندگان لوح فشرده"
#: ../../english/template/debian/links.tags.wml:125
#, fuzzy
-#| msgid "CD ISO images"
msgid "CD/USB ISO images"
msgstr "تصاویر ISO لوح فشرده"
@@ -464,7 +452,6 @@ msgstr "مرور کلی بسته های توسعه دهندگان دبیان"
#: ../../english/template/debian/navbar.wml:10
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "پروژه دبیان"
@@ -508,6 +495,15 @@ msgstr "(بازبینی جدید)"
msgid "Report"
msgstr "گزارش"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -543,10 +539,19 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "بازگشت به <a href=\"../\">صفحه چه کسی از دبیان استفاده می کند؟</a>."
+#: ../../english/search.xml.in:7
+#, fuzzy
+msgid "Debian website"
+msgstr "پروژه دبیان"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
#~ msgid "Rating:"
#~ msgstr "درجه بندی:"
diff --git a/persian/po/vendors.fa.po b/persian/po/vendors.fa.po
index 0ee5ae394e7..5ae16f3dc06 100644
--- a/persian/po/vendors.fa.po
+++ b/persian/po/vendors.fa.po
@@ -23,7 +23,6 @@ msgstr "اجازه همکاری"
#: ../../english/CD/vendors/vendors.CD.def:16
#, fuzzy
-#| msgid "CD/DVD"
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD"
diff --git a/persian/po/vote.fa.po b/persian/po/vote.fa.po
index 6bdd3367c0a..71cd325c998 100644
--- a/persian/po/vote.fa.po
+++ b/persian/po/vote.fa.po
@@ -30,243 +30,275 @@ msgid "Nominations"
msgstr "نامزدها"
#: ../../english/template/debian/votebar.wml:25
+#, fuzzy
+msgid "Withdrawals"
+msgstr "پس گرفته شده"
+
+#: ../../english/template/debian/votebar.wml:28
msgid "Debate"
msgstr "بحث"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr "سکو ها"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposer"
msgstr "پیشنهاد کننده"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr "Aطرح پیشنهادی پیشنهاد کننده "
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr "Bطرح پیشنهادی پیشنهادکننده"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr "Cطرح پیشنهادی پیشنهاد دهنده "
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr "Dطرح پیشنهادی پیشنهاد دهنده"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr "Eطرح پیشنهادی پیشنهاد دهنده"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr "Fطرح پیشنهادی پیشنهاد دهنده "
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Aطرح پیشنهادی پیشنهاد کننده "
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Aطرح پیشنهادی پیشنهاد کننده "
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "ثانویه ها"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Aپیشنهاد دهنده طرح پیشنهادی ثانویه "
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "B طرح پیشنهادی ثانویه پیشنهاد دهنده"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "C طرح پیشنهادی ثانویه"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "D طرح پیشنهادی ثانویه"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "E طرح پیشنهادی ثانویه"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "F طرح پیشنهادی ثانویه"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Aپیشنهاد دهنده طرح پیشنهادی ثانویه "
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Aپیشنهاد دهنده طرح پیشنهادی ثانویه "
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "مخالفت"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "متن"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Aپیشنهاد"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "B پیشنهاد"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "C پیشنهاد"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "D پیشنهاد"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "D طرح"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "F طرح"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Aپیشنهاد"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Aپیشنهاد"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "انتخاب ها"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "اصلاح پیشنهاد دهنده"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "اصلاح ثانویه ها"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "اصلاح متن"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "A اصلاح پیشنهاد دهنده "
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "A اصلاح ثانویه های "
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "A اصلاح متن"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "B اصلاح پیشنهاد دهنده "
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "B اصلاح ثانویه های "
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "B اصلاح متن"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
#, fuzzy
-#| msgid "Amendment Proposer A"
msgid "Amendment Proposer C"
msgstr "A اصلاح پیشنهاد دهنده "
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
#, fuzzy
-#| msgid "Amendment Seconds A"
msgid "Amendment Seconds C"
msgstr "A اصلاح ثانویه های "
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
#, fuzzy
-#| msgid "Amendment Text A"
msgid "Amendment Text C"
msgstr "A اصلاح متن"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "اصلاحات"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "اقدام"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "اکثریت نیازمندی"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "داده و ارقام"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "حد نصاب"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "بحث کمینه"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "ورقه رای"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "بازار"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "نتیجه"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "انتظار&nbsp;برای&nbsp;حامیان"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "در حال&nbsp;بحث"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "رای دادن&nbsp;باز"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "قطعی"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "پس گرفته شده"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "دیگر"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "خانه&nbsp;رای&nbsp;صفحه"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "چگونه&nbsp;پیکربندی کردن"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "پیشنهاد کردن&nbsp;a&nbsp;طرح"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "اصلاح کردن&nbsp;a&nbsp;طرح"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "دنبال کردن&nbsp;a&nbsp;طرح"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "خواندن&nbsp;a&nbsp;نتیجه"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "رای"
diff --git a/persian/po/wnpp.fa.po b/persian/po/wnpp.fa.po
index e696a0b68f9..4dccdc064aa 100644
--- a/persian/po/wnpp.fa.po
+++ b/persian/po/wnpp.fa.po
@@ -53,13 +53,11 @@ msgstr "%s روز در انتظار قبولی"
#: ../../english/template/debian/wnpp.wml:46
#, fuzzy
-#| msgid "%s days in adoption."
msgid "%s days in adoption, last activity today."
msgstr "%s روز در انتظار قبولی"
#: ../../english/template/debian/wnpp.wml:50
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "%s days in adoption, last activity yesterday."
msgstr "در تقاضا از دیروز"
@@ -82,57 +80,48 @@ msgstr "%s روز در حال آماده سازی"
#: ../../english/template/debian/wnpp.wml:72
#, fuzzy
-#| msgid "%s days in preparation."
msgid "%s days in preparation, last activity today."
msgstr "%s روز در حال آماده سازی"
#: ../../english/template/debian/wnpp.wml:76
#, fuzzy
-#| msgid "in preparation since yesterday."
msgid "%s days in preparation, last activity yesterday."
msgstr "در تدارک از دیروز"
#: ../../english/template/debian/wnpp.wml:80
#, fuzzy
-#| msgid "%s days in preparation."
msgid "%s days in preparation, last activity %s days ago."
msgstr "%s روز در حال آماده سازی"
#. timespans for request for adoption (RFAs)
#: ../../english/template/debian/wnpp.wml:85
#, fuzzy
-#| msgid "in adoption since today."
msgid "adoption requested since today."
msgstr "در تقاضا از امروز"
#: ../../english/template/debian/wnpp.wml:89
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "adoption requested since yesterday."
msgstr "در تقاضا از دیروز"
#: ../../english/template/debian/wnpp.wml:93
#, fuzzy
-#| msgid "in adoption since today."
msgid "adoption requested since %s days."
msgstr "در تقاضا از امروز"
#. timespans for orphaned packages (Os)
#: ../../english/template/debian/wnpp.wml:98
#, fuzzy
-#| msgid "in adoption since today."
msgid "orphaned since today."
msgstr "در تقاضا از امروز"
#: ../../english/template/debian/wnpp.wml:102
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "orphaned since yesterday."
msgstr "در تقاضا از دیروز"
#: ../../english/template/debian/wnpp.wml:106
#, fuzzy
-#| msgid "in preparation since today."
msgid "orphaned since %s days."
msgstr "در تدارک از امروز"
diff --git a/polish/po/cdimage.pl.po b/polish/po/cdimage.pl.po
index e782edf4f80..de9c43db198 100644
--- a/polish/po/cdimage.pl.po
+++ b/polish/po/cdimage.pl.po
@@ -16,20 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Odcisk klucza"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "obrazy ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "pliki jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -126,3 +112,17 @@ msgid ""
msgstr ""
"Angielskojęzyczna, <a href=\"/MailingLists/disclaimer\">publiczna lista "
"dyskusyjna</a> dla płyt CD/DVD:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "obrazy ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "pliki jigdo"
diff --git a/polish/po/consultants.pl.po b/polish/po/consultants.pl.po
index 96b454e8f2e..c3d127aad9c 100644
--- a/polish/po/consultants.pl.po
+++ b/polish/po/consultants.pl.po
@@ -15,6 +15,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Gtranslator 2.91.5\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Lista Konsultantów"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Powrót do <a href=\"./\">strony konsultantów Debian'a</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Imię i nazwisko:"
@@ -70,11 +78,3 @@ msgid ""
msgstr ""
"<total_consultant>Konsultanci Debiana z <total_country> krajów na całym "
"świecie."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Lista Konsultantów"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Powrót do <a href=\"./\">strony konsultantów Debian'a</a>."
diff --git a/polish/po/countries.pl.po b/polish/po/countries.pl.po
index c148e656292..5a05b4fb255 100644
--- a/polish/po/countries.pl.po
+++ b/polish/po/countries.pl.po
@@ -221,210 +221,215 @@ msgid "Kenya"
msgstr "Kenia"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazachstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Korea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuwejt"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazachstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Litwa"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luksemburg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Łotwa"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Maroko"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Mołdawia"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Czarnogóra"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Macedonia"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongolia"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Meksyk"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malezja"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Nowa Kaledonia"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nikaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Holandia"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norwegia"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Nowa Zelandia"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Polinezja Francuska"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipiny"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polska"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugalia"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Rumunia"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Serbia"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rosja"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Arabia Saudyjska"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Szwecja"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapur"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Słowenia"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Słowacja"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "Salwador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Tajlandia"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tadżykistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunezja"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turcja"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Tajwan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukraina"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Stany Zjednoczone"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Urugwaj"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Wenezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Wietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "RPA"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/polish/po/distrib.pl.po b/polish/po/distrib.pl.po
index 2fc7a96ab4e..cc35cf78183 100644
--- a/polish/po/distrib.pl.po
+++ b/polish/po/distrib.pl.po
@@ -11,97 +11,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Słowo kluczowe"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Wyświetl"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Szukaj w"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "ścieżki kończące się słowem kluczowym"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Tylko w nazwach pakietów"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "pakiety zawierające pliki o takiej nazwie"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Opisach"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "pakiety zawierające pliki, których nazwa zawiera słowo kluczowe"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Nazwach pakietów źródłowych"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Pokaż tylko dokładnie identyczne"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Dystrybucja"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "eksperymentalna"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "niestabilna"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testowa"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stabilna"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "dawna stabilna"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Architektura"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "dowolna"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Szukaj"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Czyść"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Szukaj w"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Tylko w nazwach pakietów"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Opisach"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Nazwach pakietów źródłowych"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Pokaż tylko dokładnie identyczne"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Sekcja"
@@ -118,6 +88,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Szukaj"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Czyść"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Wyświetl"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "ścieżki kończące się słowem kluczowym"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "pakiety zawierające pliki o takiej nazwie"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "pakiety zawierające pliki, których nazwa zawiera słowo kluczowe"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Architektura"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -132,19 +132,16 @@ 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
#, fuzzy
-#| msgid "EABI ARM"
msgid "EABI ARM (armel)"
msgstr "EABI ARM"
#: ../../english/releases/arches.data:13
#, fuzzy
-#| msgid "Hard Float ABI ARM"
msgid "Hard Float ABI ARM (armhf)"
msgstr "ABI ARM ze sprzętowym FPU"
@@ -182,7 +179,6 @@ msgstr "MIPS (big endian)"
#: ../../english/releases/arches.data:22
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "MIPS (little endian)"
@@ -200,7 +196,6 @@ msgstr ""
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "MIPS (little endian)"
diff --git a/polish/po/doc.pl.po b/polish/po/doc.pl.po
index b4a15ae9dd6..97e72f55230 100644
--- a/polish/po/doc.pl.po
+++ b/polish/po/doc.pl.po
@@ -13,10 +13,126 @@ msgstr ""
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Gtranslator 2.91.6\n"
-#: ../../english/doc/books.data:31
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Pakiet Debiana"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "e-mail:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Dostępne pod adresem:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "Zawiera CD:"
+
+#: ../../english/doc/books.def:54
+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:97
+msgid "Latest version:"
+msgstr "Ostatnia wersja:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(wersja <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "czysty tekst"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+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:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Interfejs WWW:"
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "Interfejs VCS:"
+
+#: ../../english/doc/manuals.defs:177
+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:185
+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:203
+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:208
+msgid "CVS via web"
+msgstr "CVS przez www"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Pakiet Debiana"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Pakiet Debiana (w archiwum)"
+
+#: ../../english/doc/books.data:32
msgid ""
"\n"
-" Debian 8 is the must-have handbook for learning Linux. Start on the\n"
+" Debian 9 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"
@@ -30,22 +146,9 @@ msgid ""
" Project."
msgstr ""
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
#, fuzzy
-#| 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."
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -72,7 +175,7 @@ msgstr ""
"zabezpieczenia usług, automatyczne instalacje czy wirtualizacja przy\n"
"pomocy Xen, KVM oraz LXC."
-#: ../../english/doc/books.data:80
+#: ../../english/doc/books.data:83
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"
@@ -86,7 +189,7 @@ 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:101
+#: ../../english/doc/books.data:105
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"
@@ -106,7 +209,7 @@ msgstr ""
" udoskonalić ich umiejętności oraz administratorów, którzy chcą\n"
" budować niezawodne sieci oparte na Debianie."
-#: ../../english/doc/books.data:120
+#: ../../english/doc/books.data:125
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -118,14 +221,8 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:140
+#: ../../english/doc/books.data:146
#, fuzzy
-#| 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."
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 "
@@ -137,7 +234,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:191
+#: ../../english/doc/books.data:200
msgid ""
"Written by two penetration researcher - Annihilator, Firstblood.\n"
" This book teaches you how to build and configure Debian 8.x server system\n"
@@ -153,114 +250,6 @@ msgid ""
" intrusion detection system."
msgstr ""
-#: ../../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:38
-msgid "plain text"
-msgstr "czysty tekst"
-
-#: ../../english/doc/manuals.defs:154 ../../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: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: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:36
msgid "HTML"
msgstr "HTML"
diff --git a/polish/po/newsevents.pl.po b/polish/po/newsevents.pl.po
index 54e837bdaa2..dac21400598 100644
--- a/polish/po/newsevents.pl.po
+++ b/polish/po/newsevents.pl.po
@@ -17,90 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Wiadomości Debiana"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Najnowsze wiadomości Debiana"
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "str.<get-var page />"
-
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr "Biuletyn dla społeczności Debiana"
-
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "Imię i nazwisko:"
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "E-mail:"
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "Poprzednie wykłady:"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Języki:"
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Miejsce:"
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Tematy:"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Tytuł:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Język:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Data:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Wydarzenie:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Prezentacja:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "źródło"
-
-#: ../../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 "Streszczenie"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Nadchodzące Atrakcje"
@@ -159,6 +75,130 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (martwy odnośnik)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"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
+#: ../../english/template/debian/weeklynews/footer.wml:10
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "Dostępne są <a href=\"../../\">archiwalne</a> wiadomości."
+
+#. 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\" />Wiadomości Projektu Debian redaguje <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\" />Wiadomości Projektu Debian redagują <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\" />Ten odcinek Wiadomości Projektu Debian "
+"przygotował(a) <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\" />Ten odcinek Wiadomości Projektu Debian "
+"przygotowali(ły) <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\" />Tłumaczenie: %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\" />Tłumaczenie: %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\" />Tłumaczenie: %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\" />Tłumaczenie: %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 ""
+"Aby co tydzień otrzymywać pocztą elektroniczną ten biuletyn <a href="
+"\"m4_HOME/MailingLists/subscribe#debian-news\">zapisz się na listę 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 ""
+"Cotygodniowe wiadomości Debiana przygotowuje <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 ""
+"Cotygodniowe wiadomości Debiana przygotowują <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\" />Ten odcinek Cotygodniowych wiadomości Debiana "
+"przygotował(a) <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\" />Ten odcinek Cotygodniowych wiadomości Debiana "
+"przygotowali(ły) <a href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -411,141 +451,89 @@ msgstr ""
">\">różnych nowościach dla deweloperów</a> została wydana i obejmuje "
"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 in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
-msgstr ""
-"Aby co tydzień otrzymywać pocztą elektroniczną ten biuletyn <a href="
-"\"m4_HOME/MailingLists/subscribe#debian-news\">zapisz się na listę debian-"
-"news</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "str.<get-var page />"
-#: ../../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 "Dostępne są <a href=\"../../\">archiwalne</a> wiadomości."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Tytuł:"
-#. 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\" />Wiadomości Projektu Debian redaguje <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Autor:"
-#. 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\" />Wiadomości Projektu Debian redagują <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Język:"
-#. 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\" />Ten odcinek Wiadomości Projektu Debian "
-"przygotował(a) <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Data:"
-#. 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\" />Ten odcinek Wiadomości Projektu Debian "
-"przygotowali(ły) <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Wydarzenie:"
-#. 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\" />Tłumaczenie: %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Prezentacja:"
-#. 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\" />Tłumaczenie: %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "źródło"
-#. 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\" />Tłumaczenie: %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Tłumaczenie: %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Lista prelegentów"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Powrót do <a href=\"./\">strony prelegentów Debian'a</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Streszczenie"
-#: ../../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 ""
-"Aby co tydzień otrzymywać pocztą elektroniczną ten biuletyn <a href="
-"\"m4_HOME/MailingLists/subscribe#debian-news\">zapisz się na listę debian-"
-"news</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Wiadomości Debiana"
-#. 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 ""
-"Cotygodniowe wiadomości Debiana przygotowuje <a href=\"mailto:dwn@debian.org"
-"\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Najnowsze wiadomości Debiana"
-#. 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 ""
-"Cotygodniowe wiadomości Debiana przygotowują <a href=\"mailto:dwn@debian.org"
-"\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Biuletyn dla społeczności Debiana"
-#. 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\" />Ten odcinek Cotygodniowych wiadomości Debiana "
-"przygotował(a) <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Name:"
+#~ msgstr "Imię i nazwisko:"
-#. 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\" />Ten odcinek Cotygodniowych wiadomości Debiana "
-"przygotowali(ły) <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "Poprzednie wykłady:"
+
+#~ msgid "Languages:"
+#~ msgstr "Języki:"
+
+#~ msgid "Location:"
+#~ msgstr "Miejsce:"
+
+#~ msgid "Topics:"
+#~ msgstr "Tematy:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "Lista prelegentów"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Powrót do <a href=\"./\">strony prelegentów Debian'a</a>."
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/polish/po/organization.pl.po b/polish/po/organization.pl.po
index 61e6a041ce9..6bb7b3a647b 100644
--- a/polish/po/organization.pl.po
+++ b/polish/po/organization.pl.po
@@ -47,281 +47,327 @@ msgid "manager"
msgstr "zarządzający"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "ZWS"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Zarządzający Wydaniem Stabilnym"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "ZWS"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "czarodziej"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "przewodniczący"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "asystent"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "sekretarz"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Oficerowie"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Dystrybucja"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Rozgłos"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Wsparcie i Infrastruktura"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr "Czyste Mieszanki Debiana (Pure Blends)"
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Prowadzący"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Komitet Techniczny"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Sekretarz"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Projekty Rozwoju"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Archiwa FTP"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "Główny serwer FTP"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Asystenci FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Kreator FTP"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backporty"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Zespół Backportów"
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Pojedyncze Pakiety"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Zarządzanie Wydaniem"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Zespół Wydania"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Kontrola Jakości"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Zespół Systemu Instalacji"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Informacje o Wydaniu"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Obrazy płyt"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produkcja"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testowanie"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infrastruktura automatycznego budowania"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Zespół wanna-build"
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Administracja demona Buildd"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentacja"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Lista pakietów potencjalnych i wymagających dopracowania"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Adaptacje"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Konfiguracje Specjalne"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Laptopy"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Firewalle"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Systemy wbudowane"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Kontakt z prasą"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Strony internetowe"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Projekt Kobiecy Debiana"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr "Przeci molestowaniu"
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Wydarzenia"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Komitet Techniczny"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Program partnerski"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Koordynacja darowizn sprzętu"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Wsparcie użytkowników"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "System śledzenia błędów"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administracja i archiwa list dyskusyjnych"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr "Dział Nowych Członków"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Menedżerowie kont Debiana"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Obsługa kluczy (PGP i GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Zespół ds. bezpieczeństwa"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Strony konsultatnów"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "Strona sprzedawców płyt CD"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Polityka"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Administracja systemu"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -330,7 +376,7 @@ msgstr ""
"do projektu Debian, w tym problemy z hasłami lub prośby o zainstalowanie "
"pakietu."
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:469
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 "
@@ -340,68 +386,65 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">Maszyny Debiana</a>, powinna ona "
"zawierać informacje o administratorach poszczególnych maszyn."
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "Administracja Katalogiem Deweloperów LDAP"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Serwery lustrzane"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "Obsługa DNS"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "System śledzenia pakietów"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
#, 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:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Administracja systemu Alioth"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Debian dla dzieci od lat 1 do 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Czyste Mieszanki Debiana (Pure Blends)"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Debian dla medycyny i badań"
+#~ msgid "Individual Packages"
+#~ msgstr "Pojedyncze Pakiety"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Debian dla edukacji"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian dla dzieci od lat 1 do 99"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Debian w kancelariach prawnych"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian dla medycyny i badań"
+
+#~ msgid "Debian for education"
+#~ msgstr "Debian dla edukacji"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian w kancelariach prawnych"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Debian dla niepełnosprawnych"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian dla niepełnosprawnych"
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr "Debian dla nauk ścisłych i powiązanych badań"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian dla nauk ścisłych i powiązanych badań"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian dla edukacji"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian dla edukacji"
#~ msgid "Live System Team"
#~ msgstr "Zespół Systemu Live"
diff --git a/polish/po/others.pl.po b/polish/po/others.pl.po
index f96a129523e..1c36e299776 100644
--- a/polish/po/others.pl.po
+++ b/polish/po/others.pl.po
@@ -62,42 +62,6 @@ msgstr "<void id=\"d-i\" />Nieznane"
msgid "Unavailable"
msgstr "Niedostępne"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Kącik nowych członków"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Krok 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Krok 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Krok 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Krok 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Krok 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Krok 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Krok 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Lista spraw"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -162,133 +126,94 @@ msgstr "[Debian powered]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (miniprzycisk)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "jak wyżej"
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Produkty"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "Koszulki"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "czapeczki"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "naklejki"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "kubki"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "inne części ubioru"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "koszulki polo"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "frisbee"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "podkładki pod mysz"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "naszywki"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "kosze do koszykówki"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "kolczyki"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "torby"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "parasole"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "poszewki na poduszki"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "breloki"
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "Szwajcarski scyzoryk"
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr "Pamięci USB"
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Jak długo używasz Debiana?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Czy jesteś Deweloperem Debiana"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "W jaką część Debiana jesteś zaangażowana(y)?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Jaką pracą dla Debiana jesteś zainteresowana(y)?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-"Czy masz jakieś rady dla kobiet zainteresowanych większym zaangażowaniem się "
-"w projekty Debiana?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-"Czy jesteś zaangażowana w innych technologicznych grupach dla kobiet? W "
-"jakich?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Trochę więcej informacji o Tobie ..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -333,6 +258,81 @@ msgstr "Wersja"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Kącik nowych członków"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Krok 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Krok 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Krok 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Krok 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Krok 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Krok 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Krok 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Lista spraw"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "jak wyżej"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Jak długo używasz Debiana?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Czy jesteś Deweloperem Debiana"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "W jaką część Debiana jesteś zaangażowana(y)?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Jaką pracą dla Debiana jesteś zainteresowana(y)?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+"Czy masz jakieś rady dla kobiet zainteresowanych większym zaangażowaniem się "
+"w projekty Debiana?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+"Czy jesteś zaangażowana w innych technologicznych grupach dla kobiet? W "
+"jakich?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Trochę więcej informacji o Tobie ..."
+
#~ msgid "Where:"
#~ msgstr "Gdzie:"
diff --git a/polish/po/partners.pl.po b/polish/po/partners.pl.po
index 021ae624d61..644cd23a422 100644
--- a/polish/po/partners.pl.po
+++ b/polish/po/partners.pl.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/polish/po/ports.pl.po b/polish/po/ports.pl.po
index 037896e6fdb..eb7e4723dc6 100644
--- a/polish/po/ports.pl.po
+++ b/polish/po/ports.pl.po
@@ -11,22 +11,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian dla Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian dla PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Płyty CD"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian dla IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Kontakt"
@@ -91,6 +75,22 @@ msgstr "Dostawa"
msgid "Systems"
msgstr "Systemy"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian dla Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian dla PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Płyty CD"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian dla IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD dla i386"
diff --git a/polish/po/security.pl.po b/polish/po/security.pl.po
index 40f345ed2a5..cc5d302a966 100644
--- a/polish/po/security.pl.po
+++ b/polish/po/security.pl.po
@@ -9,40 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Bezpieczeństwo Debiana"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Porady dotyczące bezpieczeństwa Debiana"
-
-#: ../../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 "ogłoszenia <a href=\\\"undated/\\\">niedatowane</a>, dla potomności"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "W słowniku CVE Mitre-a"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Baza danych Securityfocus Bugtraq"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Porady CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Komentarz US-CERT do błędu"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Źródło:"
@@ -126,3 +92,37 @@ msgid "No other external database security references currently available."
msgstr ""
"Brak dostępnych odnośników do zewnętrznych baz danych na temat "
"bezpieczeństwa."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Q"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Bezpieczeństwo Debiana"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Porady dotyczące bezpieczeństwa Debiana"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "W słowniku CVE Mitre-a"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Baza danych Securityfocus Bugtraq"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Porady CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Komentarz US-CERT do błędu"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr "ogłoszenia <a href=\\\"undated/\\\">niedatowane</a>, dla potomności"
diff --git a/polish/po/stats.pl.po b/polish/po/stats.pl.po
index 862ae8ddc92..6fb47966f1e 100644
--- a/polish/po/stats.pl.po
+++ b/polish/po/stats.pl.po
@@ -4,22 +4,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Statystyki tłumaczeń strony WWW Debiana"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Jest %d stron do przetłumaczenia."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Jest %d bajtów do przetłumaczenia."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Jest %d napisów do przetłumaczenia."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Nieprawidłowa wersja tłumaczenia"
@@ -37,13 +21,13 @@ msgid "The original no longer exists"
msgstr "Oryginał już nie istnieje"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "liczba odwiedzin nie dostępna"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "odwiedzin(y)"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "liczba odwiedzin nie dostępna"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Kliknij by pobrać statystyki zmian"
@@ -56,15 +40,6 @@ msgstr ""
msgid "Translation summary for"
msgstr "Podsumowanie tłumaczeń dla"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Nie przetłumaczone"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Zdezaktualizowane"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Przetłumaczone"
@@ -74,6 +49,15 @@ msgstr "Przetłumaczone"
msgid "Up to date"
msgstr "Aktualne"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Zdezaktualizowane"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Nie przetłumaczone"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -224,6 +208,22 @@ msgstr "Przetłumaczone strony (według rozmiaru)"
msgid "Translation Statistics by Page Size"
msgstr "Statystyki tłumaczeń według wielkości strony"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Statystyki tłumaczeń strony WWW Debiana"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Jest %d stron do przetłumaczenia."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Jest %d bajtów do przetłumaczenia."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Jest %d napisów do przetłumaczenia."
+
#~ msgid "Created with"
#~ msgstr "Utworzone przy pomocy"
diff --git a/polish/po/templates.pl.po b/polish/po/templates.pl.po
index 7355aa284f9..857a64c3a3b 100644
--- a/polish/po/templates.pl.po
+++ b/polish/po/templates.pl.po
@@ -14,14 +14,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Gtranslator 2.91.6\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Witryna projektu"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Przeszukaj witrynę Debiana."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -83,7 +75,6 @@ msgstr "Skontaktuj się z nami"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Informacje o wydaniach"
@@ -161,6 +152,11 @@ msgstr "Jak zdobyć Debiana"
msgid "The Debian Blog"
msgstr "Blog Debiana"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Ostatnia modyfikacja"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -207,14 +203,8 @@ msgstr "w wersji 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
-#| "using_cvs\">available</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -230,27 +220,27 @@ msgstr ""
"Debiana. Dostępne są <a href=\"m4_HOME/devel/website/using_cvs\">źródła "
"strony WWW</a>."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Ostatnia modyfikacja"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Copyright"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> i inni;"
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
msgstr "Zobacz <a href=\"m4_HOME/license\" rel=\"copyright\">warunki umowy</a>"
-#: ../../english/template/debian/footer.wml:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -267,6 +257,14 @@ msgstr "Ta strona jest również dostępna w następujących językach:"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Jak ustawić <a href=m4_HOME/intro/cn>domyślny język dokumentu</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Różne języki w Debianie"
@@ -313,7 +311,6 @@ msgstr "Książki o Debianie"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Debian"
msgid "Debian Wiki"
msgstr "Debian"
@@ -423,7 +420,6 @@ msgstr "Sprzedawcy płyt"
#: ../../english/template/debian/links.tags.wml:125
#, fuzzy
-#| msgid "CD ISO images"
msgid "CD/USB ISO images"
msgstr "Obrazy płyt"
@@ -499,6 +495,15 @@ msgstr "(nowa wersja)"
msgid "Report"
msgstr "Data Zgłoszenia"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -534,9 +539,17 @@ msgstr ""
msgid "URL"
msgstr "Adres internetowy"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Powrót do <a href=\"../\">strony użytkowników Debiana</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Witryna projektu"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Przeszukaj witrynę Debiana."
+
#~ msgid "Visit the site sponsor"
#~ msgstr "Odwiedź sponsora Strony"
diff --git a/polish/po/vendors.pl.po b/polish/po/vendors.pl.po
index 09d76629f13..6e813f42926 100644
--- a/polish/po/vendors.pl.po
+++ b/polish/po/vendors.pl.po
@@ -22,7 +22,6 @@ msgstr "Umożliwia przekazywanie darów"
#: ../../english/CD/vendors/vendors.CD.def:16
#, fuzzy
-#| msgid "CD/DVD"
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD"
diff --git a/polish/po/vote.pl.po b/polish/po/vote.pl.po
index cbf6c821333..a68af7e117d 100644
--- a/polish/po/vote.pl.po
+++ b/polish/po/vote.pl.po
@@ -31,243 +31,275 @@ msgid "Nominations"
msgstr "Nominacje"
#: ../../english/template/debian/votebar.wml:25
+#, fuzzy
+msgid "Withdrawals"
+msgstr "Wycofane"
+
+#: ../../english/template/debian/votebar.wml:28
msgid "Debate"
msgstr "Debata"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr "Platformy"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposer"
msgstr "Wnioskodawca"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr "Propozycja wnioskodawcy A"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr "Propozycja wnioskodawcy B"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr "Propozycja wnioskodawcy C"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr "Propozycja wnioskodawcy D"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr "Propozycja wnioskodawcy E"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr "Propozycja wnioskodawcy F"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Propozycja wnioskodawcy A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Propozycja wnioskodawcy A"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Popierający"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Popierający propozycję A"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Popierający propozycję B"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Popierający propozycję C"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Popierający propozycję D"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Popierający propozycję E"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Popierający propozycję F"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Popierający propozycję A"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Popierający propozycję A"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Przeciwni"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Tekst"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Propozycja A"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Propozycja B"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Propozycja C"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Propozycja D"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Propozycja E"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Propozycja F"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Propozycja A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Propozycja A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Wybory"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Proponujący poprawkę"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Popierający poprawkę"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Tekst poprawki"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Proponujący poprawkę A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Popierający poprawkę A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Tekst poprawki A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Proponujący poprawkę B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Popierający poprawkę B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Tekst poprawki B"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
#, fuzzy
-#| msgid "Amendment Proposer A"
msgid "Amendment Proposer C"
msgstr "Proponujący poprawkę A"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
#, fuzzy
-#| msgid "Amendment Seconds A"
msgid "Amendment Seconds C"
msgstr "Popierający poprawkę A"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
#, fuzzy
-#| msgid "Amendment Text A"
msgid "Amendment Text C"
msgstr "Tekst poprawki A"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Poprawki"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Postępowanie"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Konieczna większość"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Dane i statystyki"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Kworum"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Dyskusja"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Głosowanie"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Wynik"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Czeka&nbsp;na&nbsp;Sponsora"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Dyskusja&nbsp;trwa"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Głosowanie&nbsp;Otwarte"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Zadecydowano"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Wycofane"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Inne"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Główna&nbsp;Strona&nbsp;Głosowań"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Jak"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Zgłosić&nbsp;Propozycję"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Poprawić&nbsp;Propozycję"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Poprzeć&nbsp;Propozycję"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Przeczytać&nbsp;Rezultat"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Głosować"
diff --git a/portuguese/po/blends.pt.po b/portuguese/po/blends.pt.po
index 522c7c394d5..674d099daba 100644
--- a/portuguese/po/blends.pt.po
+++ b/portuguese/po/blends.pt.po
@@ -50,9 +50,6 @@ msgstr ""
#: ../../english/blends/released.data:31
#, fuzzy
-#| msgid ""
-#| "The goal of Debian Games is to provide games in Debian from arcade and "
-#| "aventure to simulation and strategy."
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
diff --git a/portuguese/po/cdimage.pt.po b/portuguese/po/cdimage.pt.po
index c49909c3cf5..64599b4c415 100644
--- a/portuguese/po/cdimage.pt.po
+++ b/portuguese/po/cdimage.pt.po
@@ -19,20 +19,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "Imagens ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Imagens Jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -129,3 +115,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Lista de discussão pública</a> em "
"inglês para CDs/DVDs:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "Imagens ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Imagens Jigdo"
diff --git a/portuguese/po/consultants.pt.po b/portuguese/po/consultants.pt.po
index ca3c03775f4..ff467bfd994 100644
--- a/portuguese/po/consultants.pt.po
+++ b/portuguese/po/consultants.pt.po
@@ -19,6 +19,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Lista de Consultores"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Voltar para a <a href=\"./\">página de consultores do Debian</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Nome:"
@@ -73,11 +81,3 @@ msgid ""
"worldwide."
msgstr ""
"<total_consultant> consultores Debian listados em <total_country> países. "
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Lista de Consultores"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Voltar para a <a href=\"./\">página de consultores do Debian</a>."
diff --git a/portuguese/po/countries.pt.po b/portuguese/po/countries.pt.po
index 504cae5520a..3c61a6f6347 100644
--- a/portuguese/po/countries.pt.po
+++ b/portuguese/po/countries.pt.po
@@ -227,210 +227,215 @@ msgid "Kenya"
msgstr "Quênia"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Cazaquistão"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Coréia"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuwait"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Cazaquistão"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Lituânia"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxemburgo"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Letônia"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Marrocos"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldávia"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Montenegro"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagáscar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "República da Macedônia"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongólia"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "México"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malásia"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Nova Caledônia"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nicarágua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Holanda"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Noruega"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Nova Zelândia"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panamá"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Polinésia Francesa"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipinas"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Paquistão"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polônia"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugal"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "Reunião"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Romênia"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Sérvia"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rússia"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Arábia Saudita"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Suécia"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapura"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Eslovênia"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Eslováquia"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Tailândia"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tajiquistão"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunísia"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turquia"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taiwan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ucrânia"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Estados Unidos"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguai"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Uzbequistão"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnã"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "África do Sul"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/portuguese/po/distrib.pt.po b/portuguese/po/distrib.pt.po
index 9a8bf07b7dd..d8a82ebe55b 100644
--- a/portuguese/po/distrib.pt.po
+++ b/portuguese/po/distrib.pt.po
@@ -17,97 +17,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Palavra-Chave"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Mostrar"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Pesquisar em"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "caminhos terminando com a palavra chave"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Somente o nome dos pacotes"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "pacotes que contêm arquivos com este nome"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Descrições"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "pacotes que contêm arquivos cujos nomes contêm a palavra chave"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Nomes dos pacotes fonte"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Exibir somente combinações exatas"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribuição"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "instável"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "estável"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Arquitetura"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "qualquer (any)"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Pesquisar"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Reset"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Pesquisar em"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Somente o nome dos pacotes"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Descrições"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Nomes dos pacotes fonte"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Exibir somente combinações exatas"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Seção"
@@ -124,6 +94,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "não-livre (non-free)"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Pesquisar"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Reset"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Mostrar"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "caminhos terminando com a palavra chave"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "pacotes que contêm arquivos com este nome"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "pacotes que contêm arquivos cujos nomes contêm a palavra chave"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Arquitetura"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -198,7 +198,6 @@ msgstr "Processadores POWER"
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "64-bit MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "MIPS 64 bits (little endian)"
diff --git a/portuguese/po/doc.pt.po b/portuguese/po/doc.pt.po
index 1dd00588154..69a40392d8f 100644
--- a/portuguese/po/doc.pt.po
+++ b/portuguese/po/doc.pt.po
@@ -18,27 +18,129 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:31
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Pacote Debian"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "e-mail:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Disponível em:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "CD Incluso:"
+
+#: ../../english/doc/books.def:54
+msgid "Publisher:"
+msgstr "Editora:"
+
+#: ../../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 "Mantenedor:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Disponibilidade:"
+
+#: ../../english/doc/manuals.defs:97
+msgid "Latest version:"
+msgstr "Última versão:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(versão <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "texto puro"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"O código <get-var srctype /> fonte mais recente está disponível através do "
+"repositório <a href=\"https://packages.debian.org/git\">Git</a>."
+
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Interface web:"
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "Interface VCS:"
+
+#: ../../english/doc/manuals.defs:177
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+"O código <get-var srctype /> fonte mais recente está disponível através do "
+"repositório <a href=\"https://packages.debian.org/cvs\">Cvs</a>."
+
+#: ../../english/doc/manuals.defs:185
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a> repository."
+msgstr ""
+"O código <get-var srctype /> fonte mais recente está disponível através do "
+"repositório <a href=\"https://packages.debian.org/subversion\">Subversion</"
+"a>."
+
+#: ../../english/doc/manuals.defs:203
+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 ""
+"Cópias de fontes de trabalho CVS: defina o <code>CVSROOT</code>\n"
+" como <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
+" e faça um <q>check out</q> do módulo <kbd>boot-floppies/documentation</"
+"kbd>."
+
+#: ../../english/doc/manuals.defs:208
+msgid "CVS via web"
+msgstr "CVS via web"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Pacote Debian"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Pacote Debian (arquivado)"
+
+#: ../../english/doc/books.data:32
#, fuzzy
-#| 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."
msgid ""
"\n"
-" Debian 8 is the must-have handbook for learning Linux. Start on the\n"
+" Debian 9 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"
@@ -65,22 +167,9 @@ msgstr ""
" Gerencie sua rede doméstica com o network-manager, etc. 10% do lucro \n"
" deste livro será doado ao projeto Debian."
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
#, fuzzy
-#| 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."
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -106,7 +195,7 @@ msgstr ""
" para serviços seguros, instalações automáticas, ou virtualização com\n"
" Xen, KVM ou LXC."
-#: ../../english/doc/books.data:80
+#: ../../english/doc/books.data:83
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"
@@ -121,7 +210,7 @@ msgstr ""
" sistema por conta própria (seja em casa, no escritório, no clube ou na\n"
" escola)."
-#: ../../english/doc/books.data:101
+#: ../../english/doc/books.data:105
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,17 +230,8 @@ msgstr ""
" Debian e o administrador que quer construir uma rede confiável com o \n"
" Debian."
-#: ../../english/doc/books.data:120
+#: ../../english/doc/books.data:125
#, fuzzy
-#| 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"
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -171,14 +251,8 @@ msgstr ""
"prevista \n"
" a versão impressa.\n"
-#: ../../english/doc/books.data:140
+#: ../../english/doc/books.data:146
#, fuzzy
-#| 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."
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 "
@@ -191,7 +265,7 @@ msgstr ""
"manual for all users who want to learn more about Debian and its range of "
"services."
-#: ../../english/doc/books.data:191
+#: ../../english/doc/books.data:200
msgid ""
"Written by two penetration researcher - Annihilator, Firstblood.\n"
" This book teaches you how to build and configure Debian 8.x server system\n"
@@ -207,116 +281,6 @@ msgid ""
" intrusion detection system."
msgstr ""
-#: ../../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 "Disponível em:"
-
-#: ../../english/doc/books.def:48
-msgid "CD Included:"
-msgstr "CD Incluso:"
-
-#: ../../english/doc/books.def:51
-msgid "Publisher:"
-msgstr "Editora:"
-
-#: ../../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 "Mantenedor:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Estado:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Disponibilidade:"
-
-#: ../../english/doc/manuals.defs:92
-msgid "Latest version:"
-msgstr "Última versão:"
-
-#: ../../english/doc/manuals.defs:108
-msgid "(version <get-var version />)"
-msgstr "(versão <get-var version />)"
-
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "texto puro"
-
-#: ../../english/doc/manuals.defs:154 ../../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 ""
-"O código <get-var srctype /> fonte mais recente está disponível através do "
-"repositório <a href=\"https://packages.debian.org/git\">Git</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 ""
-"O código <get-var srctype /> fonte mais recente está disponível através do "
-"repositório <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 ""
-"O código <get-var srctype /> fonte mais recente está disponível através do "
-"repositório <a href=\"https://packages.debian.org/subversion\">Subversion</"
-"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 ""
-"Cópias de fontes de trabalho CVS: defina o <code>CVSROOT</code>\n"
-" como <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
-" e faça um <q>check out</q> do módulo <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 "Pacote Debian"
-
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
-msgid "Debian package (archived)"
-msgstr "Pacote Debian (arquivado)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/portuguese/po/newsevents.pt.po b/portuguese/po/newsevents.pt.po
index b0449a5f372..c63d6d49049 100644
--- a/portuguese/po/newsevents.pt.po
+++ b/portuguese/po/newsevents.pt.po
@@ -20,90 +20,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Notícias do Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Últimas Notícias do 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 "O boletim informativo para a comunidade 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 "Palestras Anteriores:"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Idiomas:"
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Localização:"
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Tópicos:"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Título:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Idioma:"
-
-#: ../../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 "Slides:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "source"
-
-#: ../../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 "Resumo"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Próximas Atrações"
@@ -162,6 +78,138 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (link quebrado)"
+#: ../../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 ""
+"Para receber este boletim 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>."
+
+#: ../../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=\"../../\">Edições anteriores</a> deste boletim estão disponíveis."
+
+#. 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\" />As Notícias do Projeto Debian são editadas por <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\" />As Notícias do Projeto Debian são editadas por <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\" />Esta edição das Notícias do Projeto Debian foi "
+"editada por <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\" />Esta edição das Notícias do Projeto Debian foi editada "
+"por <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\" />Ela foi traduzida por <a href=\"mailto:debian-l10n-"
+"portuguese@lists.debian.org\">%s</a>."
+
+#. 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\" />Ela foi traduzida por <a href=\"mailto:debian-l10n-"
+"portuguese@lists.debian.org\">%s</a>."
+
+#. 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\" />Ela foi traduzida por %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\" />Ela foi traduzida por %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 ""
+"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>."
+
+#. 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\" />As Notícias Semanais Debian são editadas por <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\" />As Notícias Semanais Debian são editadas por <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\" />Esta edição das Notícias Semanais Debian foi editada "
+"por <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\" />Esta edição das Notícias Semanais Debian foi editada "
+"por <a href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -415,145 +463,89 @@ msgstr ""
">\">notícias diversas para desenvolvedores</a> foi publicada e aborda os "
"seguintes tópicos:"
-#: ../../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 ""
-"Para receber este boletim 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>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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=\"../../\">Edições anteriores</a> deste boletim estão disponíveis."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Título:"
-#. 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\" />As Notícias do Projeto Debian são editadas por <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Autor:"
-#. 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\" />As Notícias do Projeto Debian são editadas por <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Idioma:"
-#. 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\" />Esta edição das Notícias do Projeto Debian foi "
-"editada por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Data:"
-#. 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\" />Esta edição das Notícias do Projeto Debian foi editada "
-"por <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Evento:"
-#. 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\" />Ela foi traduzida por <a href=\"mailto:debian-l10n-"
-"portuguese@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Slides:"
-#. 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\" />Ela foi traduzida por <a href=\"mailto:debian-l10n-"
-"portuguese@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "source"
-#. 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\" />Ela foi traduzida por %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Ela foi traduzida por %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Lista de Palestrantes"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Voltar para a <a href=\"./\">página de palestrantes do Debian</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Resumo"
-#: ../../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 ""
-"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>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Notícias do Debian"
-#. 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\" />As Notícias Semanais Debian são editadas por <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Últimas Notícias do 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\" />As Notícias Semanais Debian são editadas por <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "O boletim informativo para a comunidade 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\" />Esta edição das Notícias Semanais Debian foi editada "
-"por <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Name:"
+#~ msgstr "Nome:"
-#. 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\" />Esta edição das Notícias Semanais Debian foi editada "
-"por <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "Palestras Anteriores:"
+
+#~ msgid "Languages:"
+#~ msgstr "Idiomas:"
+
+#~ msgid "Location:"
+#~ msgstr "Localização:"
+
+#~ msgid "Topics:"
+#~ msgstr "Tópicos:"
+
+#~ 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 ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/portuguese/po/organization.pt.po b/portuguese/po/organization.pt.po
index 89b59fce8c6..fa830cd1413 100644
--- a/portuguese/po/organization.pt.po
+++ b/portuguese/po/organization.pt.po
@@ -51,248 +51,296 @@ msgid "manager"
msgstr "gerente"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Gerente de Lançamento da Estável"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "mago"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "presidente"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "assistente"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "secretário"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Oficiais"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribuição"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Equipe de publicidade"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Suporte e Infra-estrutura"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr "Debian Pure Blends"
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Líder"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Comitê Técnico"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Secretário"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Projetos de Desenvolvimento"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Repositórios FTP"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "FTP Masters"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Assistentes FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Assistentes FTP"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Equipe de Backports"
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Pacotes Individuais"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Gerência de Lançamento"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Equipe de Lançamento"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Controle de Qualidade"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Equipe do Sistema de Instalação"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Notas de Lançamento"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Imagens de CDs"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produção"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testing"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infra-estrutura de auto-construção"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Equipe wanna-build"
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Administração de Buildd"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Documentação"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Lista de Pacotes Prospectivos e que necessitam de trabalho"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Portes"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Configurações Especiais"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Laptops"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Firewalls"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Sistemas embarcados/embutidos"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Contato de Imprensa"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Páginas Web"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Planeta Debian"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr "Programa de extensão"
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Projeto Debian Women"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr "Antiassédio"
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Eventos"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
msgid "DebConf Committee"
msgstr "Comitê da DebConf"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Programa de Parcerias"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Coordenação de Doações de Hardware"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Suporte ao usuário"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Sistema de Acompanhamento de Bugs"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
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:387
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr "Recepção de Novos Mantenedores"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Gerentes de Contas Debian"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -300,31 +348,31 @@ msgstr ""
"Para enviar uma mensagem privada para todos os DAMs, use a chave GPG "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Mantenedores do Chaveiro (Keyring) (PGP e GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Equipe de Segurança"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Página de Consultores"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "Página de Vendedores de CD"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Política (Policy)"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Administração do Sistema"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -334,7 +382,7 @@ msgstr ""
"precisar que um determinado pacote seja instalado numa das máquinas do "
"Projeto."
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:469
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 "
@@ -344,67 +392,65 @@ 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:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "Administrador do Diretório LDAP de Desenvolvedores"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Espelhos"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "Mantenedor do DNS"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Sistema de Acompanhamento de Pacotes"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
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:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Administração do Alioth"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Debian para crianças de 1 a 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Debian para prática e pesquisa médica"
+#~ msgid "Individual Packages"
+#~ msgstr "Pacotes Individuais"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Debian para educação"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian para crianças de 1 a 99"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Debian em escritórios legais"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian para prática e pesquisa médica"
+
+#~ msgid "Debian for education"
+#~ msgstr "Debian para educação"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian em escritórios legais"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Debian para pessoas com deficiências"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian para pessoas com deficiências"
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr "Debian para ciência e pesquisa relacionada"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian para ciência e pesquisa relacionada"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian para educação"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian para educação"
#~ msgid "Live System Team"
#~ msgstr "Equipe do Sistema \"Live\""
diff --git a/portuguese/po/others.pt.po b/portuguese/po/others.pt.po
index 1a591559e8d..08c17eb07be 100644
--- a/portuguese/po/others.pt.po
+++ b/portuguese/po/others.pt.po
@@ -67,42 +67,6 @@ msgstr "Desconhecido"
msgid "Unavailable"
msgstr "Indisponível"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Canto dos Novos Membros"
-
-#: ../../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 "Lista de itens para os aplicantes"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -166,132 +130,94 @@ msgstr "[Debian powered]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (mini botão)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "mesmo que o acima"
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Produtos"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "Camisetas"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "bonés"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "adesivos"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "canecas"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "outras roupas"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "camiseta pólo"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "discos"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "mouse pads"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "crachás"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "cestas de basquete"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "brincos"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "malas"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "guarda-chuvas"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "fronhas"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "chaveiros"
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "canivetes suíços"
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr "Pendrives USB"
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Há quanto tempo você usa Debian?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Você é um Desenvolvedor Debian?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "Em quais áreas do Debian você está envolvido?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Por qual motivo você se interessou em trabalhar com Debian?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-"Você tem algumas dicas para mulheres interessadas em se envolver mais com o "
-"Debian?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-"Você está envolvida com outras mulheres em grupo de tecnologia? Qual(is)?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Um pouco mais sobre você..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -336,6 +262,80 @@ msgstr "Versão"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Canto dos Novos Membros"
+
+#: ../../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 "Lista de itens para os aplicantes"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "mesmo que o acima"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Há quanto tempo você usa Debian?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Você é um Desenvolvedor Debian?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "Em quais áreas do Debian você está envolvido?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Por qual motivo você se interessou em trabalhar com Debian?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+"Você tem algumas dicas para mulheres interessadas em se envolver mais com o "
+"Debian?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+"Você está envolvida com outras mulheres em grupo de tecnologia? Qual(is)?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Um pouco mais sobre você..."
+
#~ msgid "Name:"
#~ msgstr "Nome:"
diff --git a/portuguese/po/partners.pt.po b/portuguese/po/partners.pt.po
index 021ae624d61..644cd23a422 100644
--- a/portuguese/po/partners.pt.po
+++ b/portuguese/po/partners.pt.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/portuguese/po/ports.pt.po b/portuguese/po/ports.pt.po
index 726f9f9ce03..f58c387baa9 100644
--- a/portuguese/po/ports.pt.po
+++ b/portuguese/po/ports.pt.po
@@ -18,22 +18,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian para Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian para PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "CDs do Hurd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian para IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Contato"
@@ -98,6 +82,22 @@ msgstr "Fornecimento"
msgid "Systems"
msgstr "Sistemas"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian para Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian para PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "CDs do Hurd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian para IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD para i386"
diff --git a/portuguese/po/security.pt.po b/portuguese/po/security.pt.po
index 620df5ccdc4..55d68c40572 100644
--- a/portuguese/po/security.pt.po
+++ b/portuguese/po/security.pt.po
@@ -17,42 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Segurança Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Alertas de Segurança Debian"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "P"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"alertas de segurança <a href=\\\"undated/\\\">sem data</a>, inclusos para a "
-"posteridade"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Dicionário Mitre CVE"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Base de dados Bugtraq Securityfocus"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Alertas CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Notas de Vulnerabilidades US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Fonte:"
@@ -136,3 +100,39 @@ msgid "No other external database security references currently available."
msgstr ""
"Nenhuma outra base de dados externa de referências de segurança está "
"disponível atualmente."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "P"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Segurança Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Alertas de Segurança Debian"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Dicionário Mitre CVE"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Base de dados Bugtraq Securityfocus"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Alertas CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Notas de Vulnerabilidades US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"alertas de segurança <a href=\\\"undated/\\\">sem data</a>, inclusos para a "
+"posteridade"
diff --git a/portuguese/po/stats.pt.po b/portuguese/po/stats.pt.po
index c3f656fad48..4be8f5de244 100644
--- a/portuguese/po/stats.pt.po
+++ b/portuguese/po/stats.pt.po
@@ -15,22 +15,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Estatísticas de tradução do site web do Debian"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Existem %d páginas para traduzir."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Existem %d bytes para traduzir."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Existem %d strings para traduzir."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Versão errada de tradução"
@@ -48,13 +32,13 @@ msgid "The original no longer exists"
msgstr "O original não existe mais"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "contagem de acesso N/A"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "acessos"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "contagem de acesso N/A"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Clique para obter dados de diffstat"
@@ -67,15 +51,6 @@ msgstr "Criado com <transstatslink>"
msgid "Translation summary for"
msgstr "Resumo de tradução para"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Não traduzidos"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Desatualizados"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Traduzidos"
@@ -85,6 +60,15 @@ msgstr "Traduzidos"
msgid "Up to date"
msgstr "Atualizados"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Desatualizados"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Não traduzidos"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -235,6 +219,22 @@ msgstr "Páginas web traduzidas (por tamanho)"
msgid "Translation Statistics by Page Size"
msgstr "Estatísticas de Tradução por Tamanho de Página"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Estatísticas de tradução do site web do Debian"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Existem %d páginas para traduzir."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Existem %d bytes para traduzir."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Existem %d strings para traduzir."
+
#~ msgid "Created with"
#~ msgstr "Criado com"
diff --git a/portuguese/po/templates.pt.po b/portuguese/po/templates.pt.po
index da4ae9d5240..094996978e7 100644
--- a/portuguese/po/templates.pt.po
+++ b/portuguese/po/templates.pt.po
@@ -19,14 +19,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Site web do Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Pesquisar o site web do Debian."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -90,7 +82,6 @@ msgstr "Contate-nos"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Informações sobre Versões"
@@ -168,6 +159,11 @@ msgstr "Obtendo o Debian"
msgid "The Debian Blog"
msgstr "O Blog do Debian"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Última Modificação"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -214,14 +210,8 @@ msgstr "na versão 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
-#| "using_cvs\">available</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -237,28 +227,28 @@ msgstr ""
"Debian. O fonte do site web está <a href=\"m4_HOME/devel/website/using_cvs"
"\">disponível</a>."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Última Modificação"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr "Última compilação"
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Copyright"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> e outros;"
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
msgstr ""
"Veja os <a href=\"m4_HOME/license\" rel=\"copyright\">termos de licença</a>"
-#: ../../english/template/debian/footer.wml:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -276,6 +266,14 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
"Como configurar <a href=m4_HOME/intro/cn>o idioma padrão dos documentos</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian Internacional"
@@ -504,6 +502,15 @@ msgstr "(nova revisão)"
msgid "Report"
msgstr "Relatório"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -539,10 +546,18 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Voltar para <a href=\"../\">Quem está usando o Debian?</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Site web do Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Pesquisar o site web do Debian."
+
#, fuzzy
#~| msgid "Weekly News"
#~ msgid "Weekly&nbsp;News"
diff --git a/portuguese/po/vote.pt.po b/portuguese/po/vote.pt.po
index ed7a270009d..cfa56404722 100644
--- a/portuguese/po/vote.pt.po
+++ b/portuguese/po/vote.pt.po
@@ -36,237 +36,272 @@ msgid "Nominations"
msgstr "Candidaturas"
#: ../../english/template/debian/votebar.wml:25
+#, fuzzy
+msgid "Withdrawals"
+msgstr "Retirado"
+
+#: ../../english/template/debian/votebar.wml:28
msgid "Debate"
msgstr "Debate"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr "Plataformas"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposer"
msgstr "Proponente"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr "Proponente da Proposta A"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr "Proponente da Proposta B"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr "Proponente da Proposta C"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr "Proponente da Proposta D"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr "Proponente da Proposta E"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr "Proponente da Proposta F"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Proponente da Proposta A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Proponente da Proposta A"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Padrinhos"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Padrinhos da Proposta A"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Padrinhos da Proposta B"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Padrinhos da Proposta C"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Padrinhos da Proposta D"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Padrinhos da Proposta E"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Padrinhos da Proposta F"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Padrinhos da Proposta A"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Padrinhos da Proposta A"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Oposição"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Texto"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Proposta A"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Proposta B"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Proposta C"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Proposta D"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Proposta E"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Proposta F"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Proposta A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Proposta A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Opções"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Proponente da Emenda"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Padrinhos da Emenda"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Texto da Emenda"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Proponente da Emenda A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Padrinhos da Emenda A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Texto da Emenda A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Proponente da Emenda B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Padrinhos da Emenda B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Texto da Emenda B"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "Proponente da Emenda C"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "Padrinhos da Emenda C"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "Texto da Emenda C"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Emendas"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Encaminhamentos"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Maioria Requerida"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Dados e Estatísticas"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Quorum"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Discussão Mínima"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Cédula"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Fórum"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Resultado"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Aguardando&nbsp;Patrocinadores"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Em&nbsp;Discussão"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Votação&nbsp;Aberta"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Decidido"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Retirado"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Outro"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Página&nbsp;principal&nbsp;de&nbsp;Votação"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Como Fazer"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Enviar&nbsp;Proposta"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Corrigir&nbsp;uma&nbsp;Proposta"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Apoiar&nbsp;uma&nbsp;Proposta"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Ler&nbsp;um&nbsp;Resultado"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Votar"
diff --git a/romanian/po/blends.ro.po b/romanian/po/blends.ro.po
index 194354520b8..a3bf68130a6 100644
--- a/romanian/po/blends.ro.po
+++ b/romanian/po/blends.ro.po
@@ -47,9 +47,6 @@ msgstr ""
#: ../../english/blends/released.data:31
#, fuzzy
-#| msgid ""
-#| "The goal of Debian Games is to provide games in Debian from arcade and "
-#| "aventure to simulation and strategy."
msgid ""
"The goal of Debian Games is to provide games in Debian from arcade and "
"adventure to simulation and strategy."
diff --git a/romanian/po/cdimage.ro.po b/romanian/po/cdimage.ro.po
index f7a23cd6a77..269e4fe1595 100644
--- a/romanian/po/cdimage.ro.po
+++ b/romanian/po/cdimage.ro.po
@@ -14,20 +14,6 @@ msgstr ""
"20)) ? 1 : 2;\n"
"X-Generator: Poedit 1.8.8\n"
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../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:87
-msgid "ISO images"
-msgstr "Imagini ISO"
-
-#: ../../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;"
@@ -124,3 +110,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">listă de discuții publică</a> în limba "
"engleză pentru CD-uri/DVD-uri:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "Imagini ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Fișiere Jigdo"
diff --git a/romanian/po/consultants.ro.po b/romanian/po/consultants.ro.po
index 8edd73e171a..1a31985c39e 100644
--- a/romanian/po/consultants.ro.po
+++ b/romanian/po/consultants.ro.po
@@ -13,6 +13,14 @@ msgstr ""
"20)) ? 1 : 2;\n"
"X-Generator: Poedit 1.8.8\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+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>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Nume:"
@@ -68,11 +76,3 @@ msgid ""
msgstr ""
"<total_consultant> consultanți Debian listați în <total_country> țări din "
"întreaga lume."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-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 6d259ab79c2..eeb18101a24 100644
--- a/romanian/po/countries.ro.po
+++ b/romanian/po/countries.ro.po
@@ -222,210 +222,215 @@ msgid "Kenya"
msgstr "Kenya"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazahstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Coreea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuwait"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazahstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Lituania"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxemburg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Letonia"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Maroc"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldova"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Muntenegru"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagascar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Republica Macedonia"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongolia"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mexic"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malaezia"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Noua Caledonie"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nicaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Olanda"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norvegia"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Noua Zeelandă"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Polinezia Franceză"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipine"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polonia"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugalia"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "România"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Serbia"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusia"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Arabia Saudită"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Suedia"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapore"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovenia"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovacia"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "El Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Tailanda"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tadjikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunisia"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turcia"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taiwan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ucraina"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Statele Unite ale Americii"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Africa de Sud"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
diff --git a/romanian/po/distrib.ro.po b/romanian/po/distrib.ro.po
index 8723084bd1a..56c6735ef6d 100644
--- a/romanian/po/distrib.ro.po
+++ b/romanian/po/distrib.ro.po
@@ -11,97 +11,67 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.8\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Cuvânt cheie"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Afișare"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Caut&#259; &#238;n"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "ce se termină în cuvântul-cheie"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Numai numele pachetelor"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "pachete ce conțin fișiere numite în acest fel"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Descrieri"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "pachete ce includ fișiere ale căror nume conțin cuvântul cheie"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Nume surs&#259; de pachet"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Arată doar potriviri exacte"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribuție"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "instabilă"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testare"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stabilă"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "anterioară/stabilă"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Arhitectură"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "oricare"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Caută"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Resetare"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Caut&#259; &#238;n"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Numai numele pachetelor"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Descrieri"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Nume surs&#259; de pachet"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Arată doar potriviri exacte"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Sec&#355;iune"
@@ -118,6 +88,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Caută"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Resetare"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Afișare"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "ce se termină în cuvântul-cheie"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "pachete ce conțin fișiere numite în acest fel"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "pachete ce includ fișiere ale căror nume conțin cuvântul cheie"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Arhitectură"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alfa"
@@ -192,7 +192,6 @@ msgstr "Procesoare POWER"
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "64-bit MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "64-bit MIPS (little endian)"
diff --git a/romanian/po/doc.ro.po b/romanian/po/doc.ro.po
index bfe59358d45..43c7515c43c 100644
--- a/romanian/po/doc.ro.po
+++ b/romanian/po/doc.ro.po
@@ -15,27 +15,128 @@ msgstr ""
"20)) ? 1 : 2;\n"
"X-Generator: Poedit 1.8.8\n"
-#: ../../english/doc/books.data:31
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Pachet Debian"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "E-mail:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Disponibilă la:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "CD inclus:"
+
+#: ../../english/doc/books.def:54
+msgid "Publisher:"
+msgstr "Publicație:"
+
+#: ../../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 "Menținător:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Stare:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Disponibilitate:"
+
+#: ../../english/doc/manuals.defs:97
+msgid "Latest version:"
+msgstr "Ultima versiune:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(versiunea <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "text simplu"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"Ultima <get-var srctype /> sursă este disponibilă în <a href=\"https://"
+"packages.debian.org/git\">Git</a>."
+
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Interfață Web:"
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "Interfață VCS:"
+
+#: ../../english/doc/manuals.defs:177
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+"Ultima <get-var srctype /> sursă este disponibilă în <a href=\"https://"
+"packages.debian.org/cvs\">Cvs</a>."
+
+#: ../../english/doc/manuals.defs:185
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a> repository."
+msgstr ""
+"Ultima <get-var srctype /> sursă este disponibilă în <a href=\"https://"
+"packages.debian.org/subversion\">Subversion</a>."
+
+#: ../../english/doc/manuals.defs:203
+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 ""
+"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>."
+
+#: ../../english/doc/manuals.defs:208
+msgid "CVS via web"
+msgstr "CVS prin web"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Pachet Debian"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Pachet Debian (arhivat)"
+
+#: ../../english/doc/books.data:32
#, fuzzy
-#| 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."
msgid ""
"\n"
-" Debian 8 is the must-have handbook for learning Linux. Start on the\n"
+" Debian 9 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"
@@ -66,22 +167,9 @@ msgstr ""
"etc. 10% din profiturile obținute de pe urma acestei cărți sunt donate "
"Proiectului Debian."
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
#, fuzzy
-#| 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."
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -110,7 +198,7 @@ msgstr ""
" cum ar fi configurarea SELinux pentru a securiza serviciile, instalări\n"
" automatizate sau virtualizare cu Xen, KVM or LXC."
-#: ../../english/doc/books.data:80
+#: ../../english/doc/books.data:83
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"
@@ -126,7 +214,7 @@ msgstr ""
"(fie \n"
" de acasă, de la birou, club sau școală)."
-#: ../../english/doc/books.data:101
+#: ../../english/doc/books.data:105
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"
@@ -148,17 +236,8 @@ msgstr ""
"și\n"
" administratorul care vrea să-și construiască o rețea solidă cu Debian."
-#: ../../english/doc/books.data:120
+#: ../../english/doc/books.data:125
#, fuzzy
-#| 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"
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -176,14 +255,8 @@ msgstr ""
"traducere în limba engleză. Format: e-book (Online, HTML,PDF, ePub, Mobi), "
"având în plan de viitor o versiune printată.\n"
-#: ../../english/doc/books.data:140
+#: ../../english/doc/books.data:146
#, fuzzy
-#| 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."
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 "
@@ -196,7 +269,7 @@ msgstr ""
"practic pentru toți utilizatorii care vor să afle mai multe despre Debian și "
"gama de servicii a acestuia."
-#: ../../english/doc/books.data:191
+#: ../../english/doc/books.data:200
msgid ""
"Written by two penetration researcher - Annihilator, Firstblood.\n"
" This book teaches you how to build and configure Debian 8.x server system\n"
@@ -212,115 +285,6 @@ msgid ""
" intrusion detection system."
msgstr ""
-#: ../../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 "Disponibilă la:"
-
-#: ../../english/doc/books.def:48
-msgid "CD Included:"
-msgstr "CD inclus:"
-
-#: ../../english/doc/books.def:51
-msgid "Publisher:"
-msgstr "Publicație:"
-
-#: ../../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 "Menținător:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Stare:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Disponibilitate:"
-
-#: ../../english/doc/manuals.defs:92
-msgid "Latest version:"
-msgstr "Ultima versiune:"
-
-#: ../../english/doc/manuals.defs:108
-msgid "(version <get-var version />)"
-msgstr "(versiunea <get-var version />)"
-
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "text simplu"
-
-#: ../../english/doc/manuals.defs:154 ../../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 ""
-"Ultima <get-var srctype /> sursă este disponibilă în <a href=\"https://"
-"packages.debian.org/git\">Git</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 "Interfață 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 "Interfață 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 ""
-"Ultima <get-var srctype /> sursă este disponibilă în <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 ""
-"Ultima <get-var srctype /> sursă este disponibilă în <a href=\"https://"
-"packages.debian.org/subversion\">Subversion</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 ""
-"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>."
-
-#: ../../english/doc/manuals.defs:193
-msgid "CVS via web"
-msgstr "CVS prin web"
-
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
-msgid "Debian package"
-msgstr "Pachet Debian"
-
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
-msgid "Debian package (archived)"
-msgstr "Pachet Debian (arhivat)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/romanian/po/newsevents.ro.po b/romanian/po/newsevents.ro.po
index cb16104bc9a..df5feed5426 100644
--- a/romanian/po/newsevents.ro.po
+++ b/romanian/po/newsevents.ro.po
@@ -11,90 +11,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.8\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Noutăți Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Ultimele Știri 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 "Buletinul informativ al comunității Debian"
-
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "Nume:"
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "E-mail:"
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "Prezentări anterioare:"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Limbi:"
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Locație:"
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Subiecte:"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Titlu:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Limbă:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Dată:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Eveniment:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Slide-uri:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "sursă"
-
-#: ../../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 "Rezumat"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Evenimente viitoare"
@@ -153,6 +69,128 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (link inexistent)"
+#: ../../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 ""
+"Pentru a primi pe mail acest buetin, <a href=\"m4_HOME/MailingLists/"
+"subscribe#debian-news\">abonează-te</a> la lista de mail debian-news."
+
+#: ../../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=\"../../\">Ediții mai vechi</a> ale acestui buletin sunt disponibile."
+
+#. 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\" />Noutățile Proiectului Debian este o publicație "
+"editată de către <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\" />Noutățile Proiectului Debian este o publicație editată "
+"de către <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\" />Acest număr al Noutăților Proiectului Debian a fost "
+"editat de către <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>.b"
+
+#. 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\" />Acest număr al Noutăților Proiectului Debian a fost "
+"editat de către <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\" />Acest număr a fost tradus de %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\">Acest număr a fost tradus de %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=\"singular\" />Acest număr a fost tradus de %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\" />Acest număr a fost tradus de %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 ""
+"Pentru a primi Știrile Săptămânale <a href=\"m4_HOME/MailingLists/"
+"subscribe#debian-news\">abonează-te</a> la lista de discuții debian-news."
+
+#. 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\" />Știrile Săptămânale Debian sunt editate de către <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\" />Știrile Săptămânale Debian sunt editate de către <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\" />Acest număr al Știrilor Săptămânale Debian a fost "
+"editat de către <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\" />Acest număr al Știrilor Săptămânale Debian a fost "
+"editat de către <a href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -402,135 +440,89 @@ msgstr ""
"news />\">Știrilor Diverse </a> a fost lansat și conține următoarele "
"subiecte:"
-#: ../../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 ""
-"Pentru a primi pe mail acest buetin, <a href=\"m4_HOME/MailingLists/"
-"subscribe#debian-news\">abonează-te</a> la lista de mail debian-news."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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=\"../../\">Ediții mai vechi</a> ale acestui buletin sunt disponibile."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Titlu:"
-#. 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\" />Noutățile Proiectului Debian este o publicație "
-"editată de către <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Autor:"
-#. 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\" />Noutățile Proiectului Debian este o publicație editată "
-"de către <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Limbă:"
-#. 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\" />Acest număr al Noutăților Proiectului Debian a fost "
-"editat de către <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>.b"
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Dată:"
-#. 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\" />Acest număr al Noutăților Proiectului Debian a fost "
-"editat de către <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Eveniment:"
-#. 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\" />Acest număr a fost tradus de %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Slide-uri:"
-#. 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\">Acest număr a fost tradus de %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "sursă"
-#. 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=\"singular\" />Acest număr a fost tradus de %s"
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Acest număr a fost tradus de %s"
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Lista purtătorilor de cuvânt"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Înapoi la <a href=\"./\">pagina purtătorilor de cuvânt Debian</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Rezumat"
-#: ../../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 ""
-"Pentru a primi Știrile Săptămânale <a href=\"m4_HOME/MailingLists/"
-"subscribe#debian-news\">abonează-te</a> la lista de discuții debian-news."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Noutăți Debian"
-#. 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\" />Știrile Săptămânale Debian sunt editate de către <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Ultimele Știri 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\" />Știrile Săptămânale Debian sunt editate de către <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Buletinul informativ al comunității 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\" />Acest număr al Știrilor Săptămânale Debian a fost "
-"editat de către <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Name:"
+#~ msgstr "Nume:"
-#. 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\" />Acest număr al Știrilor Săptămânale Debian a fost "
-"editat de către <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "Prezentări anterioare:"
+
+#~ msgid "Languages:"
+#~ msgstr "Limbi:"
+
+#~ msgid "Location:"
+#~ msgstr "Locație:"
+
+#~ msgid "Topics:"
+#~ msgstr "Subiecte:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "Lista purtătorilor de cuvânt"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Înapoi la <a href=\"./\">pagina purtătorilor de cuvânt Debian</a>."
#, fuzzy
#~| msgid ""
diff --git a/romanian/po/organization.ro.po b/romanian/po/organization.ro.po
index 633b2497f95..e56c73317a1 100644
--- a/romanian/po/organization.ro.po
+++ b/romanian/po/organization.ro.po
@@ -44,279 +44,326 @@ msgid "manager"
msgstr "manager"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Administratorul Lansării Distribuției Stabile"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "asistent de configurare"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "președinte"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "asistent"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "secretar"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Ofiteri"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribuție"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Echipa de publicitate"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Suport și Infrastructură"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr "Blenduri Pure Debian"
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Conducător"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Comitet Tehnic"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Secretar"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Proiecte de dezvoltare"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Arhive FTP"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "FTP Masters"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Asistenți FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Asistenți de configurare FTP"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backport-uri"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Echipa pentru backport-uri"
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Pachete individuale"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Administrarea lansărilor"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Echipa de lansare"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Controlul calit&#259;&#355;ii"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Echipa de Instalare Sisteme"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Note de lansare"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Imagini CD"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Producere"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testare"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infrastructură auto-construibilă"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Echipa Wanna-build"
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Administrarea de build-uri"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "documentație"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr " Potențiale pachete noi sau pachete ce necesită lucru"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Porturi"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Configurații speciale"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Laptop-uri"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Firewall-uri"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Sisteme integrate"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Contact de presă"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Pagini Web"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr "Mobilizare"
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Proiectul Debian pentru Femei"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr "Anti-hărțuire"
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Evenimente"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Comitet Tehnic"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Program de parteneriat"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Coordonarea donațiilor hardware"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Suport pentru utilizatori"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Sistem de urmărire pentru bug-uri"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administrare Liste de discuții și Liste de arhive"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr "Recepție pentru membri noi"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Administratori de conturi Debian"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Menținătorii Keyring-ului (PGP și GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Echipa de Securitate"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Pentru Consultanți"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "Pentru Comercianți de CD-uri"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Regulament"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Administrarea Sistemului"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -325,7 +372,7 @@ msgstr ""
"(incluzând schimbarea parolei sau dacă ai nevoie de software), aceasta este "
"adresa pe care o poți folosi. "
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:469
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 "
@@ -335,68 +382,66 @@ msgstr ""
"<a href=\"https://db.debian.org/machines.cgi\">Debian Machines</a>, ce "
"conține informații despre administrarea fiecărei mașini în parte."
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "Administrator LDAP"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Oglinzi"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "Administrator DNS"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Sistem de urmărire a pachetelor"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Cereri pentru folosirea <a name=\"trademark\" href=\"m4_HOME/trademark"
"\">Mărcii înregistrate</a> "
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Administratori Alioth"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Debian pentru copii cu vârste între 1 și 99 de ani"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Blenduri Pure Debian"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Debian pentru practică medicală și cercetare"
+#~ msgid "Individual Packages"
+#~ msgstr "Pachete individuale"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Debian pentru educație"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian pentru copii cu vârste între 1 și 99 de ani"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Debian pentru birouri de avocatură"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian pentru practică medicală și cercetare"
+
+#~ msgid "Debian for education"
+#~ msgstr "Debian pentru educație"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian pentru birouri de avocatură"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Debian pentru persoane cu dizabilități"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian pentru persoane cu dizabilități"
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr "Debian pentru știință și cercetare"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian pentru știință și cercetare"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian pentru educație"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian pentru educație"
#~ msgid "Live System Team"
#~ msgstr "Echipa pentru sisteme live"
diff --git a/romanian/po/others.ro.po b/romanian/po/others.ro.po
index 7414386c8cb..ac0990c56b9 100644
--- a/romanian/po/others.ro.po
+++ b/romanian/po/others.ro.po
@@ -59,42 +59,6 @@ msgstr "<void id=\"d-i\" />Necunoscut"
msgid "Unavailable"
msgstr "Indisponibil"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Pentru Membrii Noi"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Pasul 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Pasul 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Pasul 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Pasul 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Pasul 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Pasul 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Pasul 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Lista de verificare a aplican&#355;ilor"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -158,131 +122,94 @@ msgstr "[Cu sprijinul Debian]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (mini buton)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "La fel ca cele de mai sus"
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Produse"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "tricouri"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "șepci"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "etichete"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "c&#259;ni"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "alte articole vestimentare"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "tricouri polo"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "discuri frisbee"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "mouse pad-uri"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "insigne"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "co&#351;uri de basket"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "cercei"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "valize"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "umbrele"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "fețe de pernă"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "brelocuri"
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "briceaguri multifuncționale"
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr "Stickuri USB"
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "De cât timp folosești Debian?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Ești un developer Debian?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "În ce părți din Debian ești implicată?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Ce te-a determinat să lucrezi cu Debian?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr "Ce sfaturi le poți da femeilor ce vor sa se implice în Debian?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-"Faci parte și din alte grupuri ce susțin femeile în tehnologie? Dacă da, "
-"care?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Mai multe despre tine"
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -327,6 +254,79 @@ msgstr "Versiune"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Pentru Membrii Noi"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Pasul 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Pasul 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Pasul 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Pasul 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Pasul 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Pasul 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Pasul 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Lista de verificare a aplican&#355;ilor"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "La fel ca cele de mai sus"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "De cât timp folosești Debian?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Ești un developer Debian?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "În ce părți din Debian ești implicată?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Ce te-a determinat să lucrezi cu Debian?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr "Ce sfaturi le poți da femeilor ce vor sa se implice în Debian?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+"Faci parte și din alte grupuri ce susțin femeile în tehnologie? Dacă da, "
+"care?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Mai multe despre tine"
+
#, fuzzy
#~ msgid "Wanted:"
#~ msgstr "taxe:"
diff --git a/romanian/po/partners.ro.po b/romanian/po/partners.ro.po
index 021ae624d61..644cd23a422 100644
--- a/romanian/po/partners.ro.po
+++ b/romanian/po/partners.ro.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/romanian/po/ports.ro.po b/romanian/po/ports.ro.po
index debb782ba7e..73e7431fc9b 100644
--- a/romanian/po/ports.ro.po
+++ b/romanian/po/ports.ro.po
@@ -11,22 +11,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.8\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian pentru Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian pentru PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "CD-uri Hurd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian pentru IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Contact"
@@ -91,6 +75,22 @@ msgstr "Ofertă"
msgid "Systems"
msgstr "Sisteme"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian pentru Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian pentru PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "CD-uri Hurd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian pentru IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD pentru i386"
diff --git a/romanian/po/security.ro.po b/romanian/po/security.ro.po
index 518119c7623..c159f9f7303 100644
--- a/romanian/po/security.ro.po
+++ b/romanian/po/security.ro.po
@@ -11,40 +11,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.8\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Securitate Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Aviziere de Securitate 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 "<a href=\\\"undated/\\\">fără dată,</a> incluse pentru posteritate"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Dicționar CVE Mitre:"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Baza de date Bugtraq Securityfocus"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Aviziere CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Vulnerabilități US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Surs&#259;:"
@@ -127,5 +93,39 @@ msgstr "Anunțurile de vulnerabilitate &#351;i buletinele de alerte CERT:"
msgid "No other external database security references currently available."
msgstr "Nici o altă referință externă disponibilă"
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Q"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Securitate Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Aviziere de Securitate Debian "
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Dicționar CVE Mitre:"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Baza de date Bugtraq Securityfocus"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Aviziere CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Vulnerabilități US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr "<a href=\\\"undated/\\\">fără dată,</a> incluse pentru posteritate"
+
#~ msgid "CERT alerts"
#~ msgstr "alerte CERT"
diff --git a/romanian/po/stats.ro.po b/romanian/po/stats.ro.po
index 6144ab88808..865eaf1d1ed 100644
--- a/romanian/po/stats.ro.po
+++ b/romanian/po/stats.ro.po
@@ -14,22 +14,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.8\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Statistici cu privire la traducerea site-ului Debian"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Mai sunt %d pagini de tradus."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Mai sunt %d bytes de tradus."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Mai sunt %d șiruri de caractere de tradus."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Versiune greșită a traducerii"
@@ -47,13 +31,13 @@ msgid "The original no longer exists"
msgstr "Versiunea originală nu mai există."
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "număr de clicuri N/A"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "clicuri"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "număr de clicuri N/A"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Clic aici ca să afli informații despre modificare"
@@ -66,15 +50,6 @@ msgstr ""
msgid "Translation summary for"
msgstr "Rezumatul traducerii pentru"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Netradus"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Învechit"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Tradus"
@@ -84,6 +59,15 @@ msgstr "Tradus"
msgid "Up to date"
msgstr "La zi"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Învechit"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Netradus"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -234,6 +218,22 @@ msgstr "Pagini web traduse (ordonate după marime)"
msgid "Translation Statistics by Page Size"
msgstr "Evidență a traducerilor după mărimea paginilor"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Statistici cu privire la traducerea site-ului Debian"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Mai sunt %d pagini de tradus."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Mai sunt %d bytes de tradus."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Mai sunt %d șiruri de caractere de tradus."
+
#~ msgid "Created with"
#~ msgstr "Create cu"
diff --git a/romanian/po/templates.ro.po b/romanian/po/templates.ro.po
index d1c652b139a..aa394f968c0 100644
--- a/romanian/po/templates.ro.po
+++ b/romanian/po/templates.ro.po
@@ -14,14 +14,6 @@ msgstr ""
"20)) ? 1 : 2;\n"
"X-Generator: Poedit 1.8.8\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Site-ul Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Caută în site-ul Debian."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -84,7 +76,6 @@ msgstr "Contactați-ne"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Informații despre lansare"
@@ -162,6 +153,11 @@ msgstr "Obțineți Debian"
msgid "The Debian Blog"
msgstr "Blogul Debian"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Ultima modificare"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -208,14 +204,8 @@ 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:107
-#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
-#| "using_cvs\">available</a>."
+#: ../../english/template/debian/footer.wml:106
+#, fuzzy
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -229,28 +219,28 @@ msgstr ""
"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:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Ultima modificare"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Drepturi de autor"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> și alții;"
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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>."
-#: ../../english/template/debian/footer.wml:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -269,6 +259,14 @@ msgstr ""
"Cum să configurați <a href=m4_HOME/intro/cn>limba predefinită a "
"documentului</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian Internațional"
@@ -498,6 +496,15 @@ msgstr "(revizie nouă)"
msgid "Report"
msgstr "Raport"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -533,10 +540,18 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Înapoi la pagina <a href=\"./\">Cine utilizează Debian?</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Site-ul Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Caută în site-ul Debian."
+
#~ msgid "Select a server near you"
#~ msgstr "Alege&#355;i un server apropiat"
diff --git a/romanian/po/vote.ro.po b/romanian/po/vote.ro.po
index 2c4b911c2e0..1134ea3a20e 100644
--- a/romanian/po/vote.ro.po
+++ b/romanian/po/vote.ro.po
@@ -28,237 +28,272 @@ msgid "Nominations"
msgstr "Nominări"
#: ../../english/template/debian/votebar.wml:25
+#, fuzzy
+msgid "Withdrawals"
+msgstr "Retras"
+
+#: ../../english/template/debian/votebar.wml:28
msgid "Debate"
msgstr "Dezbatere"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr "Platforme"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposer"
msgstr "Inițiator"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr "Inițiator propunere A"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr "Inițiator propunere B"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr "Inițiator propunere C"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr "Inițiator propunere D"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr "Inițiator propunere E"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr "Inițiator propunere F"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Inițiator propunere A"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Inițiator propunere A"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Secundare"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Secundare Propunere A "
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Secundare Propunere B "
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Secundare Propunere C"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Secundare Propunere D"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Secundare Propunere E"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Secundare Propunere F"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Secundare Propunere A "
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Secundare Propunere A "
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Opoziție"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Text"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Propunerea A"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Propunerea B"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Propunerea C"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Propunerea D"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Propunerea E"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Propunerea F"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Propunerea A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Propunerea A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Alegeri"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Amendament Inițiator"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Secundare Amendament"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Textul amendamentului"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Amendament Inițiator A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Secundare Amendament A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Textul amendamentului A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Amendament Inițiator B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Secundare Amendament B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Textul amendamentului B"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "Amendament Inițiator C"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "Secundare Amendament C"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "Amendament Textul C"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Amendamente"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Proceduri"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Necesită vot majoritar"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Date și statistici"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Cvorum"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Discuție minimă"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Vot"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Forum"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Rezultat"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "A&#351;tept&#226;nd sponsorii"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "&#206;n discu&#355;ie"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Vot deschis"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Decis"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Retras"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Altele"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Pagina de vot"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Cum&nbsp;s&#259;"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Propune"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Amendeaza propunerea"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Urmărește propunerea"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Citește rezultatul"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Voteaza"
diff --git a/russian/po/cdimage.ru.po b/russian/po/cdimage.ru.po
index e2eec743034..29577798abb 100644
--- a/russian/po/cdimage.ru.po
+++ b/russian/po/cdimage.ru.po
@@ -15,20 +15,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"
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../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:87
-msgid "ISO images"
-msgstr "Образы ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Файлы jidgo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -125,3 +111,17 @@ msgid ""
msgstr ""
"Англоязычный <a href=\"/MailingLists/disclaimer\">список рассылки</a>, "
"посвящённый компакт-дискам и DVD:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "Образы ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Файлы jidgo"
diff --git a/russian/po/consultants.ru.po b/russian/po/consultants.ru.po
index a26f7592518..a1ede4ec440 100644
--- a/russian/po/consultants.ru.po
+++ b/russian/po/consultants.ru.po
@@ -15,6 +15,14 @@ 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/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 "Назад на страницу <a href=\"./\">консультантов Debian</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Имя:"
@@ -76,11 +84,3 @@ msgstr ""
"консультанта Debian\"; } print \" в <total_country> \" . ((<total_country> % "
"10 == 0 or <total_country> % 10 > 1 or (<total_country> > 10 and "
"<total_country> < 20)) ? \"странах\" : \"стране\") . \" мира.\" . \"\\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 "Назад на страницу <a href=\"./\">консультантов Debian</a>."
diff --git a/russian/po/distrib.ru.po b/russian/po/distrib.ru.po
index c269de64336..ae68179df65 100644
--- a/russian/po/distrib.ru.po
+++ b/russian/po/distrib.ru.po
@@ -15,97 +15,67 @@ 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/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Слово для поиска"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Показать"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Искать в"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "пути, заканчивающиеся искомым словом"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "именах пакетов"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "пакеты, содержащие файлы с таким именем"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "описаниях"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "пакеты, содержащие файлы, имена которых содержат искомое слово"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "именах пакетов с исходным кодом"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Показывать только точные совпадения"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Дистрибутив"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "экспериментальный"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "нестабильный"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "тестируемый"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "стабильный"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "где угодно"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Искать"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-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"
-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:21
-msgid "Only show exact matches"
-msgstr "Показывать только точные совпадения"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Секция"
@@ -122,6 +92,36 @@ msgstr "добавочная"
msgid "non-free"
msgstr "несвободная"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Искать"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Сброс"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Показать"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "пути, заканчивающиеся искомым словом"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "пакеты, содержащие файлы с таким именем"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "пакеты, содержащие файлы, имена которых содержат искомое слово"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "архитектура"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
diff --git a/russian/po/doc.ru.po b/russian/po/doc.ru.po
index 0db003e6365..4e9a1b48a53 100644
--- a/russian/po/doc.ru.po
+++ b/russian/po/doc.ru.po
@@ -73,7 +73,8 @@ msgstr "(версия <get-var version />)"
msgid "plain text"
msgstr "простой текст"
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:183
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
"\"https://packages.debian.org/git\">Git</a> repository."
@@ -81,17 +82,19 @@ msgstr ""
"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
"href=\"https://packages.debian.org/git\">Git</a>."
-#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:185
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr "Веб-интерфейс: "
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:170
-#: ../../english/doc/manuals.defs:178 ../../english/doc/manuals.defs:186
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr "VCS-интерфейс: "
-#: ../../english/doc/manuals.defs:167
+#: ../../english/doc/manuals.defs:177
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
"\"https://packages.debian.org/cvs\">Cvs</a> repository."
@@ -99,7 +102,7 @@ msgstr ""
"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
"href=\"https://packages.debian.org/cvs\">Cvs</a>."
-#: ../../english/doc/manuals.defs:175
+#: ../../english/doc/manuals.defs:185
msgid ""
"The latest <get-var srctype /> source is available through the <a href="
"\"https://packages.debian.org/subversion\">Subversion</a> repository."
@@ -107,7 +110,7 @@ msgstr ""
"Наиболее свежий исходный код <get-var srctype /> доступен из репозитория <a "
"href=\"https://packages.debian.org/subversion\">Subversion</a>."
-#: ../../english/doc/manuals.defs:193
+#: ../../english/doc/manuals.defs:203
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -118,15 +121,15 @@ msgstr ""
" в <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
" и извлеките модуль <kbd>boot-floppies/documentation</kbd>."
-#: ../../english/doc/manuals.defs:198
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr "Web-интерфейс CVS"
-#: ../../english/doc/manuals.defs:202 ../../english/doc/manuals.defs:206
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr "Пакет Debian"
-#: ../../english/doc/manuals.defs:211 ../../english/doc/manuals.defs:215
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
msgid "Debian package (archived)"
msgstr "Пакет Debian (архив)"
@@ -164,8 +167,8 @@ msgstr ""
" 10 процентов от выручки за эту книгу жертвуются Проекту\n"
" Debian."
-#: ../../english/doc/books.data:60 ../../english/doc/books.data:164
-#: ../../english/doc/books.data:217
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -194,7 +197,7 @@ msgstr ""
"установки и\n"
" виртуализация с Xen, KVM или LXC."
-#: ../../english/doc/books.data:81
+#: ../../english/doc/books.data:83
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"
@@ -211,7 +214,7 @@ msgstr ""
"самостоятельно\n"
" (дома, в офисе, в клубе или школе)."
-#: ../../english/doc/books.data:102
+#: ../../english/doc/books.data:105
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"
@@ -231,7 +234,7 @@ msgstr ""
" пользователям, стремящимся лучше знать инструментарий Debian, и\n"
" администраторам, которые хотят создавать надёжные сети на основе Debian."
-#: ../../english/doc/books.data:121
+#: ../../english/doc/books.data:125
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -250,7 +253,7 @@ msgstr ""
" Формат: электронная книга (онлайн, HTML, PDF, ePub, Mobi),\n"
" планируется печатное издание.\n"
-#: ../../english/doc/books.data:141
+#: ../../english/doc/books.data:146
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 "
@@ -263,7 +266,7 @@ msgstr ""
"практическое руководство для всех пользователей, которые хотят больше узнать "
"о Debian и его службах."
-#: ../../english/doc/books.data:192
+#: ../../english/doc/books.data:200
msgid ""
"Written by two penetration researcher - Annihilator, Firstblood.\n"
" This book teaches you how to build and configure Debian 8.x server system\n"
diff --git a/russian/po/newsevents.ru.po b/russian/po/newsevents.ru.po
index bbeab395347..f664dcd41bc 100644
--- a/russian/po/newsevents.ru.po
+++ b/russian/po/newsevents.ru.po
@@ -17,66 +17,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/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Новости Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Последние новости 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 "Информационный бюллетень для сообщества Debian"
-
-#: ../../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 "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 "Аннотация"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Предстоящие события"
@@ -135,6 +75,127 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (ссылка не работает)"
+#: ../../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 ""
+"Чтобы получать новости по почте, <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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "Доступны также <a href=\"../../\">прошлые выпуски</a> этого бюллетеня."
+
+#. 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 выпускает <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 выпускают: <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\" />Этот выпуск новостей проекта Debian составил <a href="
+"\"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\" />Этот выпуск новостей проекта Debian составили: <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\" />Перевёл %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\" />Перевели %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=\"singular\" />Перевела %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=\"plural\" />Перевели %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 ""
+"Чтобы каждую неделю получать новости по почте, <a href=\"https://lists."
+"debian.org/debian-news\">подпишитесь</a> на список рассылки debian-news."
+
+#. 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 выпускает <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 выпускают <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\" />Этот выпуск еженедельных новости Debian выпустил <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\" />Этот выпуск еженедельных новостей Debian выпустили <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -388,126 +449,65 @@ msgstr ""
"news />\">различных новостей для разработчиков</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 ""
-"Чтобы получать новости по почте, <a href=\"https://lists.debian.org/debian-"
-"news\">подпишитесь</a> на список рассылки debian-news."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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=\"../../\">прошлые выпуски</a> этого бюллетеня."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+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>."
-msgstr ""
-"<void id=\"singular\" />Новости проекта Debian выпускает <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+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>."
-msgstr ""
-"<void id=\"plural\" />Новости проекта Debian выпускают: <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+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>."
-msgstr ""
-"<void id=\"singular\" />Этот выпуск новостей проекта Debian составил <a href="
-"\"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+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>."
-msgstr ""
-"<void id=\"plural\" />Этот выпуск новостей проекта Debian составили: <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Событие:"
-#. 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\" />Перевёл %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Слайды:"
-#. 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\" />Перевели %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "источник"
-#. 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=\"singular\" />Перевела %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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=\"plural\" />Перевели %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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 ""
-"Чтобы каждую неделю получать новости по почте, <a href=\"https://lists."
-"debian.org/debian-news\">подпишитесь</a> на список рассылки debian-news."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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 выпускает <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+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>."
-msgstr ""
-"<void id=\"plural\" />Еженедельные новости Debian выпускают <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Новости 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\" />Этот выпуск еженедельных новости Debian выпустил <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Последние новости 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\" />Этот выпуск еженедельных новостей Debian выпустили <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Информационный бюллетень для сообщества Debian"
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/russian/po/organization.ru.po b/russian/po/organization.ru.po
index 7505c17967b..db88318e97d 100644
--- a/russian/po/organization.ru.po
+++ b/russian/po/organization.ru.po
@@ -83,27 +83,27 @@ msgid "role"
msgstr "роль"
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Руководство"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Дистрибутив"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Информационное взаимодействие и социально-ориентированные программы"
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr "Команда защиты данных"
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Связи с общественностью"
@@ -117,136 +117,131 @@ msgstr "Членство в других организациях"
msgid "Support and Infrastructure"
msgstr "Поддержка и инфраструктура"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr "Чистые смеси Debian"
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Лидер"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Технический Комитет"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Секретарь"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Проекты"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP-архив"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "Менеджер FTP-архива"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Помощники менеджера FTP-архива"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Мастера настройки FTP"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Команда Backports"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Управление выпусками"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Команда подготовки выпуска"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Контроль качества"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Команда создания системы установки"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr "Команда Debian Live"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Информация о выпусках"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Образы CD"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Производство"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Тестирование"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr "Поддержка облачных технологий"
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Инфраструктура автоматической сборки"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Команда поддержки wanna-build"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Управление buildd"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Документация"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Список нуждающихся в доработке и будущих пакетов"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Переносы"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Особые варианты"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Переносные компьютеры"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Брандмауэры"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Встроенные системы"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Связи с прессой"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Web-страницы"
@@ -417,44 +412,40 @@ msgstr "Система отслеживания пакетов"
msgid "Treasurer"
msgstr "Казначей"
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
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:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Администраторы Salsa"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "Debian для детей от 1 до 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Чистые смеси Debian"
+
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian для детей от 1 до 99"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "Debian в медицинской практике и исследованиях"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian в медицинской практике и исследованиях"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "Debian в образовании"
+#~ msgid "Debian for education"
+#~ msgstr "Debian в образовании"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "Debian в юридической конторе"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian в юридической конторе"
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "Debian для людей с ограниченными возможностями"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian для людей с ограниченными возможностями"
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr "Debian в науке и связанных исследованиях"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian в науке и связанных исследованиях"
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr "Debian в астрономии"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian в астрономии"
#~ msgid "Individual Packages"
#~ msgstr "Отдельные пакеты"
diff --git a/russian/po/others.ru.po b/russian/po/others.ru.po
index 919b0aa576c..b760ac4e983 100644
--- a/russian/po/others.ru.po
+++ b/russian/po/others.ru.po
@@ -64,42 +64,6 @@ msgstr "<void id=\"d-i\" />Неизвестно"
msgid "Unavailable"
msgstr "Нет в наличии"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Уголок новых членов"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Шаг 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Шаг 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Шаг 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Шаг 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Шаг 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Шаг 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Шаг 7"
-
-#: ../../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> "
@@ -163,134 +127,96 @@ msgstr "[Под управлением Debian]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (мини-кнопка)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "тоже, что и выше"
-
-#: ../../english/misc/merchandise.def:10
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Продукция"
-#: ../../english/misc/merchandise.def:13
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "Футболки"
-#: ../../english/misc/merchandise.def:16
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "шапки"
-#: ../../english/misc/merchandise.def:19
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "наклейки"
-#: ../../english/misc/merchandise.def:22
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "кружки"
-#: ../../english/misc/merchandise.def:25
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "другая одежда"
-#: ../../english/misc/merchandise.def:28
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "рубашки"
-#: ../../english/misc/merchandise.def:31
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "фрисби"
-#: ../../english/misc/merchandise.def:34
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "коврики для мыши"
-#: ../../english/misc/merchandise.def:37
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "значки"
-#: ../../english/misc/merchandise.def:40
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "баскетбольные корзины"
-#: ../../english/misc/merchandise.def:44
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "серьги"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "дипломаты"
-#: ../../english/misc/merchandise.def:50
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "зонтики"
-#: ../../english/misc/merchandise.def:53
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "наволочки"
-#: ../../english/misc/merchandise.def:56
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "брелоки"
-#: ../../english/misc/merchandise.def:59
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "Швейцарские армейские ножи"
-#: ../../english/misc/merchandise.def:62
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr "Карты USB"
-#: ../../english/misc/merchandise.def:77
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr "ланьярды"
-#: ../../english/misc/merchandise.def:80
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr "другое"
-#: ../../english/misc/merchandise.def:101
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr "Жертвует средства Проекту Debian"
-#: ../../english/misc/merchandise.def:105
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
"Деньги используются для организации местных мероприятий, посвящённых "
"свободному ПО"
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Как давно ты используешь Debian?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Ты являешься разработчиком Debian?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "В какие области Debian ты вовлечена?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Что заинтересовало тебя в работе с Debian?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-"У тебя есть какие-либо советы женщинам, заинтересованным в большем участии в "
-"Debian?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-"Ты участвуешь в других женских группах, посвящённых технологии? В каких?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Немного о тебе..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -335,6 +261,80 @@ msgstr "Версия"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Уголок новых членов"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Шаг 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Шаг 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Шаг 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Шаг 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Шаг 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Шаг 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Шаг 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Обходной лист"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "тоже, что и выше"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Как давно ты используешь Debian?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Ты являешься разработчиком Debian?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "В какие области Debian ты вовлечена?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Что заинтересовало тебя в работе с Debian?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+"У тебя есть какие-либо советы женщинам, заинтересованным в большем участии в "
+"Debian?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+"Ты участвуешь в других женских группах, посвящённых технологии? В каких?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Немного о тебе..."
+
#~ msgid "Where:"
#~ msgstr "Где:"
diff --git a/russian/po/ports.ru.po b/russian/po/ports.ru.po
index a28bea8744a..6c77cc241fe 100644
--- a/russian/po/ports.ru.po
+++ b/russian/po/ports.ru.po
@@ -14,22 +14,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/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian для Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian для PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Компакт-диски Hurd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian для IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Как связаться"
@@ -94,6 +78,22 @@ msgstr "Источник питания"
msgid "Systems"
msgstr "Системы"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian для Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian для PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Компакт-диски Hurd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian для IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD для i386"
diff --git a/russian/po/security.ru.po b/russian/po/security.ru.po
index a929c38a25e..6cd55643ae4 100644
--- a/russian/po/security.ru.po
+++ b/russian/po/security.ru.po
@@ -15,42 +15,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/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Безопасность Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Рекомендации Debian по безопасности"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "Вопрос"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"<a href=\\\"undated/\\\">Не датированные</a> рекомендации по безопасности, "
-"оставленные для потомков"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "В каталоге Mitre CVE"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "База данных Securityfocus Bugtraq"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Рекомендации CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Информация об уязвимостях US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Исходный код:"
@@ -133,3 +97,39 @@ msgstr "База данных CERT по уязвимостям, предложе
msgid "No other external database security references currently available."
msgstr ""
"На данный момент ссылки на внешние базы данных по безопасности отсутствуют."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Вопрос"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Безопасность Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Рекомендации Debian по безопасности"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "В каталоге Mitre CVE"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "База данных Securityfocus Bugtraq"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Рекомендации CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Информация об уязвимостях US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"<a href=\\\"undated/\\\">Не датированные</a> рекомендации по безопасности, "
+"оставленные для потомков"
diff --git a/russian/po/stats.ru.po b/russian/po/stats.ru.po
index 05b83391adb..51ff0c8e1d4 100644
--- a/russian/po/stats.ru.po
+++ b/russian/po/stats.ru.po
@@ -15,22 +15,6 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 2.0.8\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Неверная версия перевода"
@@ -48,13 +32,13 @@ msgid "The original no longer exists"
msgstr "Оригинал более не существует"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "число обращений не доступно"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "обращения"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "число обращений не доступно"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Нажмите, чтобы получить данные diffstat"
@@ -67,15 +51,6 @@ msgstr "Создано с помощью <transstatslink>"
msgid "Translation summary for"
msgstr "Резюме перевода для"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Не переведено"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Устарело"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Переведено"
@@ -85,6 +60,15 @@ msgstr "Переведено"
msgid "Up to date"
msgstr "Актуально"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Устарело"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Не переведено"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -235,6 +219,22 @@ msgstr "Переведённые веб-страницы (по размеру)"
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."
+
#~ msgid "Created with"
#~ msgstr "Создано с помощью"
diff --git a/russian/po/templates.ru.po b/russian/po/templates.ru.po
index f30342bf707..c3050d37494 100644
--- a/russian/po/templates.ru.po
+++ b/russian/po/templates.ru.po
@@ -18,14 +18,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/search.xml.in:7
-msgid "Debian website"
-msgstr "Веб-сайт Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Искать на веб-сайте Debian."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -556,6 +548,14 @@ msgstr "URL"
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Назад на страницу <a href=\"./\">Кто использует Debian</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Веб-сайт Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Искать на веб-сайте Debian."
+
#~ msgid "Visit the site sponsor"
#~ msgstr "Посетите&nbsp;нашего&nbsp;спонсора"
diff --git a/slovak/po/cdimage.sk.po b/slovak/po/cdimage.sk.po
index fdaa8ee67e0..d6d28f07cd4 100644
--- a/slovak/po/cdimage.sk.po
+++ b/slovak/po/cdimage.sk.po
@@ -14,20 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "Obrazy ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Súbory Jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -124,3 +110,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Verejná konferencia</a> o CD/DVD (v "
"angličtine):"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "Obrazy ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Súbory Jigdo"
diff --git a/slovak/po/consultants.sk.po b/slovak/po/consultants.sk.po
index 400c997fe34..e227793f2b8 100644
--- a/slovak/po/consultants.sk.po
+++ b/slovak/po/consultants.sk.po
@@ -14,6 +14,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Zoznam konzultantov"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Späť na <a href=\"./\">Zoznam konzultantov Debianu</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Názov:"
@@ -69,11 +77,3 @@ msgid ""
msgstr ""
"Celkovo obsahuje <total_consultant> konzultantov Debianu v <total_country> "
"krajinách sveta."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Zoznam konzultantov"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Späť na <a href=\"./\">Zoznam konzultantov Debianu</a>."
diff --git a/slovak/po/countries.sk.po b/slovak/po/countries.sk.po
index c27f803fd8a..d6ae4f54da3 100644
--- a/slovak/po/countries.sk.po
+++ b/slovak/po/countries.sk.po
@@ -226,210 +226,214 @@ msgid "Kenya"
msgstr "Keňa"
#: ../../english/template/debian/countries.wml:267
+msgid "Kyrgyzstan"
+msgstr "Kirgizsko"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Kórea"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuvajt"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazachstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Srí Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Litva"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luxembursko"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Lotyšsko"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Maroko"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldavsko"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Čierna Hora"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Macedónska republika"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mongolsko"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mexiko"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malajzia"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Nová Kaledónia"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nikaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Holandsko"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Nórsko"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Nový Zéland"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Francúzska Polynézia"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipíny"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Poľsko"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugalsko"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "Réunion"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Rumunsko"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Srbsko"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusko"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Saudská Arábia"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Švédsko"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapur"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovinsko"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovensko"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "Salvádor"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Thajsko"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tadžikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunisko"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turecko"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Taiwan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukrajina"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Spojené štáty"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguaj"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Južná Afrika"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabwe"
@@ -857,9 +861,6 @@ msgstr "Zimbabwe"
#~ msgid "State of Kuwait"
#~ msgstr "Kuvajtský štát"
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgizsko"
-
#~ msgid "Kyrgyz Republic"
#~ msgstr "Kirgizská republika"
diff --git a/slovak/po/distrib.sk.po b/slovak/po/distrib.sk.po
index d96d05b626b..d65becf99f2 100644
--- a/slovak/po/distrib.sk.po
+++ b/slovak/po/distrib.sk.po
@@ -16,97 +16,67 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Virtaal 0.7.1\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Kľúčové slovo"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Zobraziť"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Prehľadať"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "cesty, ktoré končia kľúčovým slovom"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Iba názvy balíkov"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "balíky, ktoré obsahujú takto nazvané súbory"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Popisy"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "balíky, ktoré obsahujú súbory s kľúčovým slovom v názve"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Názvy zdrojových balíkov"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Zobraziť iba presné výsledky"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribúcia"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Architektúra"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "ktorákoľvek"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Hľadať"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Reset"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Prehľadať"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Iba názvy balíkov"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Popisy"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Názvy zdrojových balíkov"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Zobraziť iba presné výsledky"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Sekcia"
@@ -123,6 +93,36 @@ msgstr "c"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Hľadať"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Reset"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Zobraziť"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "cesty, ktoré končia kľúčovým slovom"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "balíky, ktoré obsahujú takto nazvané súbory"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "balíky, ktoré obsahujú súbory s kľúčovým slovom v názve"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Architektúra"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -197,7 +197,6 @@ msgstr "Procesory POWER"
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "64-bit MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "64-bitový MIPS (little endian)"
diff --git a/slovak/po/doc.sk.po b/slovak/po/doc.sk.po
index d1a746e18b4..28bdb905394 100644
--- a/slovak/po/doc.sk.po
+++ b/slovak/po/doc.sk.po
@@ -16,10 +16,127 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Virtaal 0.7.1\n"
-#: ../../english/doc/books.data:31
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Balík Debianu"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "email:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Dostupné na:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "Obsahuje CD:"
+
+#: ../../english/doc/books.def:54
+msgid "Publisher:"
+msgstr "Vydavateľ:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Autori:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Redaktori:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Správca:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Stav:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Dostupnosť:"
+
+#: ../../english/doc/manuals.defs:97
+msgid "Latest version:"
+msgstr "Najnovšia verzia:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(verzia <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "čistý text"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"Najnovší <get-var srctype /> zdrojový kód je dostupný z repozitára <a href="
+"\"https://packages.debian.org/git\">Git</a>."
+
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Webové rozhranie:"
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "Rozhranie systému na správu verzií:"
+
+#: ../../english/doc/manuals.defs:177
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+"Najnovší <get-var srctype /> zdrojový kód je dostupný z repozitára <a href="
+"\"https://packages.debian.org/cvs\">CVS</a>."
+
+#: ../../english/doc/manuals.defs:185
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a> repository."
+msgstr ""
+"Najnovší <get-var srctype /> zdrojový kód je dostupný z repozitára <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a>."
+
+#: ../../english/doc/manuals.defs:203
+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 ""
+"Pracovná kópia zdrojových textov v CVS: nastavte <code>CVSROOT</code>\n"
+" 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:208
+msgid "CVS via web"
+msgstr "Webové rozhranie k CVS"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Balík Debianu"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Balík Debianu (archivovaný)"
+
+#: ../../english/doc/books.data:32
+#, fuzzy
msgid ""
"\n"
-" Debian 8 is the must-have handbook for learning Linux. Start on the\n"
+" Debian 9 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"
@@ -49,8 +166,8 @@ msgstr ""
" a mimo Debianu. Spravujte svoju domácu sieť pomocou network-manager atď.\n"
"  10 percent ziskov z tejto knihy bude venovaných projektu Debian."
-#: ../../english/doc/books.data:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
+#: ../../english/doc/books.data:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
msgid ""
"Written by two Debian developers, this free book\n"
" started as a translation of their French best-seller known as Cahier de\n"
@@ -77,7 +194,7 @@ msgstr ""
" ako SELinux na zabezpečenie služieb, automatizované inštalácie alebo\n"
" virtualizáciu pomocou Xen, KVM alebo LXC."
-#: ../../english/doc/books.data:80
+#: ../../english/doc/books.data:83
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"
@@ -92,7 +209,7 @@ msgstr ""
" používateľa, ktorý si sám nainštaluje a spravuje systém (či už\n"
" v domácnosti, v kancelárii, v klube alebo v škole)."
-#: ../../english/doc/books.data:101
+#: ../../english/doc/books.data:105
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"
@@ -104,7 +221,7 @@ msgid ""
" administrator who wants to build a reliable network with Debian."
msgstr ""
-#: ../../english/doc/books.data:120
+#: ../../english/doc/books.data:125
msgid ""
"The book covers topics ranging from concepts of package\n"
" management over the available tools and how they're used to concrete "
@@ -116,7 +233,7 @@ msgid ""
" PDF, ePub, Mobi), printed book planned.\n"
msgstr ""
-#: ../../english/doc/books.data:140
+#: ../../english/doc/books.data:146
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 "
@@ -124,7 +241,7 @@ msgid ""
"for all users who want to learn more about Debian and its range of services."
msgstr ""
-#: ../../english/doc/books.data:191
+#: ../../english/doc/books.data:200
msgid ""
"Written by two penetration researcher - Annihilator, Firstblood.\n"
" This book teaches you how to build and configure Debian 8.x server system\n"
@@ -140,114 +257,6 @@ msgid ""
" intrusion detection system."
msgstr ""
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/doc/books.def:41
-msgid "email:"
-msgstr "email:"
-
-#: ../../english/doc/books.def:45
-msgid "Available at:"
-msgstr "Dostupné na:"
-
-#: ../../english/doc/books.def:48
-msgid "CD Included:"
-msgstr "Obsahuje CD:"
-
-#: ../../english/doc/books.def:51
-msgid "Publisher:"
-msgstr "Vydavateľ:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Autori:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Redaktori:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Správca:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Stav:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Dostupnosť:"
-
-#: ../../english/doc/manuals.defs:92
-msgid "Latest version:"
-msgstr "Najnovšia verzia:"
-
-#: ../../english/doc/manuals.defs:108
-msgid "(version <get-var version />)"
-msgstr "(verzia <get-var version />)"
-
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "čistý text"
-
-#: ../../english/doc/manuals.defs:154 ../../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 ""
-"Najnovší <get-var srctype /> zdrojový kód je dostupný z repozitára <a href="
-"\"https://packages.debian.org/git\">Git</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 "Webové rozhranie:"
-
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
-msgid "VCS interface: "
-msgstr "Rozhranie systému na správu verzií:"
-
-#: ../../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 ""
-"Najnovší <get-var srctype /> zdrojový kód je dostupný z repozitára <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 ""
-"Najnovší <get-var srctype /> zdrojový kód je dostupný z repozitára <a href="
-"\"https://packages.debian.org/subversion\">Subversion</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 ""
-"Pracovná kópia zdrojových textov v CVS: nastavte <code>CVSROOT</code>\n"
-" 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:193
-msgid "CVS via web"
-msgstr "Webové rozhranie k CVS"
-
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
-msgid "Debian package"
-msgstr "Balík Debianu"
-
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
-msgid "Debian package (archived)"
-msgstr "Balík Debianu (archivovaný)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/slovak/po/newsevents.sk.po b/slovak/po/newsevents.sk.po
index cf506692dec..43f8f3d1b20 100644
--- a/slovak/po/newsevents.sk.po
+++ b/slovak/po/newsevents.sk.po
@@ -17,90 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Virtaal 0.7.1\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Novinky Debianu"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Posledné novinky Debianu"
-
-#: ../../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 "Newsletter pre komunitu Debianu"
-
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "Meno:"
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "Email:"
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "Predošlé prednášky:"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Jazyky:"
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Lokalita:"
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Témy:"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Názov:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Jazyk:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Dátum:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Udalosť:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Prezentácia:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "zdroj"
-
-#: ../../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 "Abstrakt"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Nadchádzajúce udalosti"
@@ -159,6 +75,127 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (neplatný odkaz)"
+#: ../../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 ""
+"Ak chcete tento newsletter dostávať 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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "<a href=\"../../\">Staršie vydania</a> tohto newslettera."
+
+#. 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\" />Redaktorom Noviniek projektu Debian je <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\" />Redaktormi Noviniek projektu Debian sú <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\" />Redaktorom tohto vydania Noviniek projektu Debian je "
+"<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\" />Redaktormi tohto vydania Noviniek projektu Debian sú "
+"<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\" />Preložil ho %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\" />Preložili ho %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\" />Preložila ho %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\" />Preložili ho %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 ""
+"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>."
+
+#. 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\" />Redaktorom Týždenníka Debianu je <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\" />Redaktormi Týždenníka Debianu sú <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\" />Redaktorom tohto vydania Týždenníka Debianu je <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\" />Redaktormi tohto vydania Týždenníka Debianu sú <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -407,134 +444,89 @@ msgstr ""
"<get-var issue-devel-news /> vydanie <a href=\"<get-var url-devel-news />\"> "
"rôzne novinky pre vývojárov</a> a obsahuje nasledujúce témy:"
-#: ../../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 ""
-"Ak chcete tento newsletter dostávať emailom, <a href=\"https://lists.debian."
-"org/debian-news/\">prihláste sa do konferencie debian-news</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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=\"../../\">Staršie vydania</a> tohto newslettera."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Názov:"
-#. 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\" />Redaktorom Noviniek projektu Debian je <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Autor:"
-#. 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\" />Redaktormi Noviniek projektu Debian sú <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Jazyk:"
-#. 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\" />Redaktorom tohto vydania Noviniek projektu Debian je "
-"<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Dátum:"
-#. 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\" />Redaktormi tohto vydania Noviniek projektu Debian sú "
-"<a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Udalosť:"
-#. 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\" />Preložil ho %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Prezentácia:"
-#. 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\" />Preložili ho %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "zdroj"
-#. 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\" />Preložila ho %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Preložili ho %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Zoznam prednášajúcich"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Späť na <a href=\"./\">Zoznam prednášajúcich o Debiane</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Abstrakt"
-#: ../../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 ""
-"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/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Novinky Debianu"
-#. 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\" />Redaktorom Týždenníka Debianu je <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Posledné novinky Debianu"
-#. 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\" />Redaktormi Týždenníka Debianu sú <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Newsletter pre komunitu Debianu"
-#. 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\" />Redaktorom tohto vydania Týždenníka Debianu je <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Name:"
+#~ msgstr "Meno:"
-#. 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\" />Redaktormi tohto vydania Týždenníka Debianu sú <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "Predošlé prednášky:"
+
+#~ msgid "Languages:"
+#~ msgstr "Jazyky:"
+
+#~ msgid "Location:"
+#~ msgstr "Lokalita:"
+
+#~ msgid "Topics:"
+#~ msgstr "Témy:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "Zoznam prednášajúcich"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Späť na <a href=\"./\">Zoznam prednášajúcich o Debiane</a>."
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/slovak/po/organization.sk.po b/slovak/po/organization.sk.po
index bd251af6fd7..3831582fcb6 100644
--- a/slovak/po/organization.sk.po
+++ b/slovak/po/organization.sk.po
@@ -50,247 +50,295 @@ msgid "manager"
msgstr "manažér"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Správca stabilného vydania"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "wizard"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "predseda"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "asistent"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "sekretár"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Predstavenstvo"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribúcia"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Komunikácia a PR"
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Marketingový tím"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Podpora a infraštruktúra"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr "Debian Pure Blends"
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Vedúci"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Technická komisia"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Sekretár"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Vývojové projekty"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP archívy"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "FTP Masters"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "FTP asistenti"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "FTP Wizards"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Spätné porty"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Tím spätných portov"
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Jednotlivé balíky"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Správa vydaní"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Tím vydania"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Zabezpečenie kvality"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Tím inštalátora"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Poznámky k vydaniu"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Obrazy CD"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produkcia"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testovanie"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infraštruktúra automatického zostavovania"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Tím wanna-build"
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Správa buildd"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentácia"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Balíky, ktoré potrebujú pomoc a perspektívne balíky"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Porty"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Špeciálne konfigurácie"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Notebooky"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Firewally"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Vnorené systémy"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Tlačový kontakt"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Webstránky"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr "PR"
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Projekt Ženy Debianu"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr "Boj proti obťažovaniu"
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Udalosti"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
msgid "DebConf Committee"
msgstr "Komisia DebConf"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Partnerský program"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Koordinácia darov hardvéru"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Používateľská podpora"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Systém sledovania chýb"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Správa konferencií a archívov konferencií"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr "Recepcia nových členov"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Správcovia účtov Debianu"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -298,31 +346,31 @@ msgstr ""
"Ak chcete poslať súkromnú správu všetkým DAM, použite kľúč GPG "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Správcovia kľúčov (PGP a GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Bezpečnostný tím"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Stránka konzultantov"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "Stránka dodávateľov CD"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Politika"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Správa systému"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -331,7 +379,7 @@ 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:435
+#: ../../english/intro/organization.data:469
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 "
@@ -341,68 +389,66 @@ msgstr ""
"\"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:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "Správca LDAP adresára vývojárov"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Zrkadlá"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "Správca DNS"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Systém sledovania balíkov"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Žiadosti o použitie <a name=\"trademark\" href=\"m4_HOME/trademark"
"\">ochranných známok</a>"
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Správcovia Alioth"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Debian pre deti od 1 do 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Debian pre medicínsku prax a výskum"
+#~ msgid "Individual Packages"
+#~ msgstr "Jednotlivé balíky"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Debian pre vzdelávanie"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian pre deti od 1 do 99"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Debian v právnických kanceláriách"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian pre medicínsku prax a výskum"
+
+#~ msgid "Debian for education"
+#~ msgstr "Debian pre vzdelávanie"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian v právnických kanceláriách"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Debian pre ľudí s postihnutiami"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian pre ľudí s postihnutiami"
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr "Debian pre vedu a súvisiaci výskum"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian pre vedu a súvisiaci výskum"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian pre vzdelávanie"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian pre vzdelávanie"
#~ msgid "Live System Team"
#~ msgstr "Tím Live systému"
diff --git a/slovak/po/others.sk.po b/slovak/po/others.sk.po
index 64d43f35137..24e5bb35ba5 100644
--- a/slovak/po/others.sk.po
+++ b/slovak/po/others.sk.po
@@ -65,42 +65,6 @@ msgstr "<void id=\"d-i\" />Neznáme"
msgid "Unavailable"
msgstr "Nedostupné"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Kútik Nových členov"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Krok 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Krok 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Krok 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Krok 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Krok 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Krok 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Krok 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Kontrolný zoznam uchádzača"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -164,132 +128,95 @@ msgstr "[Funguje na Debiane]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (minitlačidlo)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "rovnako ako vyššie"
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Produkty"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "Tričká"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "klobúky"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "samolepky"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "hrnčenky"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "iné oblečenie"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "golfové tričká"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "frisbee"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "podložky pod myš"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "odznaky"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "basketbalové koše"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "náušnice"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "kufre"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "dáždniky"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "obliečky na vankúše"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "zväzky kľúčov"
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "Švajčiarske nožíky"
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr "Kľúčenky USB"
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr "Šnúrky na krk"
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr "iné"
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr "Daruje peniaze Debianu"
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
"Peniaze sa využívajú na organizovanie miestnych akcií slobodného softvéru"
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Ako dlho už používate Debian?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Ste vývojár Debianu?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "V akých oblastiach Debianu sa angažujete?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Čo vás zaujalo natoľko, že ste začali pracovať s Debianom?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-"Máte nejaké tipy pre ženy, ktoré majú záujem viac sa angažovať v Debiane?"
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-"Angažujete sa v iných skupinách žien v technologickom odvetví? V ktorých?"
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Niečo viac o vás..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -334,6 +261,79 @@ msgstr "Verzia"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Kútik Nových členov"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Krok 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Krok 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Krok 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Krok 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Krok 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Krok 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Krok 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Kontrolný zoznam uchádzača"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "rovnako ako vyššie"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Ako dlho už používate Debian?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Ste vývojár Debianu?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "V akých oblastiach Debianu sa angažujete?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Čo vás zaujalo natoľko, že ste začali pracovať s Debianom?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+"Máte nejaké tipy pre ženy, ktoré majú záujem viac sa angažovať v Debiane?"
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+"Angažujete sa v iných skupinách žien v technologickom odvetví? V ktorých?"
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Niečo viac o vás..."
+
#~ msgid "Where:"
#~ msgstr "Kde:"
diff --git a/slovak/po/partners.sk.po b/slovak/po/partners.sk.po
index 021ae624d61..644cd23a422 100644
--- a/slovak/po/partners.sk.po
+++ b/slovak/po/partners.sk.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/slovak/po/ports.sk.po b/slovak/po/ports.sk.po
index 30451e57948..43da62d58bd 100644
--- a/slovak/po/ports.sk.po
+++ b/slovak/po/ports.sk.po
@@ -15,22 +15,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian pre Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian pre PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "CD Hurd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian pre IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Kontakt"
@@ -95,6 +79,22 @@ msgstr "Dodávka"
msgid "Systems"
msgstr "Systémy"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian pre Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian pre PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "CD Hurd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian pre IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD pre i386"
diff --git a/slovak/po/security.sk.po b/slovak/po/security.sk.po
index a40b0531c66..e1b8e933105 100644
--- a/slovak/po/security.sk.po
+++ b/slovak/po/security.sk.po
@@ -16,42 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Bezpečnosť Debianu"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Bezpečnostné posudky Debianu"
-
-#: ../../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 ""
-"<a href=\\\"undated/\\\">nedatované</a> bezpečnostné upozornenia, zahrnuté "
-"kvôli neskorším"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitreho slovník CVE"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Databáza Bugtraq na Securityfocus"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Posudky CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Poznámky o zraniteľnostiach US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Zdroj:"
@@ -134,3 +98,39 @@ msgstr "Zraniteľnosti, posudky a poznámky o incidentoch CERT:"
msgid "No other external database security references currently available."
msgstr ""
"Žiadne odkazy na externé bezpečnostné databázy nie sú momentálne dostupné."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Q"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Bezpečnosť Debianu"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Bezpečnostné posudky Debianu"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitreho slovník CVE"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Databáza Bugtraq na Securityfocus"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Posudky CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Poznámky o zraniteľnostiach US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"<a href=\\\"undated/\\\">nedatované</a> bezpečnostné upozornenia, zahrnuté "
+"kvôli neskorším"
diff --git a/slovak/po/stats.sk.po b/slovak/po/stats.sk.po
index a2e2d08a39f..0aa96459e4e 100644
--- a/slovak/po/stats.sk.po
+++ b/slovak/po/stats.sk.po
@@ -15,22 +15,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Štatistika prekladov webu Debianu"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "%d stránok na preloženie."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "%d bajtov na preloženie."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "%d reťazcov na preloženie."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Nesprávna verzia prekladu"
@@ -48,13 +32,13 @@ msgid "The original no longer exists"
msgstr "Originál už neexistuje"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "počet zásahov nedostupný"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "zásahov"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "počet zásahov nedostupný"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Kliknutím stiahnete údaje diffstat"
@@ -67,15 +51,6 @@ msgstr ""
msgid "Translation summary for"
msgstr "Zhrnutie pamäte prekladov pre"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Nepreložené"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Zastarané"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Preložené"
@@ -85,6 +60,15 @@ msgstr "Preložené"
msgid "Up to date"
msgstr "Aktuálne"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Zastarané"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Nepreložené"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -235,6 +219,22 @@ msgstr "Preložené webstránky (podľa veľkosti)"
msgid "Translation Statistics by Page Size"
msgstr "Štatistika prekladov podľa veľkosti stránky"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Štatistika prekladov webu Debianu"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "%d stránok na preloženie."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "%d bajtov na preloženie."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "%d reťazcov na preloženie."
+
#~ msgid "Created with"
#~ msgstr "Vytvorené pomocou"
diff --git a/slovak/po/templates.sk.po b/slovak/po/templates.sk.po
index bc611cb08d3..6d0c780fa0a 100644
--- a/slovak/po/templates.sk.po
+++ b/slovak/po/templates.sk.po
@@ -17,14 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Virtaal 0.7.1\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Webstránky Debianu"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Vyhľadávanie na webe Debianu."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -88,7 +80,6 @@ msgstr "Napíšte nám"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Informácie o vydaniach"
@@ -166,6 +157,11 @@ msgstr "Ako&nbsp;získať&nbsp;Debian"
msgid "The Debian Blog"
msgstr "Blog o Debiane"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Posledná zmena"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -212,14 +208,8 @@ 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail our publicly archived "
-#| "mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-"
-#| "www@lists.debian.org</a>. For other contact information, see the Debian "
-#| "<a href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a "
-#| "href=\"m4_HOME/devel/website/using_cvs\">available</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -234,29 +224,29 @@ msgstr ""
"dispozícii aj <a href=\"m4_HOME/devel/website/using_cvs\">zdrojový kód webu "
"Debianu</a>."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Posledná zmena"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr "Posledné zostavenie"
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Autorské práva"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> a iné;"
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -273,6 +263,14 @@ msgstr "Stránku je možné zobraziť tiež v&nbsp;týchto jazykoch:"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Ako nastaviť <a href=m4_HOME/intro/cn>implicitný jazyk</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian a jazyky"
@@ -501,6 +499,15 @@ msgstr "(nová revízia)"
msgid "Report"
msgstr "Správa"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -536,10 +543,18 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Späť na stránku <a href=\"../\">Kto používa Debian?</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Webstránky Debianu"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Vyhľadávanie na webe Debianu."
+
#~ msgid ""
#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
#~ "information on contacting us."
diff --git a/slovak/po/vendors.sk.po b/slovak/po/vendors.sk.po
index 331f440c871..f7bd8a5e03d 100644
--- a/slovak/po/vendors.sk.po
+++ b/slovak/po/vendors.sk.po
@@ -26,7 +26,6 @@ msgstr "Umožňuje príspevky"
#: ../../english/CD/vendors/vendors.CD.def:16
#, fuzzy
-#| msgid "CD/DVD"
msgid "CD/DVD/BD/USB"
msgstr "CD/DVD"
diff --git a/slovak/po/vote.sk.po b/slovak/po/vote.sk.po
index 509cb0aaf9f..3109f0088c2 100644
--- a/slovak/po/vote.sk.po
+++ b/slovak/po/vote.sk.po
@@ -34,237 +34,272 @@ msgid "Nominations"
msgstr "Nominácie"
#: ../../english/template/debian/votebar.wml:25
+#, fuzzy
+msgid "Withdrawals"
+msgstr "Stiahnuté"
+
+#: ../../english/template/debian/votebar.wml:28
msgid "Debate"
msgstr "Debata"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr "Platformy"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposer"
msgstr "Navrhovateľ"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr "Návrh A navrhuje"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr "Návrh B navrhuje"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr "Návrh C navrhuje"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr "Návrh D navrhuje"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr "Návrh E navrhuje"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr "Návrh F navrhuje"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Návrh A navrhuje"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Návrh A navrhuje"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Sekunduje"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Návrh A sekunduje"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Návrh B sekunduje"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Návrh C sekunduje"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Návrh D sekunduje"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Návrh E sekunduje"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Návrh F sekunduje"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Návrh A sekunduje"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Návrh A sekunduje"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Opozícia"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Text"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Návrh A"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Návrh B"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Návrh C"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Návrh D"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Návrh E"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Návrh F"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Návrh A"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Návrh A"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Možnosti"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Dodatok navrhuje"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Dodatok sekunduje"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Text dodatku"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Dodatok navrhuje A"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Dodatok sekunduje A"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Text dodatku A"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Dodatok navrhuje B"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Dodatok sekunduje B"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Text dodatku B"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "Dodatok navrhuje C"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "Dodatok sekunduje C"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "Text dodatku C"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Dodatky"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Jednanie"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Požiadavka väčšiny"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Údaje a štatistika"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Kvórum"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Minimálna diskusia"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Počet hlasov"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Fórum"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Výsledok"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Čaká&nbsp;sa&nbsp;na&nbsp;sponzorov"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Diskutuje&nbsp;sa"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Hlasovanie&nbsp;otvorené"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Rozhodnuté"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Stiahnuté"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Iné"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Domov&nbsp;Stránka&nbsp;Hlasovania"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Ako&nbsp;na&nbsp;to"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Poslať&nbsp;návrh"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Doplniť&nbsp;návrh"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Sledovať&nbsp;návrh"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Prečítať&nbsp;výsledok"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Hlasovať"
diff --git a/slovene/po/bugs.sl.po b/slovene/po/bugs.sl.po
index a951bff6649..3655b704a8f 100644
--- a/slovene/po/bugs.sl.po
+++ b/slovene/po/bugs.sl.po
@@ -23,7 +23,6 @@ msgstr ""
#: ../../english/Bugs/pkgreport-opts.inc:63
#: ../../english/Bugs/pkgreport-opts.inc:97
#, fuzzy
-#| msgid "severities"
msgid "with severity"
msgstr "resnosti"
@@ -45,7 +44,6 @@ msgstr ""
#: ../../english/Bugs/pkgreport-opts.inc:38
#, fuzzy
-#| msgid "status"
msgid "with status"
msgstr "stanja"
@@ -150,13 +148,11 @@ msgstr ""
#: ../../english/Bugs/pkgreport-opts.inc:152
#, fuzzy
-#| msgid "archived bugs"
msgid "Unarchived"
msgstr "arhivirane napake"
#: ../../english/Bugs/pkgreport-opts.inc:155
#, fuzzy
-#| msgid "archived bugs"
msgid "Archived"
msgstr "arhivirane napake"
diff --git a/slovene/po/cdimage.sl.po b/slovene/po/cdimage.sl.po
index 78d598f534d..7aca7a98f2b 100644
--- a/slovene/po/cdimage.sl.po
+++ b/slovene/po/cdimage.sl.po
@@ -9,20 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -127,3 +113,17 @@ msgid ""
"English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
"a> for CDs/DVDs:"
msgstr ""
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/slovene/po/consultants.sl.po b/slovene/po/consultants.sl.po
index 75907148820..2ec4e900437 100644
--- a/slovene/po/consultants.sl.po
+++ b/slovene/po/consultants.sl.po
@@ -9,6 +9,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Seznam svetovalcev"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr ""
@@ -62,11 +70,3 @@ msgid ""
"<total_consultant> Debian consultants listed in <total_country> countries "
"worldwide."
msgstr ""
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Seznam svetovalcev"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
diff --git a/slovene/po/countries.sl.po b/slovene/po/countries.sl.po
index 9e564501681..597cb850789 100644
--- a/slovene/po/countries.sl.po
+++ b/slovene/po/countries.sl.po
@@ -223,215 +223,218 @@ msgid "Kenya"
msgstr "Koreja"
#: ../../english/template/debian/countries.wml:267
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Koreja"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuvajt"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr ""
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Šri lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Litva"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Luksemburg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Latvija"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr ""
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr ""
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr ""
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
#, fuzzy
-#| msgid "Dominican Republic"
msgid "Macedonia, Republic of"
msgstr "Dominikanska republika"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr ""
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr ""
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mehika"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malezija"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr ""
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr ""
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Nizozemska"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norveška"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Nova Zelandija"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
#, fuzzy
msgid "Panama"
msgstr "Kanada"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr ""
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipini"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr ""
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Poljska"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portugalska"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Romunija"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr ""
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusija"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Savdska Arabija"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Švedska"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapur"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovenija"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovaška"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr ""
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Tajska"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr ""
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
#, fuzzy
msgid "Tunisia"
msgstr "Rusija"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Turčija"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Tajvan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
#, fuzzy
msgid "Ukraine"
msgstr "Francija"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Združene države Amerike"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr ""
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr ""
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venecuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Južna Afrika"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabve"
diff --git a/slovene/po/distrib.sl.po b/slovene/po/distrib.sl.po
index 4b48c795ed3..0bad39dc21e 100644
--- a/slovene/po/distrib.sl.po
+++ b/slovene/po/distrib.sl.po
@@ -9,111 +9,111 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
+#: ../../english/distrib/search_packages-form.inc:34
+msgid "Section"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
+#: ../../english/distrib/search_packages-form.inc:36
+msgid "main"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
+#: ../../english/distrib/search_packages-form.inc:37
+msgid "contrib"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
+#: ../../english/distrib/search_packages-form.inc:38
+msgid "non-free"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:34
-msgid "Section"
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:36
-msgid "main"
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:37
-msgid "contrib"
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:38
-msgid "non-free"
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
msgstr ""
#: ../../english/releases/arches.data:8
diff --git a/slovene/po/doc.sl.po b/slovene/po/doc.sl.po
index 2a3dd359f7c..8008e64e8c9 100644
--- a/slovene/po/doc.sl.po
+++ b/slovene/po/doc.sl.po
@@ -9,113 +9,28 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:31
-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:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
-msgid ""
-"Written by two Debian developers, this free book\n"
-" started as a translation of their French best-seller known as Cahier de\n"
-" 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:80
-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:101
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-" covers all aspects of the administration of Debian from the installation\n"
-" 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:120
-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:140
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment. It shows the full potential of "
-"the distribution (in its current version 8) 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:191
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Avtor:"
#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Debianov paket"
+
+#: ../../english/doc/books.def:44
msgid "email:"
msgstr "e-posxta:"
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
msgid "Available at:"
msgstr "Na voljo pri:"
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
msgid "CD Included:"
msgstr "CD prilozxen:"
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
msgid "Publisher:"
msgstr "Zalozxba:"
@@ -139,48 +54,51 @@ msgstr "Stanje:"
msgid "Availability:"
msgstr "Dostopnost:"
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
#, fuzzy
msgid "Latest version:"
msgstr "Izdana razlicxica"
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
msgid "(version <get-var version />)"
msgstr "(razlicxica <get-var version />)"
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
msgid "plain text"
msgstr "navadno besedilo"
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
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:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:177
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
+#: ../../english/doc/manuals.defs:185
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:188
+#: ../../english/doc/manuals.defs:203
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -190,20 +108,109 @@ 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:193
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr "Debianov paket"
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
#, fuzzy
-#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Debianov paket"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/slovene/po/newsevents.sl.po b/slovene/po/newsevents.sl.po
index 8dbad66cbf5..54a72de22c3 100644
--- a/slovene/po/newsevents.sl.po
+++ b/slovene/po/newsevents.sl.po
@@ -9,92 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr ""
-
-#: ../../english/News/news.rdf.in:19
-#, fuzzy
-#| msgid "Latest News"
-msgid "Debian Latest News"
-msgstr "Najnovejše novice"
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "str. <get-var page />"
-
-#: ../../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 "Kmalu"
@@ -152,6 +66,138 @@ msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (mrtva povezava)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"Č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."
+
+#: ../../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 ""
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+#, fuzzy
+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>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+#, 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>."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:25
+#, 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>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:30
+#, 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>."
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#: ../../english/template/debian/weeklynews/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>."
+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."
+
+#. 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\" />Debianov tednik ureja <a href=\"mailto:dwn@debian.org"
+"\">%s</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:20
+#, 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>."
+
+#. One editor name only
+#: ../../english/template/debian/weeklynews/footer.wml:25
+#, 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>."
+
+#. Two or more editors
+#: ../../english/template/debian/weeklynews/footer.wml:30
+#, 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>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -333,149 +379,70 @@ msgid ""
"the following topics:"
msgstr ""
-#: ../../english/template/debian/projectnews/footer.wml:6
-#, fuzzy
-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 ""
-"Č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."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "str. <get-var page />"
-#: ../../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."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
msgstr ""
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
-#, 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>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
msgstr ""
-"<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian.org"
-"\">%s</a>."
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-#, fuzzy
-msgid ""
-"<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
msgstr ""
-"<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian.org"
-"\">%s</a>."
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:25
-#, fuzzy
-msgid ""
-"<void id=\"singular\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
msgstr ""
-"<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian.org"
-"\">%s</a>."
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:30
-#, fuzzy
-msgid ""
-"<void id=\"plural\" />This issue of Debian Project News was edited by <a "
-"href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
msgstr ""
-"<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@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."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:29
+msgid "source"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
msgstr ""
-#. 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."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
msgstr ""
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
msgstr ""
-#: ../../english/template/debian/speakers.wml:9
-#, fuzzy
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
-
-#: ../../english/template/debian/weeklynews/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>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
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."
-#. 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>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
msgstr ""
-"<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian.org"
-"\">%s</a>."
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:20
+#: ../../english/News/news.rdf.in:19
#, 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 "Debian Latest News"
+msgstr "Najnovejše novice"
-#. One editor name only
-#: ../../english/template/debian/weeklynews/footer.wml:25
-#, fuzzy
-msgid ""
-"<void id=\"singular\" />This issue of Debian Weekly News was edited by <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
msgstr ""
-"<void id=\"singular\" />Debianov tednik ureja <a href=\"mailto:dwn@debian.org"
-"\">%s</a>."
-#. Two or more editors
-#: ../../english/template/debian/weeklynews/footer.wml:30
#, 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 "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Nazaj na <a href=\"./\">svetovalce za Debian</a>."
#, fuzzy
#~ msgid ""
diff --git a/slovene/po/organization.sl.po b/slovene/po/organization.sl.po
index dac6d2a11ed..544cebbe350 100644
--- a/slovene/po/organization.sl.po
+++ b/slovene/po/organization.sl.po
@@ -42,299 +42,340 @@ msgid "manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr ""
-
-#: ../../english/intro/organization.data:34
#, fuzzy
msgid "Stable Release Manager"
msgstr "Upravitelj izdaje"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr ""
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr ""
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "predsedujocxi"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
#, fuzzy
msgid "assistant"
msgstr "Upravitelj izdaje"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
#, fuzzy
msgid "secretary"
msgstr "Tajnik"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Funkcionarji"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribucija"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Odnosi z javnostjo"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Podpora in infrastruktura"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Vodja"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Tehnicxna komisija"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Tajnik"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Razvojni projekti"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Arhive FTP"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr ""
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Posamezni paketi"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Upravljanje izdaje"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
#, fuzzy
msgid "Release Team"
msgstr "Upravitelj izdaje"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Zagotavljanje kakovosti"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Skupina za namestitveni sistem"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
#, fuzzy
msgid "Release Notes"
msgstr "Upravitelj izdaje"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD Images"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produkcija"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testiranje"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
#, fuzzy
-#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Podpora in infrastruktura"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
#, fuzzy
-#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Sistemska administracija"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentacija"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
#, fuzzy
msgid "Work-Needing and Prospective Packages list"
msgstr "Seznam nadebudnih in dela potrebnih paketov"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Druge platforme"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Posebne konfiguracije"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Prenosni racxunalniki"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Pozxarni zidovi"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr ""
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Predstavnik za tisk"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Spletne strani"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
#, fuzzy
-#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Razvojni projekti"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Dogodki"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Tehnicxna komisija"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Partnerski program"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr ""
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Podpora uporabnikov"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Sledilnik napak"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
#, fuzzy
-#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Administracija posxtnih seznamov"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
#, fuzzy
-#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Sprejemnica za nove vzdrzxevalce"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
#, fuzzy
msgid "Debian Account Managers"
msgstr "Upravitelji uporabnisxkih imen razvijalcev"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Vzdrzxevalci kljucxev (PGP in GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Skupina za varnost"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Svetovalska stran"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
#, fuzzy
msgid "CD Vendors Page"
msgstr "Prodajalci"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Pravilnik"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Sistemska administracija"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -343,7 +384,7 @@ msgstr ""
"od Debianovih racxunalnikov, vkljucxno s tezxavami z gesli in paketi, ki jih "
"potrebujete."
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:469
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 "
@@ -353,63 +394,38 @@ msgstr ""
"\"https://db.debian.org/machines.cgi\">Debianovi racxunalniki</a>, kjer "
"boste nasxli podatke o administratorjih posameznih racxunalnikov."
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "Skrbnik imenika razvijalcev LDAP"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Zrcalni strezxniki"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "Vzdrzxevalec DNSa"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Sledilnikov paketov"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:491
#, fuzzy
msgid "Salsa administrators"
msgstr "Sistemska administracija"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr ""
-
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr ""
-
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr ""
-
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr ""
-
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr ""
-
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr ""
-
-#: ../../english/intro/organization.data:489
-msgid "Debian for astronomy"
-msgstr ""
+#~ msgid "Individual Packages"
+#~ msgstr "Posamezni paketi"
#, fuzzy
#~| msgid "Installation System Team"
diff --git a/slovene/po/others.sl.po b/slovene/po/others.sl.po
index ad5ff58ef5a..13f71341d9e 100644
--- a/slovene/po/others.sl.po
+++ b/slovene/po/others.sl.po
@@ -57,42 +57,6 @@ msgstr ""
msgid "Unavailable"
msgstr ""
-#: ../../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> "
@@ -152,129 +116,94 @@ msgstr ""
msgid "[Debian] (mini button)"
msgstr ""
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr ""
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr ""
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr ""
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr ""
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr ""
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr ""
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr ""
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr ""
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr ""
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr ""
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr ""
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr ""
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr ""
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr ""
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr ""
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr ""
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr ""
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr ""
@@ -319,6 +248,77 @@ msgstr ""
msgid "URL"
msgstr ""
+#: ../../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/mirror/submit.inc:7
+msgid "same as the above"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
#~ msgid "p<get-var page />"
#~ msgstr "str. <get-var page />"
diff --git a/slovene/po/partners.sl.po b/slovene/po/partners.sl.po
index 021ae624d61..644cd23a422 100644
--- a/slovene/po/partners.sl.po
+++ b/slovene/po/partners.sl.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/slovene/po/ports.sl.po b/slovene/po/ports.sl.po
index 57dbc4d3a60..0c84ba8f7db 100644
--- a/slovene/po/ports.sl.po
+++ b/slovene/po/ports.sl.po
@@ -9,22 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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 ""
@@ -89,6 +73,22 @@ msgstr ""
msgid "Systems"
msgstr ""
+#: ../../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/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr ""
diff --git a/slovene/po/security.sl.po b/slovene/po/security.sl.po
index fb8a8ae20b3..37041e4d806 100644
--- a/slovene/po/security.sl.po
+++ b/slovene/po/security.sl.po
@@ -9,42 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Varnost v Debianu"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Debianova varnostna opozorila"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr ""
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-#, fuzzy
-msgid "Mitre CVE dictionary"
-msgstr "V slovarju Mitre's CVE "
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:92
-#, fuzzy
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Ranljivo"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Izvor:"
@@ -128,3 +92,39 @@ msgstr "CERTova poročila o ranljivosti, opozorila in poročila o incidentih"
msgid "No other external database security references currently available."
msgstr ""
"Trenutno ni na voljo drugih sklicev iz zunanjih varnostnih podatkovnih zbirk."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr ""
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Varnost v Debianu"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Debianova varnostna opozorila"
+
+#: ../../english/security/make-ref-table.pl:81
+#, fuzzy
+msgid "Mitre CVE dictionary"
+msgstr "V slovarju Mitre's CVE "
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr ""
+
+#: ../../english/security/make-ref-table.pl:92
+#, fuzzy
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Ranljivo"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/slovene/po/stats.sl.po b/slovene/po/stats.sl.po
index 3e21b8b0fdf..19dce4ae2ef 100644
--- a/slovene/po/stats.sl.po
+++ b/slovene/po/stats.sl.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/slovene/po/templates.sl.po b/slovene/po/templates.sl.po
index ce308e83519..30abca8d569 100644
--- a/slovene/po/templates.sl.po
+++ b/slovene/po/templates.sl.po
@@ -9,20 +9,9 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/search.xml.in:7
-#, fuzzy
-#| msgid "Debian Security"
-msgid "Debian website"
-msgstr "Varnost v Debianu"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian"
msgstr "Pomagaj Debianu"
@@ -44,10 +33,6 @@ msgstr "Projekt Debian"
#: ../../english/template/debian/common_translation.wml:13
#, fuzzy
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -89,7 +74,6 @@ msgstr "Kontakti"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Spremno besedilo"
@@ -165,10 +149,14 @@ msgstr "Kako do Debiana"
#: ../../english/template/debian/common_translation.wml:91
#, fuzzy
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "Knjige o Debianu"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Nazadnje spremenjeno"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -215,7 +203,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:107
+#: ../../english/template/debian/footer.wml:106
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -224,27 +212,27 @@ msgid ""
"\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
msgstr ""
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Nazadnje spremenjeno"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Avtorske pravice"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr ""
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -260,6 +248,14 @@ msgstr "Ta stran je na voljo tudi v naslednjih jezikih"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Kako nastaviti <a href=m4_HOME/intro/cn>privzeti jezik dokumentov</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian International"
@@ -278,13 +274,11 @@ msgstr "Tednik"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Project News"
msgstr "Projekt Debian"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly News"
msgid "Project News"
msgstr "Tednik"
@@ -310,7 +304,6 @@ msgstr "Knjige o Debianu"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian Wiki"
msgstr "Pomagaj Debianu"
@@ -344,7 +337,6 @@ msgstr "Podatkovna zbirka razvijalcev"
#: ../../english/template/debian/links.tags.wml:64
#, fuzzy
-#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Knjige o Debianu"
@@ -458,7 +450,6 @@ msgstr ""
#: ../../english/template/debian/navbar.wml:10
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "Projekt Debian"
@@ -505,6 +496,15 @@ msgstr ""
msgid "Report"
msgstr "Dan prijave"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -540,11 +540,20 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
#, fuzzy
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Nazaj na ostale <a href=\"./\">novice o Debian</a>."
+#: ../../english/search.xml.in:7
+#, fuzzy
+msgid "Debian website"
+msgstr "Varnost v Debianu"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
#~ msgid "More information"
#~ msgstr "Več podatkov"
diff --git a/slovene/po/vote.sl.po b/slovene/po/vote.sl.po
index 052f978979f..fc3667b5406 100644
--- a/slovene/po/vote.sl.po
+++ b/slovene/po/vote.sl.po
@@ -28,239 +28,270 @@ msgstr "Donacije"
#: ../../english/template/debian/votebar.wml:25
#, fuzzy
+msgid "Withdrawals"
+msgstr "Umaknjeno"
+
+#: ../../english/template/debian/votebar.wml:28
+#, fuzzy
msgid "Debate"
msgstr "Debian CD team"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr ""
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
#, fuzzy
msgid "Proposer"
msgstr "predlagano"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+msgid "Proposal G Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:58
+msgid "Proposal H Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+msgid "Proposal G Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:85
+msgid "Proposal H Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr ""
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr ""
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr ""
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr ""
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr ""
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "predlagano"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "predlagano"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr ""
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr ""
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr ""
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr ""
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr ""
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr ""
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
#, fuzzy
msgid "Minimum Discussion"
msgstr "V&nbsp;diskusiji"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr ""
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Čakamo&nbsp;na&nbsp;pokrovitelje"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "V&nbsp;diskusiji"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "V&nbsp;glasovanju"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Odločeno"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Umaknjeno"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Drugo"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Domača&nbsp;glasovalna&nbsp;stran"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Kako..."
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "podati&nbsp;predlog"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "podati&nbsp;amandma&nbsp;k&nbsp;predlogu"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "spremljati&nbsp;predlog"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "prebrati&nbsp;izide"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "glasovati"
diff --git a/spanish/po/cdimage.es.po b/spanish/po/cdimage.es.po
index a1b02167ca0..36940e1127b 100644
--- a/spanish/po/cdimage.es.po
+++ b/spanish/po/cdimage.es.po
@@ -15,20 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n"
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../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:87
-msgid "ISO images"
-msgstr "imágenes ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "archivos Jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -125,3 +111,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Lista pública de correo</a> en inglés "
"para CD/DVD:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "imágenes ISO"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "archivos Jigdo"
diff --git a/spanish/po/consultants.es.po b/spanish/po/consultants.es.po
index 0654bc5bd3d..5b5a895933f 100644
--- a/spanish/po/consultants.es.po
+++ b/spanish/po/consultants.es.po
@@ -15,6 +15,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Lista de consultores"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "Volver a la <a href=\"./\">página de consultores de Debian</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Nombre:"
@@ -70,11 +78,3 @@ msgid ""
msgstr ""
"<total_consultant> consultores de Debian en total en <total_country> países "
"por todo el mundo."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Lista de consultores"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "Volver a la <a href=\"./\">página de consultores de Debian</a>."
diff --git a/spanish/po/distrib.es.po b/spanish/po/distrib.es.po
index 55c39080a60..31857f584cd 100644
--- a/spanish/po/distrib.es.po
+++ b/spanish/po/distrib.es.po
@@ -15,98 +15,67 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Palabra clave"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Mostrar"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Buscar en"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "rutas que terminen en la palabra clave"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Sólo nombres de paquetes"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "paquetes que contienen ficheros con ese nombre"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Descripciones"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr ""
-"paquetes que contiene ficheros cuyos nombres contienen la palabra clave"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Nombres de paquetes fuente"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Sólo mostrar coincidencias exactas"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Distribución"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "inestable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "de pruebas"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "estable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "antigua estable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Architectura"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "cualquiera"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Buscar"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Borrar"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Buscar en"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Sólo nombres de paquetes"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Descripciones"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Nombres de paquetes fuente"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Sólo mostrar coincidencias exactas"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Sección"
@@ -123,6 +92,37 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Buscar"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Borrar"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Mostrar"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "rutas que terminen en la palabra clave"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "paquetes que contienen ficheros con ese nombre"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr ""
+"paquetes que contiene ficheros cuyos nombres contienen la palabra clave"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Architectura"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
diff --git a/spanish/po/doc.es.po b/spanish/po/doc.es.po
index c95495602cb..f10d89667e5 100644
--- a/spanish/po/doc.es.po
+++ b/spanish/po/doc.es.po
@@ -17,6 +17,121 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n"
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../../english/doc/books.def:41
+msgid "Debian Release:"
+msgstr "Versión de Debian:"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "correo:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Disponible en:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "CD incluido:"
+
+#: ../../english/doc/books.def:54
+msgid "Publisher:"
+msgstr "Editor:"
+
+#: ../../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 "Mantenedores:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Disponibilidad:"
+
+#: ../../english/doc/manuals.defs:97
+msgid "Latest version:"
+msgstr "Última versión:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(versión <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "texto sin formato"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/git\">Git</a> repository."
+msgstr ""
+"El último código fuente <get-var srctype /> está disponible en el "
+"repositorio <a href=\"https://packages.debian.org/git\">Git</a>."
+
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Interfaz web:"
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "Interfaz VCS:"
+
+#: ../../english/doc/manuals.defs:177
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/cvs\">Cvs</a> repository."
+msgstr ""
+"El último código fuente <get-var srctype /> está disponible en el "
+"repositorio <a href=\"https://packages.debian.org/cvs\">Cvs</a>."
+
+#: ../../english/doc/manuals.defs:185
+msgid ""
+"The latest <get-var srctype /> source is available through the <a href="
+"\"https://packages.debian.org/subversion\">Subversion</a> repository."
+msgstr ""
+"El último código fuente <get-var srctype /> está disponible en el "
+"repositorio <a href=\"https://packages.debian.org/subversion\">Subversion</a>"
+
+#: ../../english/doc/manuals.defs:203
+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 trabajo del CVS: establezca <kbd>:ext:<var>userid</var>@cvs.debian."
+"org:/cvs/debian-boot</kbd> como valor de <code>CVSROOT</code> y descargue el "
+"módulo <kbd>boot-floppies/documentation</kbd>."
+
+#: ../../english/doc/manuals.defs:208
+msgid "CVS via web"
+msgstr "CVS a través del web"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Paquete Debian"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Paquete Debian (archivado)"
+
#: ../../english/doc/books.data:32
msgid ""
"\n"
@@ -180,121 +295,6 @@ msgstr ""
" vulnerabilidades de MySQL y antivirus comercial Symantec, incluyendo el "
"sistema de detección de intrusos Snort."
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/doc/books.def:41
-msgid "Debian Release:"
-msgstr "Versión de Debian:"
-
-#: ../../english/doc/books.def:44
-msgid "email:"
-msgstr "correo:"
-
-#: ../../english/doc/books.def:48
-msgid "Available at:"
-msgstr "Disponible en:"
-
-#: ../../english/doc/books.def:51
-msgid "CD Included:"
-msgstr "CD incluido:"
-
-#: ../../english/doc/books.def:54
-msgid "Publisher:"
-msgstr "Editor:"
-
-#: ../../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 "Mantenedores:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Estado:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Disponibilidad:"
-
-#: ../../english/doc/manuals.defs:97
-msgid "Latest version:"
-msgstr "Última versión:"
-
-#: ../../english/doc/manuals.defs:113
-msgid "(version <get-var version />)"
-msgstr "(versión <get-var version />)"
-
-#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "texto sin formato"
-
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:193
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/git\">Git</a> repository."
-msgstr ""
-"El último código fuente <get-var srctype /> está disponible en el "
-"repositorio <a href=\"https://packages.debian.org/git\">Git</a>."
-
-#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
-#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
-#: ../../english/doc/manuals.defs:195
-msgid "Web interface: "
-msgstr "Interfaz web:"
-
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
-#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
-#: ../../english/doc/manuals.defs:196
-msgid "VCS interface: "
-msgstr "Interfaz VCS:"
-
-#: ../../english/doc/manuals.defs:177
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/cvs\">Cvs</a> repository."
-msgstr ""
-"El último código fuente <get-var srctype /> está disponible en el "
-"repositorio <a href=\"https://packages.debian.org/cvs\">Cvs</a>."
-
-#: ../../english/doc/manuals.defs:185
-msgid ""
-"The latest <get-var srctype /> source is available through the <a href="
-"\"https://packages.debian.org/subversion\">Subversion</a> repository."
-msgstr ""
-"El último código fuente <get-var srctype /> está disponible en el "
-"repositorio <a href=\"https://packages.debian.org/subversion\">Subversion</a>"
-
-#: ../../english/doc/manuals.defs:203
-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 trabajo del CVS: establezca <kbd>:ext:<var>userid</var>@cvs.debian."
-"org:/cvs/debian-boot</kbd> como valor de <code>CVSROOT</code> y descargue el "
-"módulo <kbd>boot-floppies/documentation</kbd>."
-
-#: ../../english/doc/manuals.defs:208
-msgid "CVS via web"
-msgstr "CVS a través del web"
-
-#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
-msgid "Debian package"
-msgstr "Paquete Debian"
-
-#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
-msgid "Debian package (archived)"
-msgstr "Paquete Debian (archivado)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/spanish/po/newsevents.es.po b/spanish/po/newsevents.es.po
index 47af322ae9e..d7e2005fc33 100644
--- a/spanish/po/newsevents.es.po
+++ b/spanish/po/newsevents.es.po
@@ -42,66 +42,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.10\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Noticias de Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Últimas noticias de 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 "El boletín para la comunidad Debian"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Título:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Idioma:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Fecha:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Evento:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Transparencias:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "fuente"
-
-#: ../../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 "Resumen"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Próximas atracciones"
@@ -160,6 +100,136 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (enlace no válido)"
+#: ../../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 ""
+"Para recibir este boletín en su buzón, <a href=\"https://lists.debian.org/"
+"debian-news/\">suscríbase a la lista de correo 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 ""
+"Puede conseguir <a href=\"../../\">ejemplares anteriores</a> de este boletín."
+
+#. 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\" />La edición de las Noticias del Proyecto Debian la "
+"realizó <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\" />La edición de las Noticias del Proyecto Debian la "
+"realizaron <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\" />Esta edición de las Noticias del Proyecto Debian la "
+"editó <a href=\"mailto:debian-publicity@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\" />Esta edición de las Noticias del Proyecto Debian la "
+"editaron <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\" />La tradujo <a href=\"mailto:debian-l10n-"
+"spanish@lists.debian.org\">%s</a>."
+
+#. 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\" /> La tradujeron <a href=\"mailto:debian-l10n-"
+"spanish@lists.debian.org\">%s</a>."
+
+#. 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\" />Fue traducida por <a href=\\\"mailto:debian-"
+"l10n-spanish@lists.debian.org\\\">%s</a>."
+
+#. 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\" />Fue traducida por <a href=\\\"mailto:debian-l10n-"
+"spanish@lists.debian.org\\\">%s</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 ""
+"Para recibir este boletín semanalmente en su buzón, <a href=\"https://lists."
+"debian.org/debian-news/\">suscríbase</a> a la lista de correo debian-news."
+
+#. 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\" />Las Noticias Semanales de Debian son editadas por <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\" />Las Noticias Semanales de Debian son editadas por <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\" />Esta edición de las Noticias Semanales de Debian fue "
+"realizada por <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\" />Las Noticias Semanales de Debian son editadas por <a "
+"href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -414,135 +484,65 @@ msgstr ""
"\"<get-var url-devel-news />\">noticias variadas para desarrolladores</a> y "
"abarca los siguientes temas:"
-#: ../../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 ""
-"Para recibir este boletín en su buzón, <a href=\"https://lists.debian.org/"
-"debian-news/\">suscríbase a la lista de correo debian-news</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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 ""
-"Puede conseguir <a href=\"../../\">ejemplares anteriores</a> de este boletín."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Título:"
-#. 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\" />La edición de las Noticias del Proyecto Debian la "
-"realizó <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Autor:"
-#. 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\" />La edición de las Noticias del Proyecto Debian la "
-"realizaron <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Idioma:"
-#. 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\" />Esta edición de las Noticias del Proyecto Debian la "
-"editó <a href=\"mailto:debian-publicity@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Fecha:"
-#. 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\" />Esta edición de las Noticias del Proyecto Debian la "
-"editaron <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Evento:"
-#. 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\" />La tradujo <a href=\"mailto:debian-l10n-"
-"spanish@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Transparencias:"
-#. 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\" /> La tradujeron <a href=\"mailto:debian-l10n-"
-"spanish@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "fuente"
-#. 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\" />Fue traducida por <a href=\\\"mailto:debian-"
-"l10n-spanish@lists.debian.org\\\">%s</a>."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Fue traducida por <a href=\\\"mailto:debian-l10n-"
-"spanish@lists.debian.org\\\">%s</a>."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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 ""
-"Para recibir este boletín semanalmente en su buzón, <a href=\"https://lists."
-"debian.org/debian-news/\">suscríbase</a> a la lista de correo debian-news."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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\" />Las Noticias Semanales de Debian son editadas por <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Resumen"
-#. 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\" />Las Noticias Semanales de Debian son editadas por <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Noticias de 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\" />Esta edición de las Noticias Semanales de Debian fue "
-"realizada por <a href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Últimas noticias de 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\" />Las Noticias Semanales de Debian son editadas por <a "
-"href=\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "El boletín para la comunidad Debian"
#~ msgid "Name:"
#~ msgstr "Nombre:"
diff --git a/spanish/po/organization.es.po b/spanish/po/organization.es.po
index 6235bbb1991..f375b4a77a7 100644
--- a/spanish/po/organization.es.po
+++ b/spanish/po/organization.es.po
@@ -50,13 +50,13 @@ msgid "manager"
msgstr "gestor"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM (resp. public. vers. estable)"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Responsable de publicación de la versión estable"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM (resp. public. vers. estable)"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "mago"
diff --git a/spanish/po/organization.es.temp.po b/spanish/po/organization.es.temp.po
index 45a47596295..97666cd4f26 100644
--- a/spanish/po/organization.es.temp.po
+++ b/spanish/po/organization.es.temp.po
@@ -50,339 +50,405 @@ msgid "manager"
msgstr "gestor"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Responsable de publicación de la versión estable"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "mago"
-#: ../../english/intro/organization.data:39
-msgid "chairman"
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
+#, fuzzy
+msgid "chair"
msgstr "presidente"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "asistente"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "secretario"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Directores"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distribución"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Comunicación y extensión"
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr "Equipo de protección de datos"
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Equipo de publicidad"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:303
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Apoyo e infrastructura"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr "Debian Pure Blends"
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Líder"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Comité técnico"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Secretario"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Proyectos de desarrollo"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Archivo FTP"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "Responsables del FTP"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Ayudantes de FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Magos del FTP"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Grupo de Backports"
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Paquetes individuales"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Gestión de la publicación versiones"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Equipo responsable de la publicación"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Garantía de calidad"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Equipo del sistema de instalación"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr "Equipo de Debian «en vivo»"
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Notas de la publicación"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Imágenes de CD"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Producción"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Pruebas"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infrastructura de autocompiladores"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Equipo de wanna-build"
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Administración de buildd"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Documentación"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Lista de paquetes en perspectiva o en los que se necesita ayuda"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr "Equipo de Debian «en vivo»"
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Adaptaciones"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Configuraciones Especiales"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Portátiles"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Cortafuegos"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Sistemas embebidos"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Contacto de Prensa"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Páginas web"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Planeta Debian"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr "Extensión"
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Proyectos Mujeres Debian"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr "Anti acoso"
-#: ../../english/intro/organization.data:275
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Eventos"
-#: ../../english/intro/organization.data:281
+#: ../../english/intro/organization.data:289
msgid "DebConf Committee"
msgstr "Comité de la DebConf"
-#: ../../english/intro/organization.data:288
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Programa de Socios"
-#: ../../english/intro/organization.data:293
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Coordinación de donaciones de hardware"
-#: ../../english/intro/organization.data:306
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Soporte a usuarios"
-#: ../../english/intro/organization.data:373
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Sistema de seguimiento de errores"
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:414
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:386
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr "Recepción de nuevos miembros"
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Gestores de cuentas de Debian"
-#: ../../english/intro/organization.data:396
-msgid "To send a private message to all DAMs, use the GPG key 57731224A9762EA155AB2A530CA8D15BB24D96F2."
-msgstr "Para enviar un mensaje privado a todos los Gestores de cuentas de Debian, use la clave GPG 57731224A9762EA155AB2A530CA8D15BB24D96F2."
+#: ../../english/intro/organization.data:432
+msgid ""
+"To send a private message to all DAMs, use the GPG key "
+"57731224A9762EA155AB2A530CA8D15BB24D96F2."
+msgstr ""
+"Para enviar un mensaje privado a todos los Gestores de cuentas de Debian, "
+"use la clave GPG 57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Responsable del anillo de claves (PGP y GPG)"
-#: ../../english/intro/organization.data:400
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Equipo de seguridad"
-#: ../../english/intro/organization.data:412
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Página de consultores"
-#: ../../english/intro/organization.data:417
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "Página de vendedores de CDs"
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Normativa"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Administración del sistema"
-#: ../../english/intro/organization.data:426
-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 "Esta es la dirección a usar en caso de encontrar problemas en alguna de las máquinas de Debian, incluyendo problemas con las claves o si usted necesita que se instale algun paquete."
+#: ../../english/intro/organization.data:460
+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 ""
+"Esta es la dirección a usar en caso de encontrar problemas en alguna de las "
+"máquinas de Debian, incluyendo problemas con las claves o si usted necesita "
+"que se instale algun paquete."
-#: ../../english/intro/organization.data:435
-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 "Si tiene problemas con las máquinas de Debian, por favor, vea la página de <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:469
+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 ""
+"Si tiene problemas con las máquinas de Debian, por favor, vea la página de "
+"<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:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "Administrador del directorio LDAP de desarrolladores"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Réplicas"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "Responsable del DNS"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Sistema de seguimiento de paquetes"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr "Tesorería"
-#: ../../english/intro/organization.data:453
-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:488
+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:456
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Administradores de Salsa"
-#: ../../english/intro/organization.data:460
-msgid "Alioth administrators"
-msgstr "Administradores de Alioth"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
-#: ../../english/intro/organization.data:473
-msgid "Debian for children from 1 to 99"
-msgstr "Debian para niños de 1 a 99"
+#~ msgid "Individual Packages"
+#~ msgstr "Paquetes individuales"
-#: ../../english/intro/organization.data:476
-msgid "Debian for medical practice and research"
-msgstr "Debian para investigación y práctica médica"
+#~ msgid "Alioth administrators"
+#~ msgstr "Administradores de Alioth"
-#: ../../english/intro/organization.data:479
-msgid "Debian for education"
-msgstr "Debian para la educación"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian para niños de 1 a 99"
-#: ../../english/intro/organization.data:484
-msgid "Debian in legal offices"
-msgstr "Debian en oficinas de abogados"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian para investigación y práctica médica"
-#: ../../english/intro/organization.data:488
-msgid "Debian for people with disabilities"
-msgstr "Debian para personas con discapacidades"
+#~ msgid "Debian for education"
+#~ msgstr "Debian para la educación"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian en oficinas de abogados"
+
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian para personas con discapacidades"
-#: ../../english/intro/organization.data:492
-msgid "Debian for science and related research"
-msgstr "Debian para la ciencia e investigación relacionada"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian para la ciencia e investigación relacionada"
-#: ../../english/intro/organization.data:495
-msgid "Debian for astronomy"
-msgstr "Debian para la astronomía"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian para la astronomía"
#~ msgid "Auditor"
#~ msgstr "Auditor"
diff --git a/spanish/po/others.es.po b/spanish/po/others.es.po
index 97acbd31d97..df66428062b 100644
--- a/spanish/po/others.es.po
+++ b/spanish/po/others.es.po
@@ -63,42 +63,6 @@ msgstr "<void id=\"d-i\" />Desconocido"
msgid "Unavailable"
msgstr "No disponible"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "El rincón de los nuevos miembros"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Paso 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Paso 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Paso 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Paso 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Paso 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Paso 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Paso 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Lista de solicitantes"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -134,6 +98,34 @@ msgstr "Fax"
msgid "Address"
msgstr "Dirección"
+#: ../../english/logos/index.data:6
+msgid "With&nbsp;``Debian''"
+msgstr "Con&nbsp;«Debian»"
+
+#: ../../english/logos/index.data:9
+msgid "Without&nbsp;``Debian''"
+msgstr "Sin&nbsp;«Debian»"
+
+#: ../../english/logos/index.data:12
+msgid "Encapsulated PostScript"
+msgstr "PostScript encapsulado (EPS)"
+
+#: ../../english/logos/index.data:18
+msgid "[Powered by Debian]"
+msgstr "[Funciona con Debian]"
+
+#: ../../english/logos/index.data:21
+msgid "[Powered by Debian GNU/Linux]"
+msgstr "[Funciona con Debian GNU/Linux]"
+
+#: ../../english/logos/index.data:24
+msgid "[Debian powered]"
+msgstr "[Funciona con Debian]"
+
+#: ../../english/logos/index.data:27
+msgid "[Debian] (mini button)"
+msgstr "[Debian] (mini botón)"
+
#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Productos"
@@ -222,33 +214,85 @@ msgstr "Dona dinero a Debian"
msgid "Money is used to organize local free software events"
msgstr "El dinero se utiliza para organizar actos locales sobre software libre"
-#: ../../english/logos/index.data:6
-msgid "With&nbsp;``Debian''"
-msgstr "Con&nbsp;«Debian»"
+#: ../../english/y2k/l10n.data:6
+msgid "OK"
+msgstr "Bien"
-#: ../../english/logos/index.data:9
-msgid "Without&nbsp;``Debian''"
-msgstr "Sin&nbsp;«Debian»"
+#: ../../english/y2k/l10n.data:9
+msgid "BAD"
+msgstr "Mal"
-#: ../../english/logos/index.data:12
-msgid "Encapsulated PostScript"
-msgstr "PostScript encapsulado (EPS)"
+#: ../../english/y2k/l10n.data:12
+msgid "OK?"
+msgstr "¿Bien?"
-#: ../../english/logos/index.data:18
-msgid "[Powered by Debian]"
-msgstr "[Funciona con Debian]"
+#: ../../english/y2k/l10n.data:15
+msgid "BAD?"
+msgstr "¿Mal?"
-#: ../../english/logos/index.data:21
-msgid "[Powered by Debian GNU/Linux]"
-msgstr "[Funciona con Debian GNU/Linux]"
+#: ../../english/y2k/l10n.data:18
+msgid "??"
+msgstr "¿?"
-#: ../../english/logos/index.data:24
-msgid "[Debian powered]"
-msgstr "[Funciona con Debian]"
+#: ../../english/y2k/l10n.data:21
+msgid "Unknown"
+msgstr "Se desconoce"
-#: ../../english/logos/index.data:27
-msgid "[Debian] (mini button)"
-msgstr "[Debian] (mini botón)"
+#: ../../english/y2k/l10n.data:24
+msgid "ALL"
+msgstr "Todos"
+
+#: ../../english/y2k/l10n.data:27
+msgid "Package"
+msgstr "Paquete"
+
+#: ../../english/y2k/l10n.data:30
+msgid "Status"
+msgstr "Estado"
+
+#: ../../english/y2k/l10n.data:33
+msgid "Version"
+msgstr "Versión"
+
+#: ../../english/y2k/l10n.data:36
+msgid "URL"
+msgstr "URL"
+
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "El rincón de los nuevos miembros"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Paso 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Paso 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Paso 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Paso 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Paso 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Paso 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Paso 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Lista de solicitantes"
#: ../../english/mirror/submit.inc:7
msgid "same as the above"
@@ -288,50 +332,6 @@ msgstr ""
msgid "A bit more about you..."
msgstr "Cuéntanos algo más sobre ti..."
-#: ../../english/y2k/l10n.data:6
-msgid "OK"
-msgstr "Bien"
-
-#: ../../english/y2k/l10n.data:9
-msgid "BAD"
-msgstr "Mal"
-
-#: ../../english/y2k/l10n.data:12
-msgid "OK?"
-msgstr "¿Bien?"
-
-#: ../../english/y2k/l10n.data:15
-msgid "BAD?"
-msgstr "¿Mal?"
-
-#: ../../english/y2k/l10n.data:18
-msgid "??"
-msgstr "¿?"
-
-#: ../../english/y2k/l10n.data:21
-msgid "Unknown"
-msgstr "Se desconoce"
-
-#: ../../english/y2k/l10n.data:24
-msgid "ALL"
-msgstr "Todos"
-
-#: ../../english/y2k/l10n.data:27
-msgid "Package"
-msgstr "Paquete"
-
-#: ../../english/y2k/l10n.data:30
-msgid "Status"
-msgstr "Estado"
-
-#: ../../english/y2k/l10n.data:33
-msgid "Version"
-msgstr "Versión"
-
-#: ../../english/y2k/l10n.data:36
-msgid "URL"
-msgstr "URL"
-
#~ msgid "p<get-var page />"
#~ msgstr "pág.<get-var page />"
diff --git a/spanish/po/ports.es.po b/spanish/po/ports.es.po
index 11cea11fbe5..58190f7fd19 100644
--- a/spanish/po/ports.es.po
+++ b/spanish/po/ports.es.po
@@ -14,22 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian para Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian para PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "CD de Hurd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian para IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Contactos"
@@ -94,6 +78,22 @@ msgstr "Suministro"
msgid "Systems"
msgstr "Sistemas"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian para Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian para PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "CD de Hurd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian para IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD para i386"
diff --git a/spanish/po/security.es.po b/spanish/po/security.es.po
index e4f12e2bb0a..cd67f5d7a06 100644
--- a/spanish/po/security.es.po
+++ b/spanish/po/security.es.po
@@ -14,42 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Seguridad en Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Avisos de seguridad de Debian"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "P"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"avisos de seguridad <a href=\\\"undated/\\\">sin fechar</a>, incluidos para "
-"la posteridad"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Diccionario CVE de Mitre"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Base de datos Bugtraq de Securityfocus"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Avisos del CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Notas de vulnerabilidades US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Fuentes:"
@@ -134,5 +98,41 @@ msgstr ""
"No se dispone, de momento, de referencias a otras bases de datos de "
"seguridad externas."
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "P"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Seguridad en Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Avisos de seguridad de Debian"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Diccionario CVE de Mitre"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Base de datos Bugtraq de Securityfocus"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Avisos del CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Notas de vulnerabilidades US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"avisos de seguridad <a href=\\\"undated/\\\">sin fechar</a>, incluidos para "
+"la posteridad"
+
#~ msgid "CERT alerts"
#~ msgstr "Alertas del CERT"
diff --git a/spanish/po/stats.es.po b/spanish/po/stats.es.po
index f80aeaf3973..ea2977430e3 100644
--- a/spanish/po/stats.es.po
+++ b/spanish/po/stats.es.po
@@ -40,22 +40,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.11\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Estadísticas de traducción del sitio web de Debian"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Hay %d páginas por traducir."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Hay %d bytes por traducir."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Hay %d cadenas de caracteres por traducir."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Versión incorrecta de traducción"
@@ -73,13 +57,13 @@ msgid "The original no longer exists"
msgstr "La original ya no existe"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "contador de visitas N/A"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "visitas"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "contador de visitas N/A"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Haga clic para obtener la información de diffstat"
@@ -92,15 +76,6 @@ msgstr "Creado con <transstatslink>"
msgid "Translation summary for"
msgstr "Resumen de traducción para"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Sin traducir"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Desactualizado"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Traducido"
@@ -110,6 +85,15 @@ msgstr "Traducido"
msgid "Up to date"
msgstr "Actualizado"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Desactualizado"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Sin traducir"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -260,6 +244,22 @@ msgstr "Páginas web traducidas (por tamaño)"
msgid "Translation Statistics by Page Size"
msgstr "Estadísticas de traducción por tamaño de las páginas"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Estadísticas de traducción del sitio web de Debian"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Hay %d páginas por traducir."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Hay %d bytes por traducir."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Hay %d cadenas de caracteres por traducir."
+
#~ msgid "Created with"
#~ msgstr "Creado por"
diff --git a/spanish/po/templates.es.po b/spanish/po/templates.es.po
index cd82672596f..aa1f9a9ad28 100644
--- a/spanish/po/templates.es.po
+++ b/spanish/po/templates.es.po
@@ -15,14 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Sitio web de Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Buscar en el sitio web de Debian."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -555,6 +547,14 @@ 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>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Sitio web de Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Buscar en el sitio web de Debian."
+
#~ msgid "List of Consultants"
#~ msgstr "Lista de consultores"
diff --git a/swedish/po/cdimage.sv.po b/swedish/po/cdimage.sv.po
index 6ddf51ce205..55670710e4c 100644
--- a/swedish/po/cdimage.sv.po
+++ b/swedish/po/cdimage.sv.po
@@ -12,20 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr "Nyckelns fingeravtryck"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr "ISO-avbildningar"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo-filer"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -122,3 +108,17 @@ msgid ""
msgstr ""
"Engelskspråkig <a href=\"/MailingLists/disclaimer\">öppen sändlista</a> för "
"cd/dvd:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO-avbildningar"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo-filer"
diff --git a/swedish/po/consultants.sv.po b/swedish/po/consultants.sv.po
index d33a45a7efb..e411fa64643 100644
--- a/swedish/po/consultants.sv.po
+++ b/swedish/po/consultants.sv.po
@@ -12,6 +12,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+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>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Namn:"
@@ -67,11 +75,3 @@ msgid ""
msgstr ""
"<total_consultant> Debiankonsulter i <total_country> länder över hela "
"världen visade."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-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 716f167e163..017c74a5c3e 100644
--- a/swedish/po/distrib.sv.po
+++ b/swedish/po/distrib.sv.po
@@ -14,97 +14,67 @@ msgstr ""
"X-Generator: Poedit 1.8.11\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Nyckelord"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Visa"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Sök på"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "sökvägar som slutar med nyckelordet"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Endast paketnamn"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "paket som innehåller filer med namnet"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Beskrivningar"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "paket som innehåller filer med nyckelordet i namnet"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Namn på källkodspaket"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Endast exakta träffar"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Sök i"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "experimental"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "unstable"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "testing"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "stable"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "gammal stable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Arkitektur"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "alla"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Sök"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Nollställ"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Sök på"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Endast paketnamn"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Beskrivningar"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Namn på källkodspaket"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Endast exakta träffar"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Avdelning"
@@ -121,6 +91,36 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Sök"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Nollställ"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Visa"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "sökvägar som slutar med nyckelordet"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "paket som innehåller filer med namnet"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "paket som innehåller filer med nyckelordet i namnet"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Arkitektur"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
diff --git a/swedish/po/doc.sv.po b/swedish/po/doc.sv.po
index a67cfd1fc71..086f0bdcf41 100644
--- a/swedish/po/doc.sv.po
+++ b/swedish/po/doc.sv.po
@@ -14,6 +14,121 @@ msgstr ""
"X-Generator: Poedit 1.8.11\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ../../english/doc/books.def:38
+msgid "Author:"
+msgstr "Författare:"
+
+#: ../../english/doc/books.def:41
+msgid "Debian Release:"
+msgstr "Debianutgåva:"
+
+#: ../../english/doc/books.def:44
+msgid "email:"
+msgstr "E-post:"
+
+#: ../../english/doc/books.def:48
+msgid "Available at:"
+msgstr "Finns att köpa hos:"
+
+#: ../../english/doc/books.def:51
+msgid "CD Included:"
+msgstr "Medföljande cd:"
+
+#: ../../english/doc/books.def:54
+msgid "Publisher:"
+msgstr "Förlag:"
+
+#: ../../english/doc/manuals.defs:28
+msgid "Authors:"
+msgstr "Författare:"
+
+#: ../../english/doc/manuals.defs:35
+msgid "Editors:"
+msgstr "Redaktörer:"
+
+#: ../../english/doc/manuals.defs:42
+msgid "Maintainer:"
+msgstr "Ansvarig:"
+
+#: ../../english/doc/manuals.defs:49
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../english/doc/manuals.defs:56
+msgid "Availability:"
+msgstr "Tillgänglighet:"
+
+#: ../../english/doc/manuals.defs:97
+msgid "Latest version:"
+msgstr "Senaste version:"
+
+#: ../../english/doc/manuals.defs:113
+msgid "(version <get-var version />)"
+msgstr "(version <get-var version />)"
+
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
+msgid "plain text"
+msgstr "ren text"
+
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
+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:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
+msgid "Web interface: "
+msgstr "Webbgränssnitt: "
+
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
+msgid "VCS interface: "
+msgstr "VCS-gränssnitt: "
+
+#: ../../english/doc/manuals.defs:177
+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:185
+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:203
+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>."
+
+#: ../../english/doc/manuals.defs:208
+msgid "CVS via web"
+msgstr "CVS via webben"
+
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
+msgid "Debian package"
+msgstr "Debianpaketet"
+
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
+msgid "Debian package (archived)"
+msgstr "Debianpaketet (arkiverat)"
+
#: ../../english/doc/books.data:32
msgid ""
"\n"
@@ -164,118 +279,6 @@ msgstr ""
" MySQL Sårbarheter, kommersiell antivirus Symantec, inklusive\n"
" intrångsdetekteringssystemet Snort."
-#: ../../english/doc/books.def:38
-msgid "Author:"
-msgstr "Författare:"
-
-#: ../../english/doc/books.def:41
-msgid "Debian Release:"
-msgstr "Debianutgåva:"
-
-#: ../../english/doc/books.def:44
-msgid "email:"
-msgstr "E-post:"
-
-#: ../../english/doc/books.def:48
-msgid "Available at:"
-msgstr "Finns att köpa hos:"
-
-#: ../../english/doc/books.def:51
-msgid "CD Included:"
-msgstr "Medföljande cd:"
-
-#: ../../english/doc/books.def:54
-msgid "Publisher:"
-msgstr "Förlag:"
-
-#: ../../english/doc/manuals.defs:28
-msgid "Authors:"
-msgstr "Författare:"
-
-#: ../../english/doc/manuals.defs:35
-msgid "Editors:"
-msgstr "Redaktörer:"
-
-#: ../../english/doc/manuals.defs:42
-msgid "Maintainer:"
-msgstr "Ansvarig:"
-
-#: ../../english/doc/manuals.defs:49
-msgid "Status:"
-msgstr "Status:"
-
-#: ../../english/doc/manuals.defs:56
-msgid "Availability:"
-msgstr "Tillgänglighet:"
-
-#: ../../english/doc/manuals.defs:97
-msgid "Latest version:"
-msgstr "Senaste version:"
-
-#: ../../english/doc/manuals.defs:113
-msgid "(version <get-var version />)"
-msgstr "(version <get-var version />)"
-
-#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
-msgid "plain text"
-msgstr "ren text"
-
-#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:183
-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:161 ../../english/doc/manuals.defs:169
-#: ../../english/doc/manuals.defs:177 ../../english/doc/manuals.defs:185
-msgid "Web interface: "
-msgstr "Webbgränssnitt: "
-
-#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:170
-#: ../../english/doc/manuals.defs:178 ../../english/doc/manuals.defs:186
-msgid "VCS interface: "
-msgstr "VCS-gränssnitt: "
-
-#: ../../english/doc/manuals.defs:167
-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:175
-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:193
-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>."
-
-#: ../../english/doc/manuals.defs:198
-msgid "CVS via web"
-msgstr "CVS via webben"
-
-#: ../../english/doc/manuals.defs:202 ../../english/doc/manuals.defs:206
-msgid "Debian package"
-msgstr "Debianpaketet"
-
-#: ../../english/doc/manuals.defs:211 ../../english/doc/manuals.defs:215
-msgid "Debian package (archived)"
-msgstr "Debianpaketet (arkiverat)"
-
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/swedish/po/newsevents.sv.po b/swedish/po/newsevents.sv.po
index 7947a9b86ca..dd58b7465fc 100644
--- a/swedish/po/newsevents.sv.po
+++ b/swedish/po/newsevents.sv.po
@@ -16,66 +16,6 @@ msgstr ""
"X-Generator: Poedit 1.6.10\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Debiannyheter"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Debians Senaste Nytt"
-
-#: ../../english/News/press/press.tags:11
-msgid "p<get-var page />"
-msgstr "s.<get-var page />"
-
-#: ../../english/News/weekly/dwn-to-rdf.pl:143
-msgid "The newsletter for the Debian community"
-msgstr "Nyhetsbrevet för Debiangemenskapen"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Författare:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Språk:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Datum:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Händelse:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Presentationsbilder:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "källkod"
-
-#: ../../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 "sammanfattning"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Kommande tilldragelser"
@@ -134,6 +74,127 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (död länk)"
+#: ../../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 ""
+"För att få det här nyhetsbrevet i din inbox, <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å."
+
+#. 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>."
+
+#. 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>."
+
+#. 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>."
+
+#. 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>."
+
+#. 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 "Det översattes av %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 "Det översattes av %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 "Det översattes av %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 "Det översattes av %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 ""
+"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>."
+
+#. 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>."
+
+#. 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>."
+
+#. 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>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -383,126 +444,65 @@ msgstr ""
"\">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 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 i din inbox, <a href=\"https://lists.debian."
-"org/debian-news/\">prenumerera på sändlistan debian-news</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "s.<get-var page />"
-#: ../../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å."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Titel:"
-#. 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>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Författare:"
-#. 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>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Språk:"
-#. 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>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Datum:"
-#. 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>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Händelse:"
-#. 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 "Det översattes av %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Presentationsbilder:"
-#. 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 "Det översattes av %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "källkod"
-#. 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 "Det översattes av %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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 "Det översattes av %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../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>."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#. 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>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "sammanfattning"
-#. 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>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Debiannyheter"
-#. 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>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Debians Senaste Nytt"
-#. 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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Nyhetsbrevet för Debiangemenskapen"
#~ msgid ""
#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
diff --git a/swedish/po/organization.sv.po b/swedish/po/organization.sv.po
index c885644ff08..906c2a11a58 100644
--- a/swedish/po/organization.sv.po
+++ b/swedish/po/organization.sv.po
@@ -49,13 +49,13 @@ msgid "manager"
msgstr "chef"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Samordning av nya stabila utgåvor"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "mästare"
@@ -82,27 +82,27 @@ msgid "role"
msgstr "toll"
#: ../../english/intro/organization.data:63
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Tjänstemän"
#: ../../english/intro/organization.data:64
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Distributionen"
#: ../../english/intro/organization.data:65
-#: ../../english/intro/organization.data:237
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Kommunikation och Utåtriktad verksamhet"
#: ../../english/intro/organization.data:67
-#: ../../english/intro/organization.data:240
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr "Dataskyddsgruppen"
#: ../../english/intro/organization.data:68
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Publicitetsgruppen"
@@ -116,136 +116,131 @@ msgstr "Medlemskap i andra organisationer"
msgid "Support and Infrastructure"
msgstr "Support och infrastruktur"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:73
-msgid "Debian Pure Blends"
-msgstr "Debian Pure Blends"
-
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Arbetsledare"
-#: ../../english/intro/organization.data:82
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Teknisk kommitté"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Sekreterare"
-#: ../../english/intro/organization.data:104
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Utvecklingsprojekt"
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Ftp-arkiv"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "FTP Masters"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Ftp-assistenter"
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "FTP Wizards"
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Backports"
-#: ../../english/intro/organization.data:124
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Backports-teamet"
-#: ../../english/intro/organization.data:128
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Samordning av nya utgåvor"
-#: ../../english/intro/organization.data:130
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Utgivningsgruppen"
-#: ../../english/intro/organization.data:143
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Kvalitetsstyrning"
-#: ../../english/intro/organization.data:144
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Installationssystemgruppen"
-#: ../../english/intro/organization.data:145
+#: ../../english/intro/organization.data:143
msgid "Debian Live Team"
msgstr "Debian Live-gruppen"
-#: ../../english/intro/organization.data:146
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Versionsfakta"
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Cd-avbildningsfiler"
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Produktion"
-#: ../../english/intro/organization.data:158
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Testning"
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
msgid "Cloud Team"
msgstr "Molngruppen"
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Infrastruktur för automatiska byggen"
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Vill-bygga-gruppen"
-#: ../../english/intro/organization.data:173
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Byggserveradministration"
-#: ../../english/intro/organization.data:191
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Dokumentation"
-#: ../../english/intro/organization.data:196
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Paket med behov av arbete samt framtida paket"
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Anpassningar"
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Speciella system"
-#: ../../english/intro/organization.data:230
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Bärbara"
-#: ../../english/intro/organization.data:231
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Brandväggar"
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Inbyggda system"
-#: ../../english/intro/organization.data:247
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Presskontakt"
-#: ../../english/intro/organization.data:249
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Webbsidor"
@@ -416,44 +411,40 @@ msgstr "Paketspårningssystem"
msgid "Treasurer"
msgstr "Kassör"
-#: ../../english/intro/organization.data:487
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
"Förfrågningar angående <a href=\"m4_HOME/trademark\">varumärkesanvändning</a>"
-#: ../../english/intro/organization.data:490
+#: ../../english/intro/organization.data:491
msgid "Salsa administrators"
msgstr "Salsaadministratörer"
-#: ../../english/intro/organization.data:501
-msgid "Debian for children from 1 to 99"
-msgstr "Debian för barn mellan 1 och 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
+
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian för barn mellan 1 och 99"
-#: ../../english/intro/organization.data:504
-msgid "Debian for medical practice and research"
-msgstr "Debian för medicinsk praktik och forskning"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian för medicinsk praktik och forskning"
-#: ../../english/intro/organization.data:507
-msgid "Debian for education"
-msgstr "Debian för utbildning"
+#~ msgid "Debian for education"
+#~ msgstr "Debian för utbildning"
-#: ../../english/intro/organization.data:512
-msgid "Debian in legal offices"
-msgstr "Debian för juridiska firmor"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian för juridiska firmor"
# Politiskt korrekt? :-)
-#: ../../english/intro/organization.data:516
-msgid "Debian for people with disabilities"
-msgstr "Debian för personer med funktionsnedsättningar"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian för personer med funktionsnedsättningar"
-#: ../../english/intro/organization.data:520
-msgid "Debian for science and related research"
-msgstr "Debian för vetenskap och forskning"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian för vetenskap och forskning"
-#: ../../english/intro/organization.data:523
-msgid "Debian for astronomy"
-msgstr "Debian för astronomi"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian för astronomi"
#~ msgid "Alioth administrators"
#~ msgstr "Administratörer för Alioth"
diff --git a/swedish/po/others.sv.po b/swedish/po/others.sv.po
index 92c6a5b34ba..e807cd3cdf5 100644
--- a/swedish/po/others.sv.po
+++ b/swedish/po/others.sv.po
@@ -64,42 +64,6 @@ msgstr "Okänd"
msgid "Unavailable"
msgstr "Ej tillgänglig"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Ny-medlemshörnan"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Steg 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Steg 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Steg 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Steg 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Steg 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Steg 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Steg 7"
-
-#: ../../english/devel/join/nm-steps.inc:19
-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> "
@@ -166,131 +130,94 @@ msgstr "[Debian powered]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (liten knapp)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "samma som ovan"
-
-#: ../../english/misc/merchandise.def:10
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Produkter"
-#: ../../english/misc/merchandise.def:13
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "t-tröjor"
-#: ../../english/misc/merchandise.def:16
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "kepsar"
-#: ../../english/misc/merchandise.def:19
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "klistermärken"
-#: ../../english/misc/merchandise.def:22
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "muggar"
-#: ../../english/misc/merchandise.def:25
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "andra sorters kläder"
-#: ../../english/misc/merchandise.def:28
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "polotröjor"
-#: ../../english/misc/merchandise.def:31
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "frisbeear"
-#: ../../english/misc/merchandise.def:34
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "musmattor"
-#: ../../english/misc/merchandise.def:37
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "knappar"
-#: ../../english/misc/merchandise.def:40
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "basketkorgar"
-#: ../../english/misc/merchandise.def:44
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "örhängen"
-#: ../../english/misc/merchandise.def:47
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "resväskor"
-#: ../../english/misc/merchandise.def:50
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "paraplyer"
-#: ../../english/misc/merchandise.def:53
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "örngott"
-#: ../../english/misc/merchandise.def:56
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "nyckelringar"
-#: ../../english/misc/merchandise.def:59
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "Schweiziska arméknivar"
-#: ../../english/misc/merchandise.def:62
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr "USB-minnen"
-#: ../../english/misc/merchandise.def:77
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr "nyckelband"
-#: ../../english/misc/merchandise.def:80
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr "övrigt"
-#: ../../english/misc/merchandise.def:101
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr "Donerar pengar till Debian"
-#: ../../english/misc/merchandise.def:106
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr "Pengar används för att organisera lokala fri mjukvaruevenemang"
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Hur länge har du använt Debian?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Är du en Debianutvecklare (DD)?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "Vilka delar av Debian är du delaktig i?"
-
-#: ../../english/women/profiles/profiles.def:33
-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?"
-
-#: ../../english/women/profiles/profiles.def:39
-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
-msgid "A bit more about you..."
-msgstr "Lite mer om dig själv..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "OK"
@@ -335,6 +262,79 @@ msgstr "Version"
msgid "URL"
msgstr "Webbadress"
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Ny-medlemshörnan"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Steg 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Steg 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Steg 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Steg 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Steg 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Steg 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Steg 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Checklista för Ansökande"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "samma som ovan"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Hur länge har du använt Debian?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Är du en Debianutvecklare (DD)?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "Vilka delar av Debian är du delaktig i?"
+
+#: ../../english/women/profiles/profiles.def:33
+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?"
+
+#: ../../english/women/profiles/profiles.def:39
+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
+msgid "A bit more about you..."
+msgstr "Lite mer om dig själv..."
+
#~ msgid "Where:"
#~ msgstr "Plats:"
diff --git a/swedish/po/partners.sv.po b/swedish/po/partners.sv.po
index 07d7c487ae8..b6cc26930bd 100644
--- a/swedish/po/partners.sv.po
+++ b/swedish/po/partners.sv.po
@@ -106,12 +106,13 @@ msgstr ""
"säkerhetsnivå på deras 2000 m² tekniskt utrymme."
#: ../../english/partners/partners.def:64
+#, fuzzy
msgid ""
"<a href=\"https://www.credativ.com/\">credativ</a> is an independent "
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
"<a href=\"https://www.credativ.com/\">credativ</a> är ett oberoende konsult- "
"och tjänsteföretag som sedan 1999 har erbjudit omfattande tjänster och "
diff --git a/swedish/po/ports.sv.po b/swedish/po/ports.sv.po
index 90d2bf62d45..d2324b000a8 100644
--- a/swedish/po/ports.sv.po
+++ b/swedish/po/ports.sv.po
@@ -10,22 +10,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian för Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian för PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd på cd"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian för IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Kontakt"
@@ -90,6 +74,22 @@ msgstr "Tillgänglighet"
msgid "Systems"
msgstr "System"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian för Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian för PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd på cd"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian för IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD för i386"
diff --git a/swedish/po/security.sv.po b/swedish/po/security.sv.po
index bba53bf35ce..5277e5b347a 100644
--- a/swedish/po/security.sv.po
+++ b/swedish/po/security.sv.po
@@ -9,42 +9,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Säkerhet i Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Säkerhetsbulletiner från Debian"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "F"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"<a href=\\\"undated/\\\">odaterade</a> säkerhetsbulletiner bevarade för "
-"eftervärlden"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitres CVE-förteckning"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus Bugtraqdatabas"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT-bulletiner"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERTs sårbarheternotiser"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Källkod:"
@@ -129,5 +93,41 @@ msgstr ""
"För närvarande är inga ytterligare referenser till externa "
"säkerhetsdatabaser tillgängliga."
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "F"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Säkerhet i Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Säkerhetsbulletiner från Debian"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitres CVE-förteckning"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus Bugtraqdatabas"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT-bulletiner"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERTs sårbarheternotiser"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"<a href=\\\"undated/\\\">odaterade</a> säkerhetsbulletiner bevarade för "
+"eftervärlden"
+
#~ msgid "CERT alerts"
#~ msgstr "CERT-bulletiner"
diff --git a/swedish/po/stats.sv.po b/swedish/po/stats.sv.po
index a3c00e76c53..8e8abfa70da 100644
--- a/swedish/po/stats.sv.po
+++ b/swedish/po/stats.sv.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n"
-#: ../../english/template/debian/stats_tags.wml:6
-msgid "Debian web site translation statistics"
-msgstr "Statistik över översättningar på Debians webbplats"
-
-#: ../../english/template/debian/stats_tags.wml:10
-msgid "There are %d pages to translate."
-msgstr "Det finns %d sidor att översätta."
-
-#: ../../english/template/debian/stats_tags.wml:14
-msgid "There are %d bytes to translate."
-msgstr "Det finns %d bytes att översätta."
-
-#: ../../english/template/debian/stats_tags.wml:18
-msgid "There are %d strings to translate."
-msgstr "Det finns %d strängar att översätta."
-
#: ../../stattrans.pl:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Felaktig översättningsversion"
@@ -45,13 +29,13 @@ msgid "The original no longer exists"
msgstr "Originalet finns inte längre"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "träffräknare N/A"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "träffar"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "träffräknare N/A"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Klicka för att hämta diffstat-data"
@@ -64,15 +48,6 @@ msgstr "Skapad med <transstatslink>"
msgid "Translation summary for"
msgstr "Översättningssammanfattning för"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Ej översatt"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Föråldrade"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Översatt"
@@ -82,6 +57,15 @@ msgstr "Översatt"
msgid "Up to date"
msgstr "Uppdaterade"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Föråldrade"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Ej översatt"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -232,6 +216,22 @@ msgstr "Översatta webbsidor (efter storlek)"
msgid "Translation Statistics by Page Size"
msgstr "Översättningsstatistik efter sidstorlek"
+#: ../../english/template/debian/stats_tags.wml:6
+msgid "Debian web site translation statistics"
+msgstr "Statistik över översättningar på Debians webbplats"
+
+#: ../../english/template/debian/stats_tags.wml:10
+msgid "There are %d pages to translate."
+msgstr "Det finns %d sidor att översätta."
+
+#: ../../english/template/debian/stats_tags.wml:14
+msgid "There are %d bytes to translate."
+msgstr "Det finns %d bytes att översätta."
+
+#: ../../english/template/debian/stats_tags.wml:18
+msgid "There are %d strings to translate."
+msgstr "Det finns %d strängar att översätta."
+
#~ msgid "Unified diff"
#~ msgstr "Samlad diff"
diff --git a/swedish/po/templates.sv.po b/swedish/po/templates.sv.po
index 04598d0854d..14d6cc165ce 100644
--- a/swedish/po/templates.sv.po
+++ b/swedish/po/templates.sv.po
@@ -16,14 +16,6 @@ msgstr ""
"X-Generator: Poedit 1.8.11\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"
@@ -211,7 +203,7 @@ msgstr "i utgåva 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:107
+#: ../../english/template/debian/footer.wml:106
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -228,27 +220,27 @@ msgstr ""
"contact\">kontaktsida</a>. Webbplatsens källkod finns <a href=\"https://"
"salsa.debian.org/webmaster-team/webwml\">tillgänglig</a>."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Senast ändrad"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr "Senast byggd"
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Upphovsrättsskyddat"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> och andra;"
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -266,6 +258,14 @@ 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>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian internationellt"
@@ -544,5 +544,13 @@ msgstr "Webbadress"
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"
+
#~ msgid "Visit the site sponsor"
#~ msgstr "Besök vår sponsor"
diff --git a/tamil/po/bugs.ta.po b/tamil/po/bugs.ta.po
index 70189c3ec38..9c92f287121 100644
--- a/tamil/po/bugs.ta.po
+++ b/tamil/po/bugs.ta.po
@@ -26,7 +26,6 @@ msgstr ""
#: ../../english/Bugs/pkgreport-opts.inc:63
#: ../../english/Bugs/pkgreport-opts.inc:97
#, fuzzy
-#| msgid "severities"
msgid "with severity"
msgstr "முன்னுரிமைகள்"
@@ -48,7 +47,6 @@ msgstr ""
#: ../../english/Bugs/pkgreport-opts.inc:38
#, fuzzy
-#| msgid "status"
msgid "with status"
msgstr "நிலை"
@@ -104,7 +102,6 @@ msgstr ""
#: ../../english/Bugs/pkgreport-opts.inc:131
#, fuzzy
-#| msgid "sarge"
msgid "age"
msgstr "சார்ஜ்"
@@ -122,7 +119,6 @@ msgstr ""
#: ../../english/Bugs/pkgreport-opts.inc:140
#, fuzzy
-#| msgid "Reverse order of:"
msgid "Reverse Severity"
msgstr "மாற்று வரிசையில்:"
@@ -156,13 +152,11 @@ msgstr "நிலையற்ற"
#: ../../english/Bugs/pkgreport-opts.inc:152
#, fuzzy
-#| msgid "archived bugs"
msgid "Unarchived"
msgstr "களையப் பட்ட வழுக்கள்"
#: ../../english/Bugs/pkgreport-opts.inc:155
#, fuzzy
-#| msgid "archived bugs"
msgid "Archived"
msgstr "களையப் பட்ட வழுக்கள்"
diff --git a/tamil/po/cdimage.ta.po b/tamil/po/cdimage.ta.po
index aae474c986a..f2b2bcdba67 100644
--- a/tamil/po/cdimage.ta.po
+++ b/tamil/po/cdimage.ta.po
@@ -16,20 +16,6 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
"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:8
-#: ../../english/CD/CD-keys.data:13
-msgid " Key fingerprint"
-msgstr " Key fingerprint"
-
-#: ../../english/devel/debian-installer/images.data:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -37,7 +23,6 @@ msgstr "&middot;"
#: ../../english/template/debian/cdimage.wml:13
#, fuzzy
-#| msgid "<void id=\"faq-bottom\" />faq"
msgid "<void id=\"dc_faq\" />FAQ"
msgstr "<void id=\"faq-bottom\" />கேள்விகள்"
@@ -55,31 +40,26 @@ msgstr ""
#: ../../english/template/debian/cdimage.wml:25
#, fuzzy
-#| msgid "Network install"
msgid "Network Install"
msgstr "பிணைய நிறுவல்"
#: ../../english/template/debian/cdimage.wml:28
#, fuzzy
-#| msgid "<void id=\"dc_torrent\" />Download with Torrent"
msgid "<void id=\"dc_download\" />Download"
msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
#: ../../english/template/debian/cdimage.wml:31
#, fuzzy
-#| msgid "<void id=\"misc-bottom\" />misc"
msgid "<void id=\"dc_misc\" />Misc"
msgstr "<void id=\"misc-bottom\" />ஏனைய"
#: ../../english/template/debian/cdimage.wml:34
#, fuzzy
-#| msgid "<void id=\"dc_torrent\" />Download with Torrent"
msgid "<void id=\"dc_artwork\" />Artwork"
msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
#: ../../english/template/debian/cdimage.wml:37
#, fuzzy
-#| msgid "<void id=\"dc_torrent\" />Download with Torrent"
msgid "<void id=\"dc_mirroring\" />Mirroring"
msgstr "<void id=\"dc_torrent\" />டாரன்டு பயன்படுத்தி பதிவிறக்க"
@@ -89,7 +69,6 @@ msgstr ""
#: ../../english/template/debian/cdimage.wml:43
#, fuzzy
-#| msgid "<void id=\"misc-bottom\" />misc"
msgid "<void id=\"dc_verify\" />Verify"
msgstr "<void id=\"misc-bottom\" />ஏனைய"
@@ -140,3 +119,17 @@ msgid ""
msgstr ""
"வட்டுக்களுக்கான ஆங்கில மொழியில்<a href=\"/MailingLists/disclaimer\">பொது மடலாடற் "
"குழு</a> :"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/tamil/po/consultants.ta.po b/tamil/po/consultants.ta.po
index 654226b8a09..d7b158582f8 100644
--- a/tamil/po/consultants.ta.po
+++ b/tamil/po/consultants.ta.po
@@ -16,6 +16,14 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
"X-Generator: KBabel 1.11.4\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 "<a href=\"./\">டெபியன் ஆலோசகர்கள் பக்கத்திற்குத்</a> திரும்புக."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "பெயர்:"
@@ -70,11 +78,3 @@ msgid ""
"worldwide."
msgstr ""
"அகிலமனைத்திலும் உள்ள <total_consultant> டெபியன் ஆலோசகர்கள் பட்டியல் <total_country>."
-
-#: ../../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 "<a href=\"./\">டெபியன் ஆலோசகர்கள் பக்கத்திற்குத்</a> திரும்புக."
diff --git a/tamil/po/countries.ta.po b/tamil/po/countries.ta.po
index 49ad1df9b62..0e086a72986 100644
--- a/tamil/po/countries.ta.po
+++ b/tamil/po/countries.ta.po
@@ -222,212 +222,216 @@ msgid "Kenya"
msgstr "கென்யா"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "கஜகஸ்தான்"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "கொரியா"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "குவைத்"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "கஜகஸ்தான்"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "இலங்கை"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "லித்துவானியா"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "லக்ஸம்பரக்"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "லத்வியா"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "மொராகோ"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr ""
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "மான்டெனெக்ரோ"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "மடகாஸகர"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "மெசிடோனியா குடியரசு"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr ""
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr ""
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "மெக்ஸிகோ"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "மலேசியா"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr ""
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "நீகுரகோவா"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "நெதர்லாந்து"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "நார்வே"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "நியூசிலாந்து"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "பனாமா"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "பெரு"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr ""
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "பிலிப்பைன்ஸ்"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "பாகிஸ்தான்"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "போலாந்து"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "போர்ட்சுகல்"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "ருமேனியா"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "செர்பியா"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "ரஷ்யா"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "சவுதி அரேபியா"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "ஸ்வீடன்"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "சிங்கப்பூர்"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "ஸ்லோவேனியா"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "ஸ்லோவேகியா"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "எல் சல்வேடார்"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "தாய்லாந்து"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "தசிக்கிசுதான்"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "துனிஷியா"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "துருக்கி"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "தைவான்"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "யுக்ரைன்"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "ஐக்கிய மாகாணங்கள்"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "உருகுவே"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
#, fuzzy
-#| msgid "Pakistan"
msgid "Uzbekistan"
msgstr "பாகிஸ்தான்"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "வெனிசுலா"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "வியட்னாம்"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "வனாட்டு"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "தென்னாப்பிக்கா"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "ஜிம்பாப்வே"
diff --git a/tamil/po/date.ta.po b/tamil/po/date.ta.po
index 7deff26020c..c410c18cdc9 100644
--- a/tamil/po/date.ta.po
+++ b/tamil/po/date.ta.po
@@ -196,7 +196,6 @@ msgstr "q{[%]d [%]s}, $mday, $mon_str"
#. replace all % by [%]
#: ../../english/template/debian/ctime.wml:99
#, fuzzy
-#| msgid "q{[%]02d [%]s [%]d}, $mday, $mon_str, $year"
msgid "q{[%]s [%]s}, $mon_str, $year"
msgstr "q{[%]02d [%]s [%]d}, $mday, $mon_str, $year"
diff --git a/tamil/po/distrib.ta.po b/tamil/po/distrib.ta.po
index 72087aea616..b46c9acbb92 100644
--- a/tamil/po/distrib.ta.po
+++ b/tamil/po/distrib.ta.po
@@ -12,97 +12,67 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "துருப்புச் சொல்"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "திரை"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "தொடர்ந்து தேடவும்"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "துருப்புச் சொல்லுடன் நிறைவடையும் பாதை"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "பொதிகளின் பெயர் மட்டும்"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "இங்ஙனம் பெயர் சூட்டப்பட்ட கோப்புகளைக் கொண்டப் பொதிகள்"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "விவரங்கள்"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr "துருப்புச்சொல்லை பெயர்களில் கொண்ட ப்பட்ட கோப்புகளைக் கொண்டப் பொதிகள்"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "மூலப் பொதிகளின் பெயர்கள்"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "சரியானப் பொருத்தங்களை மட்டும் காட்டுக"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "வழங்கல்"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "பரிசோதனையில்"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "நிலையற்ற"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "சோதிக்கப்டுகிறது"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "நிலையான"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "எதுவும்"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "தேடுக"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-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"
-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:21
-msgid "Only show exact matches"
-msgstr "சரியானப் பொருத்தங்களை மட்டும் காட்டுக"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "பகுதி"
@@ -119,6 +89,36 @@ msgstr "பங்கு"
msgid "non-free"
msgstr "கட்டுடைய"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "தேடுக"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "மீளமைக்க"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "திரை"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "துருப்புச் சொல்லுடன் நிறைவடையும் பாதை"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "இங்ஙனம் பெயர் சூட்டப்பட்ட கோப்புகளைக் கொண்டப் பொதிகள்"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr "துருப்புச்சொல்லை பெயர்களில் கொண்ட ப்பட்ட கோப்புகளைக் கொண்டப் பொதிகள்"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "கட்டமைப்பு"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "ஆரம்ப"
@@ -145,13 +145,11 @@ msgstr ""
#: ../../english/releases/arches.data:14
#, fuzzy
-#| msgid "HP PA/RISC"
msgid "HP PA-RISC"
msgstr "ஹச் பிஏ/ரிஸ்க்"
#: ../../english/releases/arches.data:15
#, fuzzy
-#| msgid "Hurd (i386)"
msgid "Hurd 32-bit PC (i386)"
msgstr "ஹர்ட் (i386)"
@@ -161,7 +159,6 @@ msgstr ""
#: ../../english/releases/arches.data:17
#, fuzzy
-#| msgid "Intel IA-64"
msgid "Intel Itanium IA-64"
msgstr "இன்டல் ஜஏ-64"
@@ -183,7 +180,6 @@ msgstr "மிப்ஸ் (பெரிய என்டியன்)"
#: ../../english/releases/arches.data:22
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "64-bit MIPS (little endian)"
msgstr "மிபஸ் (சிறிய என்டியன்)"
@@ -201,7 +197,6 @@ msgstr ""
#: ../../english/releases/arches.data:26
#, fuzzy
-#| msgid "MIPS (little endian)"
msgid "RISC-V 64-bit little endian (riscv64)"
msgstr "மிபஸ் (சிறிய என்டியன்)"
diff --git a/tamil/po/doc.ta.po b/tamil/po/doc.ta.po
index be65006633d..df87899b2fa 100644
--- a/tamil/po/doc.ta.po
+++ b/tamil/po/doc.ta.po
@@ -12,113 +12,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../english/doc/books.data:31
-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:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
-msgid ""
-"Written by two Debian developers, this free book\n"
-" started as a translation of their French best-seller known as Cahier de\n"
-" 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:80
-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:101
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-" covers all aspects of the administration of Debian from the installation\n"
-" 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:120
-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:140
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment. It shows the full potential of "
-"the distribution (in its current version 8) 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:191
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "இயற்றியவர்:"
#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "டெபியன் பொதி"
+
+#: ../../english/doc/books.def:44
msgid "email:"
msgstr "மின்னஞ்சல்:"
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
msgid "Available at:"
msgstr "கிடைக்கப் பெறுமிடம்:"
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
msgid "CD Included:"
msgstr "வட்டு உள்ளடக்கப்பட்டது:"
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
msgid "Publisher:"
msgstr "பதிப்பித்தவர்:"
@@ -142,47 +57,50 @@ msgstr "நிலை:"
msgid "Availability:"
msgstr "கிடைக்கக்கூடியதா:"
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
msgid "Latest version:"
msgstr "அண்மைய வெளியீடு:"
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
msgid "(version <get-var version />)"
msgstr "(வெளியீடு <get-var version />)"
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
msgid "plain text"
msgstr "வெற்று உரை"
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
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:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:177
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
+#: ../../english/doc/manuals.defs:185
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:188
+#: ../../english/doc/manuals.defs:203
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -192,20 +110,109 @@ 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:193
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr "இணைய வழி சிவிஎஸ்"
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr "டெபியன் பொதி"
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
#, fuzzy
-#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "டெபியன் பொதி"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/tamil/po/newsevents.ta.po b/tamil/po/newsevents.ta.po
index 77a475e3510..a633edf24aa 100644
--- a/tamil/po/newsevents.ta.po
+++ b/tamil/po/newsevents.ta.po
@@ -16,94 +16,6 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr ""
-
-#: ../../english/News/news.rdf.in:19
-#, fuzzy
-#| msgid "Latest News"
-msgid "Debian Latest News"
-msgstr "புதிய செய்தி"
-
-#: ../../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 ""
-
-#: ../../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
-#, fuzzy
-#| msgid "Languages:"
-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 "எதிர்வருபவை"
@@ -162,6 +74,132 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (செயற் படாத இணைப்பு)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian.org/"
+"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=\"../../\">முந்தைய பதிப்புகள்</a> கிடைக்கின்றன."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+#, fuzzy
+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>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+#, fuzzy
+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>."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:25
+#, 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\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:30
+#, 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\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
+"dwn@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\" />%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\" />%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\" />%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\" />%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 ""
+"இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian.org/"
+"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\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்<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\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்கள் <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\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <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\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -343,155 +381,91 @@ msgid ""
"the following topics:"
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 in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
+
+#: ../../english/events/talks.defs:9
+msgid "Title:"
msgstr ""
-"இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian.org/"
-"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=\"../../\">முந்தைய பதிப்புகள்</a> கிடைக்கின்றன."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr ""
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
+#: ../../english/events/talks.defs:15
#, fuzzy
-#| msgid ""
-#| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#| "dwn@debian.org\">%s</a>."
-msgid ""
-"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+msgid "Language:"
+msgstr "மொழிகள்:"
+
+#: ../../english/events/talks.defs:19
+msgid "Date:"
msgstr ""
-"<void id=\"singular\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்<a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-#, 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>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
msgstr ""
-"<void id=\"plural\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்கள் <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:25
-#, 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>."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
msgstr ""
-"<void id=\"singular\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:30
-#, 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>."
+#: ../../english/events/talks.defs:29
+msgid "source"
msgstr ""
-"<void id=\"plural\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
-"dwn@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\" />%s இதனை மொழிபெயர்த்தார்."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr ""
-#. 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\" />%s இதனை மொழிபெயர்த்தவர்கள் ஆவர்."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr ""
-#. 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\" />%s இதனை மொழிபெயர்த்தார்."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr ""
-#. 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\" />%s இதனை மொழிபெயர்த்தவர்கள் ஆவர்."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr ""
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "பேச்சாளர் பட்டியல்"
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr ""
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "<a href=\"./\">டெபியன்</a> பேச்சாளர் பக்கத்திற்குத் திரும்புக."
+#: ../../english/News/news.rdf.in:19
+#, fuzzy
+msgid "Debian Latest News"
+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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
msgstr ""
-"இச்செய்தியறிக்கையினை வாரந்தோறும் மடலாகப் பெற, <a href=\"https://lists.debian.org/"
-"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\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்<a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#~ msgid "Name:"
+#~ 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>."
-msgstr ""
-"<void id=\"plural\" />டெபியன் வாராந்திரச் செய்தியின் ஆசிரியர்கள் <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#~ msgid "Email:"
+#~ 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>."
-msgstr ""
-"<void id=\"singular\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர் <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#~ msgid "Previous Talks:"
+#~ 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 ""
-"<void id=\"plural\" />டெபியனின் இவ்வாரச் செய்தியின் ஆசிரியர்கள்<a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#~ msgid "Languages:"
+#~ msgstr "மொழிகள்:"
+
+#~ msgid "Location:"
+#~ msgstr "இடம்:"
+
+#~ msgid "Topics:"
+#~ msgstr "தலைப்புகள்:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "பேச்சாளர் பட்டியல்"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "<a href=\"./\">டெபியன்</a> பேச்சாளர் பக்கத்திற்குத் திரும்புக."
#, fuzzy
#~| msgid ""
diff --git a/tamil/po/organization.ta.po b/tamil/po/organization.ta.po
index 7a1353f4388..db387365029 100644
--- a/tamil/po/organization.ta.po
+++ b/tamil/po/organization.ta.po
@@ -49,293 +49,333 @@ msgid "manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr ""
-
-#: ../../english/intro/organization.data:34
#, fuzzy
-#| msgid "Release Managers"
msgid "Stable Release Manager"
msgstr "வெளியீட்டு மேலாளர்"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr ""
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr ""
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "தலைவர்"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "உதவியாளர்"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "செயலர்"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "அலுவலர்கள்"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "வழங்கல்"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "விளம்பரம்"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "ஆதரவும் கட்டமைப்பும்"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "அணித்தலைவர்"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "தொழில்நுட்பக் குழு"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "செயலர்"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "உருவாக்கத் திட்டங்கள்"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "கோபநெ பெட்டகம்"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
#, fuzzy
-#| msgid "FTP Master"
msgid "FTP Masters"
msgstr "கோபநெ முதல்வர்"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "கோபநெ துணைவோர்"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "தனிப்பட்ட பொதிகள்"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "வெளியீடு நிர்வாகம்"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
#, fuzzy
-#| msgid "Release Notes"
msgid "Release Team"
msgstr "வெளியீட்டுக் குறிப்புகள்"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "தர உத்தரவாதம்"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "நிறுவலுக்கான குழுமம்"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "வெளியீட்டுக் குறிப்புகள்"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "குறு வட்டு பிம்பங்கள்"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "உருவாக்கம்"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "சோதனை"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
#, fuzzy
-#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "ஆதரவும் கட்டமைப்பும்"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
#, fuzzy
-#| msgid "Buildd Administration"
msgid "Buildd administration"
msgstr "சமை நிர்வாகம்"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "ஆவணமாக்கம்"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "பணித்-தேவைப் படுபவை மற்றும் வாய்ப்புள்ள பொதிகளின் பட்டியல்"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "துறைகள்"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "சிறப்பு வடிவமைப்புகள்"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "மடிக்கணினிகள்"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "அரண்கள்"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "உட்பொதிந்த சாதனங்கள்"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "பத்திரிக்கை தொடர்பு"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "இணையப் பக்கங்கள்"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "பெண்களுக்கான டெபியன் திட்டம்"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "சம்பவங்கள்"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "தொழில்நுட்பக் குழு"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "பங்குதாரர் திட்டம்"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "வன்பொருள் தான ஒருங்கிணைப்பு"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "பயனர் ஆதரவு"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "வழுக் கண்காணிப்பு அமைப்பு"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "மடலாடற் குழு நிர்வாகம் மற்றும் மடலாடற் குழு பெட்டகம்"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
#, fuzzy
-#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "புதிய பராமமரிப்பாளர்கள் முன்னணி"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "டெபியன் கணக்கு மேலாளர்கள்"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "துருப்பு பராமரிப்பாளர்கள் (பிஜிபி மற்றும் ஜிபிஜி)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "பாதுகாப்புக் குழு"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "ஆலோசகர் பக்கம்"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "வட்டு வழங்குவோர் பக்கம்"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "கொள்கை"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "அமைப்பு நிர்வாகம்"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -343,7 +383,7 @@ msgstr ""
"ஏதெனுமொரு டெபியன் இயந்திரத்தில், கடவுச்சொல் உள்ளிட்ட கோளாறு ஏற்படின் பயன்படுத்தப் பட "
"வேண்டிய முகவரி இது. இல்லையெனில் தாங்கள் நிறுவிட பொதியொன்றுத் தேவைப் படுகிறது. "
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:469
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 "
@@ -353,68 +393,63 @@ msgstr ""
"machines.cgi\">டெபியன் இயந்திரங்கள்</a> பக்கத்தினை அணுகவும், பிரதி இயந்திரத்துக்கான "
"நிர்வாகத் தகவலை அது கொண்டிருக்கலாம்."
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP உருவாக்குநர் அடைவு நிர்வாகி"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "பிம்பங்கள்"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "DNS பராமரிப்பாளர்"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "பொதி கண்காணிப்பு அமைப்பு"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "அலியோத் நிர்வாகிகள்"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "1 முதல் 99 வரைக் குழந்தைகளுக்கான டெபியன்"
+#~ msgid "Individual Packages"
+#~ msgstr "தனிப்பட்ட பொதிகள்"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "மருத்துவப் பழகலுக்கும் ஆராய்ச்சிக்கும் டெபியன்"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "1 முதல் 99 வரைக் குழந்தைகளுக்கான டெபியன்"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "கல்விக்கான டெபியன்"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "மருத்துவப் பழகலுக்கும் ஆராய்ச்சிக்கும் டெபியன்"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "சட்ட அலுவலகங்களில் டெபியன்"
+#~ msgid "Debian for education"
+#~ msgstr "கல்விக்கான டெபியன்"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "சட்ட அலுவலகங்களில் டெபியன்"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "ஊனமுற்றோருக்கான டெபியன்"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "ஊனமுற்றோருக்கான டெபியன்"
-#: ../../english/intro/organization.data:486
#, fuzzy
-#| msgid "Debian for medical practice and research"
-msgid "Debian for science and related research"
-msgstr "மருத்துவப் பழகலுக்கும் ஆராய்ச்சிக்கும் டெபியன்"
+#~| msgid "Debian for medical practice and research"
+#~ msgid "Debian for science and related research"
+#~ msgstr "மருத்துவப் பழகலுக்கும் ஆராய்ச்சிக்கும் டெபியன்"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "கல்விக்கான டெபியன்"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "கல்விக்கான டெபியன்"
#, fuzzy
#~| msgid "Installation System Team"
diff --git a/tamil/po/others.ta.po b/tamil/po/others.ta.po
index 6073c79935a..f858f24cc80 100644
--- a/tamil/po/others.ta.po
+++ b/tamil/po/others.ta.po
@@ -61,44 +61,6 @@ msgstr "<void id=\"d-i\" />அறியப்படாத"
msgid "Unavailable"
msgstr "கிடைக்கவில்லை"
-#: ../../english/devel/join/nm-steps.inc:7
-#, fuzzy
-#| msgid "New Maintainers' Corner"
-msgid "New Members Corner"
-msgstr "புதிய பராமரிப்பாளர்களுக்கான முனை"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "படி 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "படி 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "படி 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "படி 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "படி 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "படி 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "படி 7"
-
-#: ../../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> "
@@ -112,7 +74,6 @@ msgstr ""
#: ../../english/devel/website/tc.data:15
#: ../../english/devel/website/tc.data:16
#, fuzzy
-#| msgid "Additional Information"
msgid "More information"
msgstr "கூடுதல் விவரம்"
@@ -126,19 +87,16 @@ msgstr ""
#: ../../english/distrib/pre-installed.defs:18
#, fuzzy
-#| msgid "Phone:"
msgid "Phone"
msgstr "தொலைப்பேசி:"
#: ../../english/distrib/pre-installed.defs:19
#, fuzzy
-#| msgid "Fax:"
msgid "Fax"
msgstr "நகல்:"
#: ../../english/distrib/pre-installed.defs:21
#, fuzzy
-#| msgid "Address:"
msgid "Address"
msgstr "முகவரி:"
@@ -170,131 +128,95 @@ msgstr "[டெபியனின் பின்பலத்தில்]"
msgid "[Debian] (mini button)"
msgstr "[டெபியன்] (குட்டி மென்மேடு)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr ""
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "பொருட்கள்"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "டி-சட்டைகள்"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "தொப்பிகள்"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "ஒட்டிகள்"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "கோப்பைகள்"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "ஏனைய ஆடைகள்"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "போலோ சட்டைகள்"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "பறக்கும்தட்டு"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "எலிய அட்டைகள்ய"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "அடையாள அட்டைகள்"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "கூடைப் பந்து இலக்குகள்"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "காதணி"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "பெட்டிகள்"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
#, fuzzy
-#| msgid "suitcases"
msgid "pillowcases"
msgstr "பெட்டிகள்"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr ""
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr ""
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr ""
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "சரி"
@@ -339,6 +261,78 @@ msgstr "வெளியீடு"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+#, fuzzy
+msgid "New Members Corner"
+msgstr "புதிய பராமரிப்பாளர்களுக்கான முனை"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "படி 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "படி 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "படி 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "படி 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "படி 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "படி 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "படி 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "விண்ணப்பிப்போரின் சோதனைப் பட்டியல்"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
#~ msgid "p<get-var page />"
#~ msgstr "p<get-var page />"
diff --git a/tamil/po/partners.ta.po b/tamil/po/partners.ta.po
index 021ae624d61..644cd23a422 100644
--- a/tamil/po/partners.ta.po
+++ b/tamil/po/partners.ta.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/tamil/po/ports.ta.po b/tamil/po/ports.ta.po
index a7ad7aa3958..f50c4b97471 100644
--- a/tamil/po/ports.ta.po
+++ b/tamil/po/ports.ta.po
@@ -13,22 +13,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\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 "ஐஏ-64 க்கான டெபியன்"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "தொடர்பு"
@@ -93,6 +77,22 @@ msgstr "விநியோகம்"
msgid "Systems"
msgstr "அமைப்புகள்"
+#: ../../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 "ஐஏ-64 க்கான டெபியன்"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "ஐ386 க்கான குனு/நெட் பிஎஸ்டி க்கான டெபியன்"
diff --git a/tamil/po/security.ta.po b/tamil/po/security.ta.po
index e2e14696646..d8b137625ff 100644
--- a/tamil/po/security.ta.po
+++ b/tamil/po/security.ta.po
@@ -12,40 +12,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "டெபியன் அரண்"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "டெபியன் அரண் ஆலோசனைகள்"
-
-#: ../../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 ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "மிட்ரெ CVE அகராதி"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "அரண்முனைப்பு வழுநோட்ட தரவுக்களன்"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT ஆலோசனைகள்"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT அரண்குறை குறிப்புகள்"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "மூலம்:"
@@ -127,3 +93,37 @@ msgstr "CERT'ன் அரண்குறைகள், ஆலோசனைகள
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr "வெளி தரவுக் கள அரண் குறிப்புகள் எதுவும் தற்சமயம் கிடைக்கப் பெறவில்லை."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Q"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "டெபியன் அரண்"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "டெபியன் அரண் ஆலோசனைகள்"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "மிட்ரெ CVE அகராதி"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "அரண்முனைப்பு வழுநோட்ட தரவுக்களன்"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT ஆலோசனைகள்"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT அரண்குறை குறிப்புகள்"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/tamil/po/stats.ta.po b/tamil/po/stats.ta.po
index b51c21635eb..e7c35a438b6 100644
--- a/tamil/po/stats.ta.po
+++ b/tamil/po/stats.ta.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/tamil/po/templates.ta.po b/tamil/po/templates.ta.po
index ab7e4561fa3..5cb5585ed14 100644
--- a/tamil/po/templates.ta.po
+++ b/tamil/po/templates.ta.po
@@ -16,20 +16,9 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../english/search.xml.in:7
-#, fuzzy
-#| msgid "Debian Project"
-msgid "Debian website"
-msgstr "டெபியன் திட்டம்"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian"
msgstr "டெபியனுக்கு உதவுக"
@@ -51,10 +40,6 @@ msgstr "டெபியன் திட்டம்"
#: ../../english/template/debian/common_translation.wml:13
#, fuzzy
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -94,7 +79,6 @@ msgstr "தொடர்பு கொள்க"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "வெளியீட்டுத் தகவல்"
@@ -170,10 +154,14 @@ msgstr "டெபியன் பெற"
#: ../../english/template/debian/common_translation.wml:91
#, fuzzy
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "டெபியன் புத்தகங்கள்"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "கடைசியாக மாற்றப் பட்டது"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -219,13 +207,8 @@ 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -237,28 +220,28 @@ msgstr ""
"debian.org\">debian-www@lists.debian.org</a> க்கு மடலிடவும். தொடர்பு கொள்ள "
"விழைந்தால் டெபியன்<a href=\"m4_HOME/contact\">தொடர்பு பக்கத்தை பார்க்கவும்</a>."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "கடைசியாக மாற்றப் பட்டது"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "பதிப்புரிமை"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr ""
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -275,6 +258,14 @@ msgstr "இப்பக்கம் கீழ்கண்ட மொழிகள
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "ஆவணத்தின் இயலபிருப்பு மொழியினை அமைப்பது <a href=m4_HOME/intro/cn>எப்படி</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "சர்வதேச டெபியன்"
@@ -293,13 +284,11 @@ msgstr "வாராந்திர செய்திகள்"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Project News"
msgstr "டெபியன் திட்டம்"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly News"
msgid "Project News"
msgstr "வாராந்திர செய்திகள்"
@@ -325,7 +314,6 @@ msgstr "டெபியன் புத்தகங்கள்"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian Wiki"
msgstr "டெபியனுக்கு உதவுக"
@@ -359,7 +347,6 @@ msgstr "உருவோக்குவோரின் தரவுக் கள
#: ../../english/template/debian/links.tags.wml:64
#, fuzzy
-#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "டெபியன் புத்தகங்கள்"
@@ -437,7 +424,6 @@ msgstr "வட்டு வழங்குவோர்"
#: ../../english/template/debian/links.tags.wml:125
#, fuzzy
-#| msgid "CD ISO images"
msgid "CD/USB ISO images"
msgstr "ஐஎஸ்ஓ மாதிரிகளுக்கான வட்டு"
@@ -471,7 +457,6 @@ msgstr "பொதிகள் குறித்த டெபியன் உர
#: ../../english/template/debian/navbar.wml:10
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "டெபியன் திட்டம்"
@@ -515,6 +500,15 @@ msgstr "(புதிய மீள்பார்வை)"
msgid "Report"
msgstr "அறியச்செய்க"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -551,10 +545,19 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "<a href=\"../\">டெபியனைப் பயன்படுத்துவோர் யார்?</a> பக்கத்திற்கு திரும்புக."
+#: ../../english/search.xml.in:7
+#, fuzzy
+msgid "Debian website"
+msgstr "டெபியன் திட்டம்"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
#~ msgid "More information"
#~ msgstr "மேறகொண்டு விவரமறிய"
diff --git a/tamil/po/vendors.ta.po b/tamil/po/vendors.ta.po
index 50fccdb7215..f2dedcd1497 100644
--- a/tamil/po/vendors.ta.po
+++ b/tamil/po/vendors.ta.po
@@ -22,7 +22,6 @@ msgstr "பங்களிப்புகளை அனுமதிக்கு
#: ../../english/CD/vendors/vendors.CD.def:16
#, fuzzy
-#| msgid "CD/DVD"
msgid "CD/DVD/BD/USB"
msgstr "வட்டு/பெருவட்டு"
diff --git a/tamil/po/vote.ta.po b/tamil/po/vote.ta.po
index 54dea571331..d1350fe01a1 100644
--- a/tamil/po/vote.ta.po
+++ b/tamil/po/vote.ta.po
@@ -33,243 +33,275 @@ msgid "Nominations"
msgstr "பரிந்துரைகள்"
#: ../../english/template/debian/votebar.wml:25
+#, fuzzy
+msgid "Withdrawals"
+msgstr "திரும்பப் பெறப் பட்டது"
+
+#: ../../english/template/debian/votebar.wml:28
msgid "Debate"
msgstr "விவாதம்"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr "கட்டமைப்புகள்"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposer"
msgstr "பரிந்துரைத்தவர்"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr "பரிந்துரை அ வினைப் பரிந்துரைத்தவர்"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr "பரிந்துரை இ வினைப் பரிந்துரைத்தவர்"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr "பரிந்துரை உ வினைப் பரிந்துரைத்தவர்"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr "பரிந்துரை எ வினைப் பரிந்துரைத்தவர்"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr "பரிந்துரை ஐ வினைப் பரிந்துரைத்தவர்"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr "பரிந்துரை ஒ வினைப் பரிந்துரைத்தவர்"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "பரிந்துரை அ வினைப் பரிந்துரைத்தவர்"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "பரிந்துரை அ வினைப் பரிந்துரைத்தவர்"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "நொடிகள்"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "பரிந்துரை அ நொடிகள்"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "பரிந்துரை இ நொடிகள்"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "பரிந்துரை உ நொடிகள்"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "பரிந்துரை எ நொடிகள்"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "பரிந்துரை ஐ நொடிகள்"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "பரிந்துரை ஒ நொடிகள்"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "பரிந்துரை அ நொடிகள்"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "பரிந்துரை அ நொடிகள்"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "எதிர்தரப்பு"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "உரை"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "பரிந்துரை அ"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "பரிந்துரை இ"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "பரிந்துரை உ"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "பரிந்துரை எ"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "பரிந்துரை ஐ"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "பரிந்துரை ஒ"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "பரிந்துரை அ"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "பரிந்துரை அ"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "தேர்வுகள்"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "திருத்தத்தைப் பரிந்துரைத்தவர்"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "திருத்த நொடிகள்"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "திருத்த உரைகள்"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் அ"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "திருத்த நொடிகள் அ"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "திருத்த உரை அ"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் இ"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "திருத்த நொடிகள் இ"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "திருத்த நொடிகள் இ"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
#, fuzzy
-#| msgid "Amendment Proposer A"
msgid "Amendment Proposer C"
msgstr "திருத்தத்தைப் பரிந்துரைத்தவர் அ"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
#, fuzzy
-#| msgid "Amendment Seconds A"
msgid "Amendment Seconds C"
msgstr "திருத்த நொடிகள் அ"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
#, fuzzy
-#| msgid "Amendment Text A"
msgid "Amendment Text C"
msgstr "திருத்த உரை அ"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "திருத்தங்கள்"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "நிகழ்பவை"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "பெரும்பான்மைத் தேவை"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "தரவும் புள்ளி விவரமும்"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "குறைந்தபட்ச தேவை"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "குறைந்த பட்ச கலந்தாயவு"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "வாக்கெடுப்பு"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "தருக்கம்"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "விளைவு"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "ஆதரவாளர்களுக்காக&nbsp;காத்திருக்கிறொம்&nbsp;"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "விவாதத்தில்"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "வாக்கெடுப்பு&nbsp;நடைபெறுகிறது "
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "தீர்மானிக்கப்பட்டது"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "திரும்பப் பெறப் பட்டது"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "ஏனைய"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "&nbsp;வாக்களிப்பின்&nbsp;முதற் பக்கத்திற்கு"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "எப்படி"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "பரிந்துரையொன்றை&nbsp;சமர்பிக்கவும்&nbsp;"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "பரிந்துரையொன்றை&nbsp;அமல் படுத்துக&nbsp;"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "பரிந்துரையொன்றை&nbsp;பின்பற்றவும்&nbsp;"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "விளைவொன்றை&nbsp;வாசிக்கவும்&nbsp;"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "வாக்களி"
diff --git a/tamil/po/wnpp.ta.po b/tamil/po/wnpp.ta.po
index 5e3642912e4..c801d6f84d0 100644
--- a/tamil/po/wnpp.ta.po
+++ b/tamil/po/wnpp.ta.po
@@ -56,13 +56,11 @@ msgstr "%s நாட்களாக தத்தெடுக்கப் பட
#: ../../english/template/debian/wnpp.wml:46
#, fuzzy
-#| msgid "%s days in adoption."
msgid "%s days in adoption, last activity today."
msgstr "%s நாட்களாக தத்தெடுக்கப் பட்டுள்ளது."
#: ../../english/template/debian/wnpp.wml:50
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "%s days in adoption, last activity yesterday."
msgstr "நேற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
@@ -85,57 +83,48 @@ msgstr "தயாரிப்பில் %s நாட்கள்."
#: ../../english/template/debian/wnpp.wml:72
#, fuzzy
-#| msgid "%s days in preparation."
msgid "%s days in preparation, last activity today."
msgstr "தயாரிப்பில் %s நாட்கள்."
#: ../../english/template/debian/wnpp.wml:76
#, fuzzy
-#| msgid "in preparation since yesterday."
msgid "%s days in preparation, last activity yesterday."
msgstr "நேற்றிலிருந்து தயாரிக்கப் பட்டு வருகிறது."
#: ../../english/template/debian/wnpp.wml:80
#, fuzzy
-#| msgid "%s days in preparation."
msgid "%s days in preparation, last activity %s days ago."
msgstr "தயாரிப்பில் %s நாட்கள்."
#. timespans for request for adoption (RFAs)
#: ../../english/template/debian/wnpp.wml:85
#, fuzzy
-#| msgid "in adoption since today."
msgid "adoption requested since today."
msgstr "இன்றிற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
#: ../../english/template/debian/wnpp.wml:89
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "adoption requested since yesterday."
msgstr "நேற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
#: ../../english/template/debian/wnpp.wml:93
#, fuzzy
-#| msgid "in adoption since today."
msgid "adoption requested since %s days."
msgstr "இன்றிற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
#. timespans for orphaned packages (Os)
#: ../../english/template/debian/wnpp.wml:98
#, fuzzy
-#| msgid "in adoption since today."
msgid "orphaned since today."
msgstr "இன்றிற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
#: ../../english/template/debian/wnpp.wml:102
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "orphaned since yesterday."
msgstr "நேற்றிலிருந்து தத்தெடுக்கப் பட்டுள்ளது."
#: ../../english/template/debian/wnpp.wml:106
#, fuzzy
-#| msgid "in preparation since today."
msgid "orphaned since %s days."
msgstr "இன்றிலிருந்து தயாரிக்கப் பட்டு வருகின்றது."
diff --git a/turkish/po/cdimage.tr.po b/turkish/po/cdimage.tr.po
index 9ce0e97bc5d..da3b7fea047 100644
--- a/turkish/po/cdimage.tr.po
+++ b/turkish/po/cdimage.tr.po
@@ -21,20 +21,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.8.11\n"
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../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:87
-msgid "ISO images"
-msgstr "ISO İmajları"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Jigdo dosyaları"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -131,3 +117,17 @@ msgid ""
msgstr ""
"CD/DVD'ler için İngilizce dilinde <a href=\"/MailingLists/disclaimer"
"\">kamuya açık eposta listesi</a>:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "ISO İmajları"
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr "Jigdo dosyaları"
diff --git a/turkish/po/consultants.tr.po b/turkish/po/consultants.tr.po
index 9a07b4de942..cf9a6166b70 100644
--- a/turkish/po/consultants.tr.po
+++ b/turkish/po/consultants.tr.po
@@ -20,6 +20,14 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.8.11\n"
+#: ../../english/template/debian/consultant.wml:6
+msgid "List of Consultants"
+msgstr "Danışman Listesi"
+
+#: ../../english/template/debian/consultant.wml:9
+msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+msgstr "<a href=\"./\">Debian danışmanlar sayfası</a>'na dönüş."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "İsim:"
@@ -75,11 +83,3 @@ msgid ""
msgstr ""
"<total_country> ülkede toplam <total_consultant> Debian danışmanı "
"bulunmaktadır."
-
-#: ../../english/template/debian/consultant.wml:6
-msgid "List of Consultants"
-msgstr "Danışman Listesi"
-
-#: ../../english/template/debian/consultant.wml:9
-msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-msgstr "<a href=\"./\">Debian danışmanlar sayfası</a>'na dönüş."
diff --git a/turkish/po/countries.tr.po b/turkish/po/countries.tr.po
index 8f7adbb4a62..5f7dab34f30 100644
--- a/turkish/po/countries.tr.po
+++ b/turkish/po/countries.tr.po
@@ -230,209 +230,214 @@ msgid "Kenya"
msgstr "Kenya"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazakistan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Kore"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuveyt"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazakistan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Litvanya"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Lüksemburg"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Letonya"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Fas"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldova"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Karadağ"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Madagaskar"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Makedonya Cumhuriyeti."
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Moğolistan"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Meksika"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Malezya"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Yeni Kaledonya"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Nikaragua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Hollanda"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Norveç"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Yeni Zellanda"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Panama"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Peru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Fransız Polinezyası"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Filipinler"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pakistan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Polonya"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Portekiz"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr "Réunion"
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Romanya"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Sırbistan"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Rusya"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Suudi Arabistan"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "İsveç"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Singapur"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Slovenya"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Slovakya"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "El Salvador"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Tayland"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Tacikistan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tunus"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Türkiye"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Tayvan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukrayna"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "ABD"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Uruguay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Özbekistan"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Venezuela"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Vietnam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Güney Afrika"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zimbabve"
diff --git a/turkish/po/distrib.tr.po b/turkish/po/distrib.tr.po
index 95ff1f7095b..3d8c8e02a9d 100644
--- a/turkish/po/distrib.tr.po
+++ b/turkish/po/distrib.tr.po
@@ -21,98 +21,67 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.8.11\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Anahtar kelime"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Göster"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Üzerinde ara"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr "anahtar sözcük ile biten yollar"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Sadece paket isimleri"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "buna benzer isime sahip dosyalar içeren paketler"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Açıklamalar"
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
-msgstr ""
-"isminde şu anahtar kelimenin bulunduğu dosya veya dizinler içeren paketler"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Kaynak paket isimleri"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
+msgstr "Sadece tam eşleşmişleri göster"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Dağıtım"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr "deneysel"
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "kararsız"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "test"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "kararlı"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "eski-kararlı"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Mimari"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "herhangi"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Ara"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
-msgstr "Sıfırla"
-
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
-msgstr "Üzerinde ara"
-
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
-msgstr "Sadece paket isimleri"
-
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
-msgstr "Açıklamalar"
-
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
-msgstr "Kaynak paket isimleri"
-
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
-msgstr "Sadece tam eşleşmişleri göster"
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Bölüm"
@@ -129,6 +98,37 @@ msgstr "katkı (contrib)"
msgid "non-free"
msgstr "özgür-olmayan (non-free)"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Ara"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Sıfırla"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Göster"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr "anahtar sözcük ile biten yollar"
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "buna benzer isime sahip dosyalar içeren paketler"
+
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
+msgstr ""
+"isminde şu anahtar kelimenin bulunduğu dosya veya dizinler içeren paketler"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Mimari"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
diff --git a/turkish/po/doc.tr.po b/turkish/po/doc.tr.po
index c4f074e39d8..67c0e2c13e3 100644
--- a/turkish/po/doc.tr.po
+++ b/turkish/po/doc.tr.po
@@ -19,113 +19,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../english/doc/books.data:31
-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:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
-msgid ""
-"Written by two Debian developers, this free book\n"
-" started as a translation of their French best-seller known as Cahier de\n"
-" 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:80
-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:101
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-" covers all aspects of the administration of Debian from the installation\n"
-" 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:120
-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:140
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment. It shows the full potential of "
-"the distribution (in its current version 8) 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:191
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Yazar"
#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Debian paketi"
+
+#: ../../english/doc/books.def:44
msgid "email:"
msgstr "eposta:"
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
msgid "Available at:"
msgstr "Bulunan yerler:"
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
msgid "CD Included:"
msgstr "CD içeriyor:"
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
msgid "Publisher:"
msgstr "Yayımcı:"
@@ -149,47 +64,50 @@ msgstr "Durum:"
msgid "Availability:"
msgstr "Bulunabilirlik:"
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
msgid "Latest version:"
msgstr "En son sürüm:"
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
msgid "(version <get-var version />)"
msgstr "(sürüm <get-var version />)"
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
msgid "plain text"
msgstr "düz metin"
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
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:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:177
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
+#: ../../english/doc/manuals.defs:185
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:188
+#: ../../english/doc/manuals.defs:203
msgid ""
"CVS sources working copy: set <code>CVSROOT</code>\n"
" to <kbd>:ext:<var>userid</var>@cvs.debian.org:/cvs/debian-boot</kbd>,\n"
@@ -199,20 +117,109 @@ 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:193
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr "Web üzerinden CVS"
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr "Debian paketi"
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
#, fuzzy
-#| msgid "Debian package"
msgid "Debian package (archived)"
msgstr "Debian paketi"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/turkish/po/newsevents.tr.po b/turkish/po/newsevents.tr.po
index e867551c790..ae6c6df5750 100644
--- a/turkish/po/newsevents.tr.po
+++ b/turkish/po/newsevents.tr.po
@@ -19,94 +19,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr ""
-
-#: ../../english/News/news.rdf.in:19
-#, fuzzy
-#| msgid "Latest News"
-msgid "Debian Latest News"
-msgstr "Güncel Haberler"
-
-#: ../../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 ""
-
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "İsim:"
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "Eposta:"
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "Önceki Konuşmalar:"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Diller:"
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Yerler:"
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Konular:"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr ""
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr ""
-
-#: ../../english/events/talks.defs:15
-#, fuzzy
-#| msgid "Languages:"
-msgid "Language:"
-msgstr "Diller:"
-
-#: ../../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 "Çok Yakında"
@@ -165,6 +77,134 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (ölü bağlantı)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"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."
+
+#: ../../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 "Bu bültenin <a href=\"../../\">Eski sayıları</a> mevcut."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+#, fuzzy
+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."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+#, fuzzy
+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."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:25
+#, 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 Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">%s</"
+"a> tarafından düzenlendi."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:30
+#, 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 Haftalık Haberlerin bu sayısı <a href=\"mailto:"
+"dwn@debian.org\">%s</a> tarafından düzenlendi."
+
+#. 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\" />%s tarafından çevirildi."
+
+#. 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\" />%s tarafından çevirildi."
+
+#. 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\" />%s tarafından çevirildi."
+
+#. 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\" />%s tarafından çevirildi."
+
+#: ../../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 ""
+"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."
+
+#. 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 Haftalık Haberlerin bu sayısı <a href="
+"\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+
+#. 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 Haftalık Haberlerin bu sayısı <a href=\"mailto:"
+"dwn@debian.org\">%s</a> tarafından düzenlendi."
+
+#. 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 ""
+"Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">%s</"
+"a> tarafından düzenlendi."
+
+#. 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\" />Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:"
+"dwn@debian.org\">%s</a> tarafından düzenlendi."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -346,157 +386,91 @@ msgid ""
"the following topics:"
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 in your mailbox, <a href=\"https://lists.debian."
-"org/debian-news/\">subscribe to the debian-news mailing list</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
+
+#: ../../english/events/talks.defs:9
+msgid "Title:"
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."
-#: ../../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 "Bu bültenin <a href=\"../../\">Eski sayıları</a> mevcut."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr ""
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
+#: ../../english/events/talks.defs:15
#, fuzzy
-#| msgid ""
-#| "<void id=\"singular\" />Debian Weekly News is edited by <a href=\"mailto:"
-#| "dwn@debian.org\">%s</a>."
-msgid ""
-"<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
-"debian-publicity@lists.debian.org\">%s</a>."
+msgid "Language:"
+msgstr "Diller:"
+
+#: ../../english/events/talks.defs:19
+msgid "Date:"
msgstr ""
-"<void id=\"singular\" />Debian Haftalık Haberlerin bu sayısı <a href="
-"\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-#, 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>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
msgstr ""
-"<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:"
-"dwn@debian.org\">%s</a> tarafından düzenlendi."
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:25
-#, 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>."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
msgstr ""
-"Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">%s</"
-"a> tarafından düzenlendi."
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:30
-#, 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>."
+#: ../../english/events/talks.defs:29
+msgid "source"
msgstr ""
-"<void id=\"plural\" />Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:"
-"dwn@debian.org\">%s</a> tarafından düzenlendi."
-#. 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\" />%s tarafından çevirildi."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr ""
-#. 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\" />%s tarafından çevirildi."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr ""
-#. 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\" />%s tarafından çevirildi."
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr ""
-#. 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\" />%s tarafından çevirildi."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr ""
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Konuşmacı Listesi"
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr ""
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "<a href=\"./\">Debian konuşmacıları sayfası</a>'na dönüş."
+#: ../../english/News/news.rdf.in:19
+#, fuzzy
+msgid "Debian Latest News"
+msgstr "Güncel Haberler"
-#: ../../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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
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."
-#. 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 Haftalık Haberlerin bu sayısı <a href="
-"\"mailto:dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~ msgid "Name:"
+#~ msgstr "İsim:"
-#. 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 Haftalık Haberlerin bu sayısı <a href=\"mailto:"
-"dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~ msgid "Email:"
+#~ msgstr "Eposta:"
-#. 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 ""
-"Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:dwn@debian.org\">%s</"
-"a> tarafından düzenlendi."
+#~ msgid "Previous Talks:"
+#~ msgstr "Önceki Konuşmalar:"
-#. 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\" />Debian Haftalık Haberlerin bu sayısı <a href=\"mailto:"
-"dwn@debian.org\">%s</a> tarafından düzenlendi."
+#~ msgid "Languages:"
+#~ msgstr "Diller:"
+
+#~ msgid "Location:"
+#~ msgstr "Yerler:"
+
+#~ msgid "Topics:"
+#~ msgstr "Konular:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "Konuşmacı Listesi"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "<a href=\"./\">Debian konuşmacıları sayfası</a>'na dönüş."
#, fuzzy
#~| msgid ""
diff --git a/turkish/po/organization.tr.po b/turkish/po/organization.tr.po
index 1305ccae888..b41c97c27b9 100644
--- a/turkish/po/organization.tr.po
+++ b/turkish/po/organization.tr.po
@@ -52,303 +52,338 @@ msgid "manager"
msgstr ""
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr ""
-
-#: ../../english/intro/organization.data:34
#, fuzzy
-#| msgid "Release Manager"
msgid "Stable Release Manager"
msgstr "Sürüm Yöneticisi"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr ""
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr ""
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "başkan"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
#, fuzzy
-#| msgid "Release Assistants"
msgid "assistant"
msgstr "Sürüm Yardımcıları"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "sekreter"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Ofis Üyeleri"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Dağıtım"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Tanıtım"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Destek ve Altyapı"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr ""
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Lider"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Teknik Komite"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Sekreter"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Geliştirilen Projeler"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP Arşivleri"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr ""
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
#, fuzzy
-#| msgid "Release Assistants"
msgid "FTP Assistants"
msgstr "Sürüm Yardımcıları"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr ""
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr ""
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr ""
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Ayrı paketler"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Sürüm Yönetimi"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
#, fuzzy
-#| msgid "Release Notes"
msgid "Release Team"
msgstr "Sürüm Notları"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Kalite Güvencesi"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Kurulum Sistemi Ekibi"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Sürüm Notları"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "CD imajları"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Üretim"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Test"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
#, fuzzy
-#| msgid "Support and Infrastructure"
msgid "Autobuilding infrastructure"
msgstr "Destek ve Altyapı"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr ""
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
#, fuzzy
-#| msgid "System Administration"
msgid "Buildd administration"
msgstr "Sistem Yönetimi"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Belgelendirme"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
#, 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:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Donanım Platformları"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Özel Yapılandırmalar"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Dizüstüler"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Güvenlik duvarları"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Gömülü sistemler"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Basınla İletişim"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Web Sayfaları"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr ""
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr ""
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
#, fuzzy
-#| msgid "Development Projects"
msgid "Debian Women Project"
msgstr "Geliştirilen Projeler"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr ""
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Olaylar"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Teknik Komite"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "İş Ortakları Programı"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Donanım Bağışları Koordinasyonu"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Kullanıcı desteği"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Hata Takip Sistemi"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
#, fuzzy
-#| msgid "Mailing Lists Administration"
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Eposta Listeleri Yönetimi"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
#, fuzzy
-#| msgid "New Maintainers Front Desk"
msgid "New Members Front Desk"
msgstr "Yeni Geliştiriciler Başvuru Masası"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
#, fuzzy
-#| msgid "Developer Accounts Managers"
msgid "Debian Account Managers"
msgstr "Geliştirici Hesapları Yöneticileri"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Anahtar halkası Yöneticileri (PGP ve GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Güvenlik Ekibi"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Danışmanlar Sayfası"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "CD Satıcıları Sayfası"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Kurallar"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Sistem Yönetimi"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -357,7 +392,7 @@ msgstr ""
"belirli bir paketin kurulumuna olan gereksinim gibi sorunlarla "
"karşılaştığınızda kullanacağınız adrestir."
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:469
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 "
@@ -367,68 +402,63 @@ 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:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "LDAP Geliştirici Dizinleri Yönetimi"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Yansılar"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "DNS Yöneticisi"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Paket Takip Sistemi"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
msgid ""
"<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
msgstr ""
-#: ../../english/intro/organization.data:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Alioth yöneticileri"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Yedine yetmişe çocuklar için Debian"
+#~ msgid "Individual Packages"
+#~ msgstr "Ayrı paketler"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Tıbbî uygulama ve araştırmalar için Debian"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Yedine yetmişe çocuklar için Debian"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Eğitim için Debian"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Tıbbî uygulama ve araştırmalar için Debian"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Resmî dairelerde Debian"
+#~ msgid "Debian for education"
+#~ msgstr "Eğitim için Debian"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Resmî dairelerde Debian"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Özürlüler için Debian"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Özürlüler için Debian"
-#: ../../english/intro/organization.data:486
#, 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 "Debian for medical practice and research"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Tıbbî uygulama ve araştırmalar için Debian"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Eğitim için Debian"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Eğitim için Debian"
#, fuzzy
#~| msgid "Installation System Team"
diff --git a/turkish/po/others.tr.po b/turkish/po/others.tr.po
index 0abd3ff058b..c33aec7a406 100644
--- a/turkish/po/others.tr.po
+++ b/turkish/po/others.tr.po
@@ -37,7 +37,6 @@ msgstr ""
#: ../../english/devel/debian-installer/ports-status.defs:30
#, fuzzy
-#| msgid "rc2 (broken)"
msgid "sarge (broken)"
msgstr "rc2 (bozuk)"
@@ -69,48 +68,6 @@ msgstr "<void id=\"d-i\" />Bilinmiyor"
msgid "Unavailable"
msgstr "Mevcut değil"
-#: ../../english/devel/join/nm-steps.inc:7
-#, fuzzy
-#| msgid "New maintainers' corner"
-msgid "New Members Corner"
-msgstr "Yeni geliştiriciler köşesi"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Adım 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Adım 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Adım 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Adım 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Adım 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-#, fuzzy
-#| msgid "Step 1"
-msgid "Step 6"
-msgstr "Adım 1"
-
-#: ../../english/devel/join/nm-steps.inc:16
-#, fuzzy
-#| msgid "Step 1"
-msgid "Step 7"
-msgstr "Adım 1"
-
-#: ../../english/devel/join/nm-steps.inc:19
-msgid "Applicants' checklist"
-msgstr "Başvuran adayların denetlemesi gereken liste"
-
#: ../../english/devel/website/tc.data:11
msgid ""
"See <a href=\"m4_HOME/intl/french/\">https://www.debian.org/intl/french/</a> "
@@ -125,16 +82,11 @@ msgstr ""
#: ../../english/devel/website/tc.data:15
#: ../../english/devel/website/tc.data:16
#, fuzzy
-#| msgid "Additional Information"
msgid "More information"
msgstr "Ek Bilgiler"
#: ../../english/devel/website/tc.data:13
#, fuzzy
-#| msgid ""
-#| "See <a href=\"m4_HOME/intl/spanish/coordinacion.es.html\">http://www."
-#| "debian.org/intl/spanish/coordinacion.es.html</a> (only available in "
-#| "Spanish) for more information."
msgid ""
"See <a href=\"m4_HOME/intl/spanish/\">https://www.debian.org/intl/spanish/</"
"a> (only available in Spanish) for more information."
@@ -145,19 +97,16 @@ msgstr ""
#: ../../english/distrib/pre-installed.defs:18
#, fuzzy
-#| msgid "Phone:"
msgid "Phone"
msgstr "Telefon:"
#: ../../english/distrib/pre-installed.defs:19
#, fuzzy
-#| msgid "Fax:"
msgid "Fax"
msgstr "Faks:"
#: ../../english/distrib/pre-installed.defs:21
#, fuzzy
-#| msgid "Address:"
msgid "Address"
msgstr "Adres:"
@@ -189,131 +138,95 @@ msgstr "[Debian powered]"
msgid "[Debian] (mini button)"
msgstr "[Debian] (mini buton)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr ""
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Ürünler"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "Tişörtler"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "şapkalar"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "çıkartmalar"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "kupalar"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "giyim diğer"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "polo gömlekler"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "frizbiler"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "mouse altlıkları"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "rozetler"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "basketbol potaları"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "küpeler"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "çantalar"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
#, fuzzy
-#| msgid "suitcases"
msgid "pillowcases"
msgstr "çantalar"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr ""
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr ""
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr ""
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "TAMAM"
@@ -358,6 +271,80 @@ msgstr "Sürüm"
msgid "URL"
msgstr "URL"
+#: ../../english/devel/join/nm-steps.inc:7
+#, fuzzy
+msgid "New Members Corner"
+msgstr "Yeni geliştiriciler köşesi"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Adım 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Adım 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Adım 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Adım 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Adım 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+#, fuzzy
+msgid "Step 6"
+msgstr "Adım 1"
+
+#: ../../english/devel/join/nm-steps.inc:16
+#, fuzzy
+msgid "Step 7"
+msgstr "Adım 1"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Başvuran adayların denetlemesi gereken liste"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
+
#~ msgid "p<get-var page />"
#~ msgstr "p<get-var page />"
diff --git a/turkish/po/partners.tr.po b/turkish/po/partners.tr.po
index 021ae624d61..644cd23a422 100644
--- a/turkish/po/partners.tr.po
+++ b/turkish/po/partners.tr.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/turkish/po/ports.tr.po b/turkish/po/ports.tr.po
index 748ee7ca556..77b4fb22b4b 100644
--- a/turkish/po/ports.tr.po
+++ b/turkish/po/ports.tr.po
@@ -20,22 +20,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.8.11\n"
-#: ../../english/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd-CD'leri"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "İletişim"
@@ -100,6 +84,22 @@ msgstr "Destek"
msgid "Systems"
msgstr "Sistemler"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd-CD'leri"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD (i386)"
diff --git a/turkish/po/security.tr.po b/turkish/po/security.tr.po
index 9c8c17711cb..1904faea69b 100644
--- a/turkish/po/security.tr.po
+++ b/turkish/po/security.tr.po
@@ -19,40 +19,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../english/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Debian Güvenlik"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Debian Güvenlik Duyuruları"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "S"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Mitre CVE sözlüğü"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "Securityfocus Bugtraq (hata takip) veritabanı"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "CERT Duyuruları"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "US-CERT zayıflık Notları"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Kaynak:"
@@ -135,3 +101,37 @@ msgstr "CERT'ten gelen zayıflıklar, öneriler ve olay notları:"
msgid "No other external database security references currently available."
msgstr ""
"Hali hazırda başka bir harici güvenlik veritabanı referansı mevcut değil."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "S"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Debian Güvenlik"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Debian Güvenlik Duyuruları"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Mitre CVE sözlüğü"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "Securityfocus Bugtraq (hata takip) veritabanı"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "CERT Duyuruları"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "US-CERT zayıflık Notları"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
diff --git a/turkish/po/stats.tr.po b/turkish/po/stats.tr.po
index 180df1d2c92..b8769397efd 100644
--- a/turkish/po/stats.tr.po
+++ b/turkish/po/stats.tr.po
@@ -12,22 +12,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -45,11 +29,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -64,15 +48,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -82,6 +57,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -229,3 +213,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/turkish/po/templates.tr.po b/turkish/po/templates.tr.po
index 82f96035885..9a340b6eb69 100644
--- a/turkish/po/templates.tr.po
+++ b/turkish/po/templates.tr.po
@@ -19,20 +19,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../english/search.xml.in:7
-#, fuzzy
-#| msgid "Debian Security"
-msgid "Debian website"
-msgstr "Debian Güvenlik"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr ""
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian"
msgstr "Debian'a Yardım"
@@ -54,10 +43,6 @@ msgstr "Debian Projesi"
#: ../../english/template/debian/common_translation.wml:13
#, fuzzy
-#| msgid ""
-#| "Debian GNU/Linux is a free distribution of the GNU/Linux operating "
-#| "system. It is maintained and updated through the work of many users who "
-#| "volunteer their time and effort."
msgid ""
"Debian is an operating system and a distribution of Free Software. It is "
"maintained and updated through the work of many users who volunteer their "
@@ -98,7 +83,6 @@ msgstr "Bize ulaşın"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Sürüm Bilgisi"
@@ -174,10 +158,14 @@ msgstr "Debian'ı Edinme"
#: ../../english/template/debian/common_translation.wml:91
#, fuzzy
-#| msgid "Debian Books"
msgid "The Debian Blog"
msgstr "Debian Kitapları"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Son Güncelleme"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -223,13 +211,8 @@ 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -242,30 +225,28 @@ 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:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Son Güncelleme"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Telif Hakkı"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr ""
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
#, fuzzy
-#| msgid ""
-#| "Debian is a registered trademark of 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."
@@ -282,6 +263,14 @@ msgstr "Bu sayfa aşağıdaki dillerde de mevcuttur:"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Varsayılan belge <a href=m4_HOME/intro/cn>dili nasıl ayarlanır</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian Uluslararası"
@@ -300,13 +289,11 @@ msgstr "Haftalık haberler"
#: ../../english/template/debian/links.tags.wml:16
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Project News"
msgstr "Debian Projesi"
#: ../../english/template/debian/links.tags.wml:19
#, fuzzy
-#| msgid "Weekly News"
msgid "Project News"
msgstr "Haftalık haberler"
@@ -332,7 +319,6 @@ msgstr "Debian Kitapları"
#: ../../english/template/debian/links.tags.wml:37
#, fuzzy
-#| msgid "Help Debian"
msgid "Debian Wiki"
msgstr "Debian'a Yardım"
@@ -366,7 +352,6 @@ msgstr "Geliştiriciler&nbsp;veritabanı"
#: ../../english/template/debian/links.tags.wml:64
#, fuzzy
-#| msgid "Debian Books"
msgid "Debian FAQ"
msgstr "Debian Kitapları"
@@ -476,7 +461,6 @@ msgstr "Debian Geliştirici Paketlerine Genel bakış"
#: ../../english/template/debian/navbar.wml:10
#, fuzzy
-#| msgid "Debian Project"
msgid "Debian Home"
msgstr "Debian Projesi"
@@ -490,13 +474,11 @@ msgstr "önerilen"
#: ../../english/template/debian/recent_list.wml:15
#, fuzzy
-#| msgid "Discussion"
msgid "in discussion"
msgstr "Değerlendirme"
#: ../../english/template/debian/recent_list.wml:19
#, fuzzy
-#| msgid "voted on"
msgid "voting open"
msgstr "oylandı"
@@ -524,6 +506,15 @@ msgstr "(yeni sürüm)"
msgid "Report"
msgstr "Rapor"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -559,12 +550,20 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
#, fuzzy
-#| msgid "Back to the <a href=\"./\">Debian speakers page</a>."
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "<a href=\"./\">Debian konuşmacıları sayfası</a>'na dönüş."
+#: ../../english/search.xml.in:7
+#, fuzzy
+msgid "Debian website"
+msgstr "Debian Güvenlik"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr ""
+
#~ msgid "More information"
#~ msgstr "Daha fazla bilgi için"
diff --git a/turkish/po/vote.tr.po b/turkish/po/vote.tr.po
index c15d4806ddb..4644fbab1d5 100644
--- a/turkish/po/vote.tr.po
+++ b/turkish/po/vote.tr.po
@@ -33,248 +33,275 @@ msgstr ""
#: ../../english/template/debian/votebar.wml:22
#, fuzzy
-#| msgid "Donations"
msgid "Nominations"
msgstr "Bağışlar"
#: ../../english/template/debian/votebar.wml:25
#, fuzzy
-#| msgid "Debian CD team"
+msgid "Withdrawals"
+msgstr "Geri alınmış"
+
+#: ../../english/template/debian/votebar.wml:28
+#, fuzzy
msgid "Debate"
msgstr "Debian CD ekibi"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr ""
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
#, fuzzy
-#| msgid "proposed"
msgid "Proposer"
msgstr "önerilen"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+msgid "Proposal G Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:58
+msgid "Proposal H Proposer"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+msgid "Proposal G Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:85
+msgid "Proposal H Seconds"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr ""
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr ""
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr ""
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr ""
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr ""
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "önerilen"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "önerilen"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr ""
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr ""
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr ""
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr ""
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr ""
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr ""
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr ""
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr ""
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr ""
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr ""
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr ""
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
#, fuzzy
-#| msgid "Discussion"
msgid "Minimum Discussion"
msgstr "Değerlendirme"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr ""
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr ""
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Sponsor Aranıyor"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Fikir&nbsp;Alışverişi&nbsp;Sırasında"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Açık&nbsp;Anketler"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Kararlaştırılan"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Geri alınmış"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Diğer"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "Ana&nbsp;Anket&nbsp;Sayfası"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Nasıl"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Öneri&nbsp;Gönder"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Öneri&nbsp;Değiştir"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Öneri&nbsp;İzle"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Sonuçlara&nbsp;Gözat"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Oyla"
diff --git a/turkish/po/wnpp.tr.po b/turkish/po/wnpp.tr.po
index d3f3c0ffb4f..04dd995e779 100644
--- a/turkish/po/wnpp.tr.po
+++ b/turkish/po/wnpp.tr.po
@@ -59,13 +59,11 @@ msgstr "%s günden beri el değiştirme sürecinde"
#: ../../english/template/debian/wnpp.wml:46
#, fuzzy
-#| msgid "%s days in adoption."
msgid "%s days in adoption, last activity today."
msgstr "%s günden beri el değiştirme sürecinde"
#: ../../english/template/debian/wnpp.wml:50
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "%s days in adoption, last activity yesterday."
msgstr "dünden beri el değiştirme sürecinde"
@@ -88,57 +86,48 @@ msgstr "%s günden beri hazırlanıyor"
#: ../../english/template/debian/wnpp.wml:72
#, fuzzy
-#| msgid "%s days in preparation."
msgid "%s days in preparation, last activity today."
msgstr "%s günden beri hazırlanıyor"
#: ../../english/template/debian/wnpp.wml:76
#, fuzzy
-#| msgid "in preparation since yesterday."
msgid "%s days in preparation, last activity yesterday."
msgstr "dünden beri hazırlanıyor"
#: ../../english/template/debian/wnpp.wml:80
#, fuzzy
-#| msgid "%s days in preparation."
msgid "%s days in preparation, last activity %s days ago."
msgstr "%s günden beri hazırlanıyor"
#. timespans for request for adoption (RFAs)
#: ../../english/template/debian/wnpp.wml:85
#, fuzzy
-#| msgid "in adoption since today."
msgid "adoption requested since today."
msgstr "bugün itibarıyla el değiştirme sürecinde"
#: ../../english/template/debian/wnpp.wml:89
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "adoption requested since yesterday."
msgstr "dünden beri el değiştirme sürecinde"
#: ../../english/template/debian/wnpp.wml:93
#, fuzzy
-#| msgid "in adoption since today."
msgid "adoption requested since %s days."
msgstr "bugün itibarıyla el değiştirme sürecinde"
#. timespans for orphaned packages (Os)
#: ../../english/template/debian/wnpp.wml:98
#, fuzzy
-#| msgid "in adoption since today."
msgid "orphaned since today."
msgstr "bugün itibarıyla el değiştirme sürecinde"
#: ../../english/template/debian/wnpp.wml:102
#, fuzzy
-#| msgid "in adoption since yesterday."
msgid "orphaned since yesterday."
msgstr "dünden beri el değiştirme sürecinde"
#: ../../english/template/debian/wnpp.wml:106
#, fuzzy
-#| msgid "in preparation since today."
msgid "orphaned since %s days."
msgstr "bugün itibarıyla hazırlanmaya başladı"
diff --git a/ukrainian/po/cdimage.uk.po b/ukrainian/po/cdimage.uk.po
index 34b4c955755..9ca5bd0b212 100644
--- a/ukrainian/po/cdimage.uk.po
+++ b/ukrainian/po/cdimage.uk.po
@@ -14,20 +14,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"
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../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:87
-msgid "ISO images"
-msgstr ""
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr ""
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -75,7 +61,6 @@ msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-дзеркала"
#: ../../english/template/debian/cdimage.wml:43
#, fuzzy
-#| msgid "<void id=\"dc_misc\" />Misc"
msgid "<void id=\"dc_verify\" />Verify"
msgstr "<void id=\"dc_misc\" />Різне"
@@ -126,3 +111,17 @@ msgid ""
msgstr ""
"Англомовний <a href=\"/MailingLists/disclaimer\">список розсилки</a> "
"присвячений CD/DVD:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr ""
+
+#: ../../english/devel/debian-installer/images.data:88
+msgid "Jigdo files"
+msgstr ""
diff --git a/ukrainian/po/consultants.uk.po b/ukrainian/po/consultants.uk.po
index c00037e3070..938efd1d71b 100644
--- a/ukrainian/po/consultants.uk.po
+++ b/ukrainian/po/consultants.uk.po
@@ -17,6 +17,14 @@ 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/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 "Повернутися на <a href=\"./\">сторінку консультантів Debian</a>."
+
#: ../../english/consultants/consultant.defs:6
msgid "Name:"
msgstr "Ім'я:"
@@ -72,11 +80,3 @@ msgid ""
msgstr ""
"<total_consultant> консультантів Debian представлені у <total_country> "
"країнах світу."
-
-#: ../../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 "Повернутися на <a href=\"./\">сторінку консультантів Debian</a>."
diff --git a/ukrainian/po/countries.uk.po b/ukrainian/po/countries.uk.po
index 055f2890b43..486370f25d2 100644
--- a/ukrainian/po/countries.uk.po
+++ b/ukrainian/po/countries.uk.po
@@ -223,210 +223,215 @@ msgid "Kenya"
msgstr "Кенія"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Казахстан"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Корея"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Кувейт"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Казахстан"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Шрі-Ланка"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Литва"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Люксембург"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Латвія"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Марокко"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Молдова"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Чорногорія"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Мадагаскар"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Македонія"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Монголія"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Мальта"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Мексика"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Малайзія"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Нова Каледонія"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Нікарагуа"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Нідерланди"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Норвегія"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Нова Зеландія"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Панама"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Перу"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Французька Полінезія"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Філіппіни"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Пакистан"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Польща"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Португалія"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Румунія"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Сербія"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Росія"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "Саудівська Аравія"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Швеція"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Сінгапур"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Словенія"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Словаччина"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "Сальвадор"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Таїланд"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Таджикистан"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Туніс"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Туреччина"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Тайвань"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Україна"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Сполучені Штати"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "Уругвай"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "Узбекистан"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Венесуела"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "В'єтнам"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Вануату"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Південна Африка"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Зімбабве"
diff --git a/ukrainian/po/date.uk.po b/ukrainian/po/date.uk.po
index acb625c3690..13c10931877 100644
--- a/ukrainian/po/date.uk.po
+++ b/ukrainian/po/date.uk.po
@@ -198,7 +198,6 @@ msgstr "q{[%]d [%]s}, $mday, $mon_str"
#. replace all % by [%]
#: ../../english/template/debian/ctime.wml:99
#, fuzzy
-#| msgid "q{[%]02d [%]s [%]d}, $mday, $mon_str, $year"
msgid "q{[%]s [%]s}, $mon_str, $year"
msgstr "q{[%]02d [%]s [%]d&nbsp;р.}, $mday, $mon_str, $year"
diff --git a/ukrainian/po/distrib.uk.po b/ukrainian/po/distrib.uk.po
index cb7f798235c..e236e5d9ec9 100644
--- a/ukrainian/po/distrib.uk.po
+++ b/ukrainian/po/distrib.uk.po
@@ -14,101 +14,67 @@ 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/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr "Ключове слово"
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
-msgstr "Показувати"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
+msgstr "Шукати"
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
-msgstr ""
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
+msgstr "Тільки назви пакунків"
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
-msgstr "пакунки, що містять файли з такою назвою"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
+msgstr "Описи"
-#: ../../english/distrib/search_contents-form.inc:22
-#, fuzzy
-#| msgid ""
-#| "packages that contain files or directories whose names contain the keyword"
-msgid "packages that contain files whose names contain the keyword"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr "Назви джерельних пакунків"
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
msgstr ""
-"пакунки, що містять файли чи директорії назви яких містять ключове слово"
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr "Дистрибутив"
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr "нестабільний (unstable)"
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr "тестовий (testing)"
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr "стабільний (stable)"
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
msgid "oldstable"
msgstr "oldstable"
-#: ../../english/distrib/search_contents-form.inc:33
-msgid "Architecture"
-msgstr "Архітектура"
-
-#: ../../english/distrib/search_contents-form.inc:38
#: ../../english/distrib/search_packages-form.inc:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr "будь-який"
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
-msgstr "Шукати"
-
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-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"
-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:21
-msgid "Only show exact matches"
-msgstr ""
-
#: ../../english/distrib/search_packages-form.inc:34
msgid "Section"
msgstr "Розділ"
@@ -125,6 +91,38 @@ msgstr "contrib"
msgid "non-free"
msgstr "non-free"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
+msgstr "Шукати"
+
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
+msgstr "Скинути"
+
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
+msgstr "Показувати"
+
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
+msgstr ""
+
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
+msgstr "пакунки, що містять файли з такою назвою"
+
+#: ../../english/distrib/search_contents-form.inc:22
+#, fuzzy
+msgid "packages that contain files whose names contain the keyword"
+msgstr ""
+"пакунки, що містять файли чи директорії назви яких містять ключове слово"
+
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
+msgstr "Архітектура"
+
#: ../../english/releases/arches.data:8
msgid "Alpha"
msgstr "Alpha"
@@ -151,13 +149,11 @@ msgstr ""
#: ../../english/releases/arches.data:14
#, fuzzy
-#| msgid "HP PA/RISC"
msgid "HP PA-RISC"
msgstr "HP PA/RISC"
#: ../../english/releases/arches.data:15
#, fuzzy
-#| msgid "Hurd (i386)"
msgid "Hurd 32-bit PC (i386)"
msgstr "Hurd (i386)"
@@ -167,7 +163,6 @@ msgstr ""
#: ../../english/releases/arches.data:17
#, fuzzy
-#| msgid "Intel IA-64"
msgid "Intel Itanium IA-64"
msgstr "Intel IA-64"
diff --git a/ukrainian/po/doc.uk.po b/ukrainian/po/doc.uk.po
index bbe977fc529..a028c389c2b 100644
--- a/ukrainian/po/doc.uk.po
+++ b/ukrainian/po/doc.uk.po
@@ -13,113 +13,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: ../../english/doc/books.data:31
-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:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
-msgid ""
-"Written by two Debian developers, this free book\n"
-" started as a translation of their French best-seller known as Cahier de\n"
-" 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:80
-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:101
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-" covers all aspects of the administration of Debian from the installation\n"
-" 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:120
-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:140
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment. It shows the full potential of "
-"the distribution (in its current version 8) 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:191
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr "Автор:"
#: ../../english/doc/books.def:41
+#, fuzzy
+msgid "Debian Release:"
+msgstr "Пакунок Debian"
+
+#: ../../english/doc/books.def:44
msgid "email:"
msgstr "електронна пошта:"
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
msgid "Available at:"
msgstr "Доступно в:"
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
msgid "CD Included:"
msgstr "Поміщені КД:"
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
msgid "Publisher:"
msgstr "Видавець:"
@@ -143,65 +58,158 @@ msgstr "Стан:"
msgid "Availability:"
msgstr "Доступність:"
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
msgid "Latest version:"
msgstr "Найновіша версія:"
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
msgid "(version <get-var version />)"
msgstr "(версія <get-var version />)"
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
msgid "plain text"
msgstr "звичайний текст"
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
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:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr "Веб-інтерфейс"
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr "Інтерфейс VCS:"
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:177
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
+#: ../../english/doc/manuals.defs:185
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:188
+#: ../../english/doc/manuals.defs:203
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
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr "CVS через веб"
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr "Пакунок Debian"
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
msgid "Debian package (archived)"
msgstr "Пакунок Debian (заархівований)"
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr "HTML"
diff --git a/ukrainian/po/newsevents.uk.po b/ukrainian/po/newsevents.uk.po
index c73c40ac435..a20332b0634 100644
--- a/ukrainian/po/newsevents.uk.po
+++ b/ukrainian/po/newsevents.uk.po
@@ -16,90 +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/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Новини Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Останні новини 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 ""
-
-#: ../../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 "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 "Анотація"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Майбутні події"
@@ -158,6 +74,132 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (мертве посилання)"
+#: ../../english/template/debian/projectnews/footer.wml:6
+#, fuzzy
+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 ""
+"Щоб кожен тиждень отримувати новини поштою, <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
+msgid "<a href=\"../../\">Back issues</a> of this newsletter are available."
+msgstr "Також наявні <a href=\"../../\">минулі випуски</a>."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:15
+#, fuzzy
+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>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:20
+#, fuzzy
+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>."
+
+#. One editor name only
+#: ../../english/template/debian/projectnews/footer.wml:25
+#, 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\" />Цей випуск щотижневих новин випустив <a href="
+"\"mailto:dwn@debian.org\">%s</a>."
+
+#. Two or more editors
+#: ../../english/template/debian/projectnews/footer.wml:30
+#, 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\" />Цей випуск щотижневих новин випустили <a href=\"mailto:"
+"dwn@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\" />Переклав %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\" />Переклали %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\" />Переклала %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\" />Переклали %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 ""
+"Щоб кожен тиждень отримувати новини поштою, <a href=\"https://lists.debian."
+"org/debian-news/\">підпишіться на список розсилки 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\" />Щотижневі новини Debian випускає <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 випускають <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\" />Цей випуск щотижневих новин випустив <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\" />Цей випуск щотижневих новин випустили <a href=\"mailto:"
+"dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -339,155 +381,86 @@ msgid ""
"the following topics:"
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 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>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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=\"../../\">минулі випуски</a>."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Назва:"
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:15
-#, 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>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Автор:"
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:20
-#, 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>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Мова:"
-#. One editor name only
-#: ../../english/template/debian/projectnews/footer.wml:25
-#, 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>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Дата:"
-#. Two or more editors
-#: ../../english/template/debian/projectnews/footer.wml:30
-#, 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>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Подія:"
-#. 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\" />Переклав %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Слайди:"
-#. 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\" />Переклали %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "джерельний код"
-#. 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\" />Переклала %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Переклали %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Список доповідачів"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Повернутися на <a href=\"./\">сторінку доповідачів Debian</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+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>."
-msgstr ""
-"Щоб кожен тиждень отримувати новини поштою, <a href=\"https://lists.debian."
-"org/debian-news/\">підпишіться на список розсилки debian-news</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Новини Debian"
-#. 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 випускає <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Останні новини 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>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
msgstr ""
-"<void id=\"plural\" />Щотижневі новини Debian випускають <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\" />Цей випуск щотижневих новин випустив <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Name:"
+#~ 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 ""
-"<void id=\"plural\" />Цей випуск щотижневих новин випустили <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#~ msgid "Email:"
+#~ msgstr "Електронна пошта:"
+
+#~ msgid "Languages:"
+#~ msgstr "Мови:"
+
+#~ msgid "Location:"
+#~ msgstr "Місце:"
+
+#~ msgid "Topics:"
+#~ msgstr "Теми:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "Список доповідачів"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Повернутися на <a href=\"./\">сторінку доповідачів Debian</a>."
#, fuzzy
#~| msgid ""
diff --git a/ukrainian/po/organization.uk.po b/ukrainian/po/organization.uk.po
index 5f9fd2a9add..685322745b5 100644
--- a/ukrainian/po/organization.uk.po
+++ b/ukrainian/po/organization.uk.po
@@ -49,247 +49,295 @@ msgid "manager"
msgstr "керівник"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "КСВ"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Керівник стабільного випуску"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "КСВ"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "чарівник"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "голова"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "помічник"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "секретар"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Керівники"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Дистрибутив"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr "Зв'язок та інформаційна підтримка"
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
msgid "Publicity team"
msgstr "Команда зв'язків з громадськістю"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Підтримка та інфраструктура"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr "Чисті суміші Debian"
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Лідер"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Технічний комітет"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Секретар"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Проекти розробки"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "FTP-архіви"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "FTP-майстри"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "FTP-помічники"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "FTP-чарівники"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Зворотнє перенесення"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Команда зворотнього перенесення"
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Окремі пакунки пакунки"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Керування випуском"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Команда, відповідальна за випуск"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Забезпечення якості"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Команда системи встановлення"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Інформація про випуск"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Образи компакт-дисків"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Виробництво"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Тестування"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Інфраструктура автоматичного збирання"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Команда підготовки до збирання"
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Адміністрування збирання"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Документація"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
msgid "Work-Needing and Prospective Packages list"
msgstr "Список пакунків що потребують доробки або плануються"
-#: ../../english/intro/organization.data:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Перенесення"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Спеціальні конфігурації"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Лептопи"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Брандмауери"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Вбудовані системи"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Контакт для преси"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Веб-сторінки"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Планета Debian"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr "Інформаційна підтримка"
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Проект Жінки Debian"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr "Анти-домагання"
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Події"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
msgid "DebConf Committee"
msgstr "Комітет DebConf"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Партнерська програма"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Координація пожертвування обладнання"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Підтримка користувачів"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Система відслідковування помилок"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Керування списками розсилки та архіви списків розсилки"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr "Реєстраційний стіл нових членів"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Керівники облікових записів Debian (КОЗД)"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -297,31 +345,31 @@ msgstr ""
"Щоб надіслати приватне повідомлення усім КОЗД, використовуйте ключ GPG "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
msgid "Keyring Maintainers (PGP and GPG)"
msgstr "Супроводжуючі зв'язок ключів (PGP та GPG)"
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Команда безпеки"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Сторінка консультантів"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "Сторінка постачальників компакт-дисків"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Політика"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Системне адміністрування"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -330,7 +378,7 @@ msgstr ""
"машинами Debian, включно з проблемами з паролями, або якщо вам потрібно "
"встановити пакунок."
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:469
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 "
@@ -340,68 +388,66 @@ msgstr ""
"<a href=\"https://db.debian.org/machines.cgi\">Машини Debian</a>, вона "
"повинна містити інформацію про адміністраторів кожної машини."
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "Адміністратор LDAP-каталогу розробників"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Дзеркала"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "Супроводжуючий DNS"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Система відслідковування пакунків"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
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:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Адміністратори Alioth"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Debian для дітей від 1 до 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Чисті суміші Debian"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Debian для медичної практики та досліджень"
+#~ msgid "Individual Packages"
+#~ msgstr "Окремі пакунки пакунки"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Debian для освіти"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian для дітей від 1 до 99"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Debian в адвокатурах"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian для медичної практики та досліджень"
+
+#~ msgid "Debian for education"
+#~ msgstr "Debian для освіти"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian в адвокатурах"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Debian для людей з обмеженими можливостями"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian для людей з обмеженими можливостями"
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr "Debian для науки та суміжних досліджень"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian для науки та суміжних досліджень"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian для освіти"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian для освіти"
#~| msgid "Installation System Team"
#~ msgid "Live System Team"
diff --git a/ukrainian/po/others.uk.po b/ukrainian/po/others.uk.po
index f4bebbad383..91aaee2e777 100644
--- a/ukrainian/po/others.uk.po
+++ b/ukrainian/po/others.uk.po
@@ -65,42 +65,6 @@ msgstr "<void id=\"d-i\" />Невідомо"
msgid "Unavailable"
msgstr "Недоступно"
-#: ../../english/devel/join/nm-steps.inc:7
-msgid "New Members Corner"
-msgstr "Куточок нових членів"
-
-#: ../../english/devel/join/nm-steps.inc:10
-msgid "Step 1"
-msgstr "Крок 1"
-
-#: ../../english/devel/join/nm-steps.inc:11
-msgid "Step 2"
-msgstr "Крок 2"
-
-#: ../../english/devel/join/nm-steps.inc:12
-msgid "Step 3"
-msgstr "Крок 3"
-
-#: ../../english/devel/join/nm-steps.inc:13
-msgid "Step 4"
-msgstr "Крок 4"
-
-#: ../../english/devel/join/nm-steps.inc:14
-msgid "Step 5"
-msgstr "Крок 5"
-
-#: ../../english/devel/join/nm-steps.inc:15
-msgid "Step 6"
-msgstr "Крок 6"
-
-#: ../../english/devel/join/nm-steps.inc:16
-msgid "Step 7"
-msgstr "Крок 7"
-
-#: ../../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> "
@@ -164,131 +128,96 @@ msgstr ""
msgid "[Debian] (mini button)"
msgstr "[Debian] (мінікнопка)"
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr "те ж саме, що і вище"
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr "Товари"
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr "футболки"
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr "капелюхи"
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr "наклейки"
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr "кружки"
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr "інший одяг"
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr "теніска"
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr "фрізбі"
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr "коврики для миши"
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr "значки"
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr "баскетбольні корзини"
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr "сережки"
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr "валізи"
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr "парасолі"
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr "наволочки"
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr "брелоки"
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr "швейцарські армійські ножі"
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr "USB-носії"
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr "ремінці"
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr "інше"
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr "Жертвує гроші Debian"
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
"Гроші використовуються для організації місцевих подій, присвячених вільному "
"ПЗ"
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr "Як давно ви користуєтесь Debian?"
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr "Ви розробник Debian?"
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr "Якими областями Debian Ви займаєтесь?"
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr "Що зацікавило Вас у роботі з Debian?"
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr "Трішки про тебе..."
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr "Гаразд"
@@ -332,3 +261,74 @@ msgstr "Версія"
#: ../../english/y2k/l10n.data:36
msgid "URL"
msgstr "URL"
+
+#: ../../english/devel/join/nm-steps.inc:7
+msgid "New Members Corner"
+msgstr "Куточок нових членів"
+
+#: ../../english/devel/join/nm-steps.inc:10
+msgid "Step 1"
+msgstr "Крок 1"
+
+#: ../../english/devel/join/nm-steps.inc:11
+msgid "Step 2"
+msgstr "Крок 2"
+
+#: ../../english/devel/join/nm-steps.inc:12
+msgid "Step 3"
+msgstr "Крок 3"
+
+#: ../../english/devel/join/nm-steps.inc:13
+msgid "Step 4"
+msgstr "Крок 4"
+
+#: ../../english/devel/join/nm-steps.inc:14
+msgid "Step 5"
+msgstr "Крок 5"
+
+#: ../../english/devel/join/nm-steps.inc:15
+msgid "Step 6"
+msgstr "Крок 6"
+
+#: ../../english/devel/join/nm-steps.inc:16
+msgid "Step 7"
+msgstr "Крок 7"
+
+#: ../../english/devel/join/nm-steps.inc:19
+msgid "Applicants' checklist"
+msgstr "Контрольний список заявника"
+
+#: ../../english/mirror/submit.inc:7
+msgid "same as the above"
+msgstr "те ж саме, що і вище"
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr "Як давно ви користуєтесь Debian?"
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr "Ви розробник Debian?"
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr "Якими областями Debian Ви займаєтесь?"
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr "Що зацікавило Вас у роботі з Debian?"
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr "Трішки про тебе..."
diff --git a/ukrainian/po/partners.uk.po b/ukrainian/po/partners.uk.po
index de08d58abab..267d7146e36 100644
--- a/ukrainian/po/partners.uk.po
+++ b/ukrainian/po/partners.uk.po
@@ -88,7 +88,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -172,20 +172,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -196,7 +209,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -204,7 +217,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -213,7 +226,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -221,7 +234,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -229,7 +242,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -239,27 +252,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -267,14 +280,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -283,7 +296,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -293,35 +306,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -331,7 +344,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -341,7 +354,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -350,7 +363,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -358,7 +371,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -368,7 +381,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -379,14 +392,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -395,7 +408,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -405,7 +418,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -413,7 +426,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -421,7 +434,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -431,14 +444,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -449,7 +462,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -457,7 +470,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -465,7 +478,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -473,13 +486,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -487,7 +500,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/ukrainian/po/ports.uk.po b/ukrainian/po/ports.uk.po
index e732b5ca673..e90ad795d3f 100644
--- a/ukrainian/po/ports.uk.po
+++ b/ukrainian/po/ports.uk.po
@@ -16,22 +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/ports/alpha/menu.inc:6
-msgid "Debian for Alpha"
-msgstr "Debian для Alpha"
-
-#: ../../english/ports/hppa/menu.inc:6
-msgid "Debian for PA-RISC"
-msgstr "Debian для PA-RISC"
-
-#: ../../english/ports/hurd/menu.inc:10
-msgid "Hurd CDs"
-msgstr "Hurd CD"
-
-#: ../../english/ports/ia64/menu.inc:6
-msgid "Debian for IA-64"
-msgstr "Debian для IA-64"
-
#: ../../english/ports/menu.defs:11
msgid "Contact"
msgstr "Контакти"
@@ -97,6 +81,22 @@ msgstr "Постачання"
msgid "Systems"
msgstr "Системи"
+#: ../../english/ports/alpha/menu.inc:6
+msgid "Debian for Alpha"
+msgstr "Debian для Alpha"
+
+#: ../../english/ports/hppa/menu.inc:6
+msgid "Debian for PA-RISC"
+msgstr "Debian для PA-RISC"
+
+#: ../../english/ports/hurd/menu.inc:10
+msgid "Hurd CDs"
+msgstr "Hurd CD"
+
+#: ../../english/ports/ia64/menu.inc:6
+msgid "Debian for IA-64"
+msgstr "Debian для IA-64"
+
#: ../../english/ports/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr "Debian GNU/NetBSD для i386"
diff --git a/ukrainian/po/security.uk.po b/ukrainian/po/security.uk.po
index a0368ba3db7..953325dbd50 100644
--- a/ukrainian/po/security.uk.po
+++ b/ukrainian/po/security.uk.po
@@ -15,42 +15,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/security/dsa.rdf.in:16
-msgid "Debian Security"
-msgstr "Безпека Debian"
-
-#: ../../english/security/dsa.rdf.in:19
-msgid "Debian Security Advisories"
-msgstr "Рекомендації з безпеки Debian"
-
-#: ../../english/security/faq.inc:6
-msgid "Q"
-msgstr "Питання:"
-
-#: ../../english/security/index.include:17
-msgid ""
-"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
-"posterity"
-msgstr ""
-"<a href=\\\"undated/\\\">Недатовані</a> рекомендації по безпеці залишенідля "
-"нащад ків"
-
-#: ../../english/security/make-ref-table.pl:81
-msgid "Mitre CVE dictionary"
-msgstr "Каталог Mitre CVE"
-
-#: ../../english/security/make-ref-table.pl:84
-msgid "Securityfocus Bugtraq database"
-msgstr "База даних Securityfocus Bugtraq"
-
-#: ../../english/security/make-ref-table.pl:88
-msgid "CERT Advisories"
-msgstr "Рекомендації CERT"
-
-#: ../../english/security/make-ref-table.pl:92
-msgid "US-CERT vulnerabilities Notes"
-msgstr "Інформація про уразливості US-CERT"
-
#: ../../english/template/debian/security.wml:11
msgid "Source:"
msgstr "Вихідний код:"
@@ -132,3 +96,39 @@ msgstr "База даних CERT по уразливостям, рекоменд
#: ../../english/template/debian/securityreferences.wml:88
msgid "No other external database security references currently available."
msgstr "На даний момент посилання на зовнішні бази відсутні."
+
+#: ../../english/security/faq.inc:6
+msgid "Q"
+msgstr "Питання:"
+
+#: ../../english/security/dsa.rdf.in:16
+msgid "Debian Security"
+msgstr "Безпека Debian"
+
+#: ../../english/security/dsa.rdf.in:19
+msgid "Debian Security Advisories"
+msgstr "Рекомендації з безпеки Debian"
+
+#: ../../english/security/make-ref-table.pl:81
+msgid "Mitre CVE dictionary"
+msgstr "Каталог Mitre CVE"
+
+#: ../../english/security/make-ref-table.pl:84
+msgid "Securityfocus Bugtraq database"
+msgstr "База даних Securityfocus Bugtraq"
+
+#: ../../english/security/make-ref-table.pl:88
+msgid "CERT Advisories"
+msgstr "Рекомендації CERT"
+
+#: ../../english/security/make-ref-table.pl:92
+msgid "US-CERT vulnerabilities Notes"
+msgstr "Інформація про уразливості US-CERT"
+
+#: ../../english/security/index.include:17
+msgid ""
+"<a href=\\\"undated/\\\">undated</a> security advisories, included for "
+"posterity"
+msgstr ""
+"<a href=\\\"undated/\\\">Недатовані</a> рекомендації по безпеці залишенідля "
+"нащад ків"
diff --git a/ukrainian/po/stats.uk.po b/ukrainian/po/stats.uk.po
index 5ae76ebe313..07a6f66eb9e 100644
--- a/ukrainian/po/stats.uk.po
+++ b/ukrainian/po/stats.uk.po
@@ -15,22 +15,6 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr "Невірна версія перекладу"
@@ -48,13 +32,13 @@ msgid "The original no longer exists"
msgstr "Оригінал більше не існує"
#: ../../stattrans.pl:470
-msgid "hit count N/A"
-msgstr "кількість звернень не відома"
-
-#: ../../stattrans.pl:470
msgid "hits"
msgstr "звернень"
+#: ../../stattrans.pl:470
+msgid "hit count N/A"
+msgstr "кількість звернень не відома"
+
#: ../../stattrans.pl:488 ../../stattrans.pl:489
msgid "Click to fetch diffstat data"
msgstr "Натисніть, щоб отримати дані diffstat"
@@ -67,15 +51,6 @@ msgstr "Створено за допомогою <transstatslink>"
msgid "Translation summary for"
msgstr "Підсумок перекладу для"
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr "Не перекладені"
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr "Застарілі"
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr "Перекладені"
@@ -85,6 +60,15 @@ msgstr "Перекладені"
msgid "Up to date"
msgstr "Актуальні"
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr "Застарілі"
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr "Не перекладені"
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -235,6 +219,22 @@ msgstr "Перекладені веб-сторінки (за розміром)"
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 рядків для перекладу."
+
#, fuzzy
#~| msgid "Colored diff"
#~ msgid "Commit diff"
diff --git a/ukrainian/po/templates.uk.po b/ukrainian/po/templates.uk.po
index d0c5b5d6b17..246f624b74a 100644
--- a/ukrainian/po/templates.uk.po
+++ b/ukrainian/po/templates.uk.po
@@ -16,14 +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/search.xml.in:7
-msgid "Debian website"
-msgstr "Веб-сайт Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Пошук веб-сайту Debian."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -89,7 +81,6 @@ msgstr "Як з нами зв'язатися"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Інформація про випуски"
@@ -167,6 +158,11 @@ msgstr "Отримання Debian"
msgid "The Debian Blog"
msgstr "Блог Debian"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Остання модифікація"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -213,14 +209,8 @@ 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail our publicly archived "
-#| "mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-"
-#| "www@lists.debian.org</a>. For other contact information, see the Debian "
-#| "<a href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a "
-#| "href=\"m4_HOME/devel/website/using_cvs\">available</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -234,28 +224,28 @@ msgstr ""
"\"m4_HOME/contact\">контактної інформації</a>. Веб-сайт із джерельним кодом "
"доступний <a href=\"m4_HOME/devel/website/using_cvs\">тут</a>."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Остання модифікація"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Авторські права"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> та інші;"
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
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:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -274,6 +264,14 @@ msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr ""
"Як встановити <a href=m4_HOME/intro/cn>мову документа за замовчанням</a>."
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Міжнародний Debian"
@@ -502,6 +500,15 @@ msgstr "(нова версія)"
msgid "Report"
msgstr "Доповідь"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -538,10 +545,18 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Повернутися на <a href=\"./\">сторінку користувачів Debian</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Веб-сайт Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Пошук веб-сайту Debian."
+
#~ msgid "More information"
#~ msgstr "Додаткова інформація"
diff --git a/ukrainian/po/vote.uk.po b/ukrainian/po/vote.uk.po
index 680935d9be0..900615484f1 100644
--- a/ukrainian/po/vote.uk.po
+++ b/ukrainian/po/vote.uk.po
@@ -33,237 +33,272 @@ msgid "Nominations"
msgstr "Номінації"
#: ../../english/template/debian/votebar.wml:25
+#, fuzzy
+msgid "Withdrawals"
+msgstr "Відхилене"
+
+#: ../../english/template/debian/votebar.wml:28
msgid "Debate"
msgstr "Обговорення"
-#: ../../english/template/debian/votebar.wml:28
+#: ../../english/template/debian/votebar.wml:31
msgid "Platforms"
msgstr "Платформи"
-#: ../../english/template/debian/votebar.wml:31
+#: ../../english/template/debian/votebar.wml:34
msgid "Proposer"
msgstr "Автор пропозиції"
-#: ../../english/template/debian/votebar.wml:34
+#: ../../english/template/debian/votebar.wml:37
msgid "Proposal A Proposer"
msgstr "Автор пропозиції А"
-#: ../../english/template/debian/votebar.wml:37
+#: ../../english/template/debian/votebar.wml:40
msgid "Proposal B Proposer"
msgstr "Автор пропозиції Б"
-#: ../../english/template/debian/votebar.wml:40
+#: ../../english/template/debian/votebar.wml:43
msgid "Proposal C Proposer"
msgstr "Автор пропозиції В"
-#: ../../english/template/debian/votebar.wml:43
+#: ../../english/template/debian/votebar.wml:46
msgid "Proposal D Proposer"
msgstr "Автор пропозиції Г"
-#: ../../english/template/debian/votebar.wml:46
+#: ../../english/template/debian/votebar.wml:49
msgid "Proposal E Proposer"
msgstr "Автор пропозиції Д"
-#: ../../english/template/debian/votebar.wml:49
+#: ../../english/template/debian/votebar.wml:52
msgid "Proposal F Proposer"
msgstr "Автор пропозиції Е"
-#: ../../english/template/debian/votebar.wml:52
+#: ../../english/template/debian/votebar.wml:55
+#, fuzzy
+msgid "Proposal G Proposer"
+msgstr "Автор пропозиції А"
+
+#: ../../english/template/debian/votebar.wml:58
+#, fuzzy
+msgid "Proposal H Proposer"
+msgstr "Автор пропозиції А"
+
+#: ../../english/template/debian/votebar.wml:61
msgid "Seconds"
msgstr "Підтримують пропозицію"
-#: ../../english/template/debian/votebar.wml:55
+#: ../../english/template/debian/votebar.wml:64
msgid "Proposal A Seconds"
msgstr "Підтримують пропозицію А"
-#: ../../english/template/debian/votebar.wml:58
+#: ../../english/template/debian/votebar.wml:67
msgid "Proposal B Seconds"
msgstr "Підтримують пропозицію Б"
-#: ../../english/template/debian/votebar.wml:61
+#: ../../english/template/debian/votebar.wml:70
msgid "Proposal C Seconds"
msgstr "Підтримують пропозицію В"
-#: ../../english/template/debian/votebar.wml:64
+#: ../../english/template/debian/votebar.wml:73
msgid "Proposal D Seconds"
msgstr "Підтримують пропозицію Г"
-#: ../../english/template/debian/votebar.wml:67
+#: ../../english/template/debian/votebar.wml:76
msgid "Proposal E Seconds"
msgstr "Підтримують пропозицію Д"
-#: ../../english/template/debian/votebar.wml:70
+#: ../../english/template/debian/votebar.wml:79
msgid "Proposal F Seconds"
msgstr "Підтримують пропозицію Е"
-#: ../../english/template/debian/votebar.wml:73
+#: ../../english/template/debian/votebar.wml:82
+#, fuzzy
+msgid "Proposal G Seconds"
+msgstr "Підтримують пропозицію А"
+
+#: ../../english/template/debian/votebar.wml:85
+#, fuzzy
+msgid "Proposal H Seconds"
+msgstr "Підтримують пропозицію А"
+
+#: ../../english/template/debian/votebar.wml:88
msgid "Opposition"
msgstr "Опозиція"
-#: ../../english/template/debian/votebar.wml:76
+#: ../../english/template/debian/votebar.wml:91
msgid "Text"
msgstr "Текст"
-#: ../../english/template/debian/votebar.wml:79
+#: ../../english/template/debian/votebar.wml:94
msgid "Proposal A"
msgstr "Пропозиція А"
-#: ../../english/template/debian/votebar.wml:82
+#: ../../english/template/debian/votebar.wml:97
msgid "Proposal B"
msgstr "Пропозиція Б"
-#: ../../english/template/debian/votebar.wml:85
+#: ../../english/template/debian/votebar.wml:100
msgid "Proposal C"
msgstr "Пропозиція В"
-#: ../../english/template/debian/votebar.wml:88
+#: ../../english/template/debian/votebar.wml:103
msgid "Proposal D"
msgstr "Пропозиція Г"
-#: ../../english/template/debian/votebar.wml:91
+#: ../../english/template/debian/votebar.wml:106
msgid "Proposal E"
msgstr "Пропозиція Д"
-#: ../../english/template/debian/votebar.wml:94
+#: ../../english/template/debian/votebar.wml:109
msgid "Proposal F"
msgstr "Пропозиція Е"
-#: ../../english/template/debian/votebar.wml:97
+#: ../../english/template/debian/votebar.wml:112
+#, fuzzy
+msgid "Proposal G"
+msgstr "Пропозиція А"
+
+#: ../../english/template/debian/votebar.wml:115
+#, fuzzy
+msgid "Proposal H"
+msgstr "Пропозиція А"
+
+#: ../../english/template/debian/votebar.wml:118
msgid "Choices"
msgstr "Варіанти вибору"
-#: ../../english/template/debian/votebar.wml:100
+#: ../../english/template/debian/votebar.wml:121
msgid "Amendment Proposer"
msgstr "Автор поправки"
-#: ../../english/template/debian/votebar.wml:103
+#: ../../english/template/debian/votebar.wml:124
msgid "Amendment Seconds"
msgstr "Підтримують поправку"
-#: ../../english/template/debian/votebar.wml:106
+#: ../../english/template/debian/votebar.wml:127
msgid "Amendment Text"
msgstr "Текст поправки"
-#: ../../english/template/debian/votebar.wml:109
+#: ../../english/template/debian/votebar.wml:130
msgid "Amendment Proposer A"
msgstr "Автор поправки А"
-#: ../../english/template/debian/votebar.wml:112
+#: ../../english/template/debian/votebar.wml:133
msgid "Amendment Seconds A"
msgstr "Підтримують поправку А"
-#: ../../english/template/debian/votebar.wml:115
+#: ../../english/template/debian/votebar.wml:136
msgid "Amendment Text A"
msgstr "Текст поправки А"
-#: ../../english/template/debian/votebar.wml:118
+#: ../../english/template/debian/votebar.wml:139
msgid "Amendment Proposer B"
msgstr "Автор поправки Б"
-#: ../../english/template/debian/votebar.wml:121
+#: ../../english/template/debian/votebar.wml:142
msgid "Amendment Seconds B"
msgstr "Підтримують поправку Б"
-#: ../../english/template/debian/votebar.wml:124
+#: ../../english/template/debian/votebar.wml:145
msgid "Amendment Text B"
msgstr "Текст поправки Б"
-#: ../../english/template/debian/votebar.wml:127
+#: ../../english/template/debian/votebar.wml:148
msgid "Amendment Proposer C"
msgstr "Автор поправки В"
-#: ../../english/template/debian/votebar.wml:130
+#: ../../english/template/debian/votebar.wml:151
msgid "Amendment Seconds C"
msgstr "Підтримують поправку В"
-#: ../../english/template/debian/votebar.wml:133
+#: ../../english/template/debian/votebar.wml:154
msgid "Amendment Text C"
msgstr "Текст поправки В"
-#: ../../english/template/debian/votebar.wml:136
+#: ../../english/template/debian/votebar.wml:157
msgid "Amendments"
msgstr "Поправки"
-#: ../../english/template/debian/votebar.wml:139
+#: ../../english/template/debian/votebar.wml:160
msgid "Proceedings"
msgstr "Засідання"
-#: ../../english/template/debian/votebar.wml:142
+#: ../../english/template/debian/votebar.wml:163
msgid "Majority Requirement"
msgstr "Умова більшості"
-#: ../../english/template/debian/votebar.wml:145
+#: ../../english/template/debian/votebar.wml:166
msgid "Data and Statistics"
msgstr "Дані та статистика"
-#: ../../english/template/debian/votebar.wml:148
+#: ../../english/template/debian/votebar.wml:169
msgid "Quorum"
msgstr "Кворум"
-#: ../../english/template/debian/votebar.wml:151
+#: ../../english/template/debian/votebar.wml:172
msgid "Minimum Discussion"
msgstr "Мінімальне обговорення"
-#: ../../english/template/debian/votebar.wml:154
+#: ../../english/template/debian/votebar.wml:175
msgid "Ballot"
msgstr "Бюлетень"
-#: ../../english/template/debian/votebar.wml:157
+#: ../../english/template/debian/votebar.wml:178
msgid "Forum"
msgstr "Конференція"
-#: ../../english/template/debian/votebar.wml:160
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr "Результат"
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr "Очікує&nbsp;спонсорів"
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr "Розглядається"
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr "Голосування&nbsp;відкрите"
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr "Прийняте"
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr "Відхилене"
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr "Інше"
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr "На&nbsp;сторінку&nbsp;голосувань"
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr "Як"
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr "Внести&nbsp;пропозицію"
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr "Внести&nbsp;поправку"
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr "Підтримати&nbsp;пропозицію"
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr "Взнати&nbsp;результат"
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr "Проголосувати"
diff --git a/vietnamese/po/cdimage.vi.po b/vietnamese/po/cdimage.vi.po
index 8e352fde0f2..6f0a82d5098 100644
--- a/vietnamese/po/cdimage.vi.po
+++ b/vietnamese/po/cdimage.vi.po
@@ -14,20 +14,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Gtranslator 2.91.7\n"
-#. Translators: string printed by gpg --fingerprint in your language, including spaces
-#: ../../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:87
-msgid "ISO images"
-msgstr "Các ảnh ISO"
-
-#: ../../english/devel/debian-installer/images.data:88
-msgid "Jigdo files"
-msgstr "Các tập tin jigdo"
-
#. note: only change the sep(arator) if it's not good for your charset
#: ../../english/template/debian/cdimage.wml:10
msgid "&middot;"
@@ -124,3 +110,17 @@ msgid ""
msgstr ""
"<a href=\"/MailingLists/disclaimer\">Bó thư công khai</a> bằng tiếng Anh cho "
"các đĩa CD/DVD:"
+
+#. Translators: string printed by gpg --fingerprint in your language, including spaces
+#: ../../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:87
+msgid "ISO images"
+msgstr "Các ảnh ISO"
+
+#: ../../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 fa9d82e2967..6b937e40d9d 100644
--- a/vietnamese/po/consultants.vi.po
+++ b/vietnamese/po/consultants.vi.po
@@ -3,6 +3,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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 ""
@@ -56,11 +64,3 @@ 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/countries.vi.po b/vietnamese/po/countries.vi.po
index e40e33fd43f..9e4f6d7f1bb 100644
--- a/vietnamese/po/countries.vi.po
+++ b/vietnamese/po/countries.vi.po
@@ -223,210 +223,215 @@ msgid "Kenya"
msgstr "Ken-ia"
#: ../../english/template/debian/countries.wml:267
+#, fuzzy
+msgid "Kyrgyzstan"
+msgstr "Kazakhstan"
+
+#: ../../english/template/debian/countries.wml:270
msgid "Korea"
msgstr "Hàn Quốc"
-#: ../../english/template/debian/countries.wml:270
+#: ../../english/template/debian/countries.wml:273
msgid "Kuwait"
msgstr "Kuwait"
-#: ../../english/template/debian/countries.wml:273
+#: ../../english/template/debian/countries.wml:276
msgid "Kazakhstan"
msgstr "Kazakhstan"
-#: ../../english/template/debian/countries.wml:276
+#: ../../english/template/debian/countries.wml:279
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../../english/template/debian/countries.wml:279
+#: ../../english/template/debian/countries.wml:282
msgid "Lithuania"
msgstr "Lithuania"
-#: ../../english/template/debian/countries.wml:282
+#: ../../english/template/debian/countries.wml:285
msgid "Luxembourg"
msgstr "Lúc-xăm-bua"
-#: ../../english/template/debian/countries.wml:285
+#: ../../english/template/debian/countries.wml:288
msgid "Latvia"
msgstr "Lát-vi-a"
-#: ../../english/template/debian/countries.wml:288
+#: ../../english/template/debian/countries.wml:291
msgid "Morocco"
msgstr "Ma Rốc"
-#: ../../english/template/debian/countries.wml:291
+#: ../../english/template/debian/countries.wml:294
msgid "Moldova"
msgstr "Moldova"
-#: ../../english/template/debian/countries.wml:294
+#: ../../english/template/debian/countries.wml:297
msgid "Montenegro"
msgstr "Mon-te-nê-gợ-rô"
-#: ../../english/template/debian/countries.wml:297
+#: ../../english/template/debian/countries.wml:300
msgid "Madagascar"
msgstr "Ma-đa-ga-x-că"
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
msgid "Macedonia, Republic of"
msgstr "Cộng Hòa Đô-mi-ni-ca"
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
msgid "Mongolia"
msgstr "Mông Cổ"
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
msgid "Malta"
msgstr "Malta"
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
msgid "Mexico"
msgstr "Mê-hi-cô"
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
msgid "Malaysia"
msgstr "Ma-lay-xi-a"
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
msgid "New Caledonia"
msgstr "Calédonia mới"
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
msgid "Nicaragua"
msgstr "Ni-ca-ra-gua"
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
msgid "Netherlands"
msgstr "Hà Lan"
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
msgid "Norway"
msgstr "Na Uy"
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
msgid "New Zealand"
msgstr "Niu Di-lân"
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
msgid "Panama"
msgstr "Pa-na-ma"
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
msgid "Peru"
msgstr "Pê-ru"
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
msgid "French Polynesia"
msgstr "Pô-li-nê-xi Pháp"
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
msgid "Philippines"
msgstr "Phi-líp-pin"
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
msgid "Pakistan"
msgstr "Pa-kít-xtan"
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
msgid "Poland"
msgstr "Ba Lan"
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
msgid "Portugal"
msgstr "Bồ Đào Nha"
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
msgid "Réunion"
msgstr ""
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
msgid "Romania"
msgstr "Ru-ma-ni"
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
msgid "Serbia"
msgstr "Xéc-bi"
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
msgid "Russia"
msgstr "Nga"
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
msgid "Saudi Arabia"
msgstr "A Rập Xau-đi"
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
msgid "Sweden"
msgstr "Thụy Điển"
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
msgid "Singapore"
msgstr "Xing-ga-po"
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
msgid "Slovenia"
msgstr "Xlô-ven"
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
msgid "Slovakia"
msgstr "Xlô-vác"
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
msgid "El Salvador"
msgstr "En-xan-va-đoa"
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
msgid "Thailand"
msgstr "Thái Lan"
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
msgid "Tajikistan"
msgstr "Ta-ji-kít-xtan"
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
msgid "Tunisia"
msgstr "Tu-ni-xi-a"
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
msgid "Turkey"
msgstr "Thổ Nhĩ Kỳ"
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
msgid "Taiwan"
msgstr "Đài Loan"
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
msgid "Ukraine"
msgstr "Ukraine"
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
msgid "United States"
msgstr "Hợp chủng quốc Hoa Kỳ"
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
msgid "Uruguay"
msgstr "U-ru-guay"
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
msgid "Uzbekistan"
msgstr "U-xơ-bê-ki-x-tanh"
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
msgid "Venezuela"
msgstr "Vê-nê-du-ê-la"
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
msgid "Vietnam"
msgstr "Việt Nam"
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
msgid "Vanuatu"
msgstr "Vanuatu"
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
msgid "South Africa"
msgstr "Nam Phi"
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
msgid "Zimbabwe"
msgstr "Zim-ba-buê"
diff --git a/vietnamese/po/distrib.vi.po b/vietnamese/po/distrib.vi.po
index 8c880dea459..1972a91dc8b 100644
--- a/vietnamese/po/distrib.vi.po
+++ b/vietnamese/po/distrib.vi.po
@@ -3,111 +3,111 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/distrib/search_contents-form.inc:9
#: ../../english/distrib/search_packages-form.inc:8
+#: ../../english/distrib/search_contents-form.inc:9
msgid "Keyword"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:13
-msgid "Display"
+#: ../../english/distrib/search_packages-form.inc:12
+msgid "Search on"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:16
-msgid "paths ending with the keyword"
+#: ../../english/distrib/search_packages-form.inc:14
+msgid "Package names only"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:19
-msgid "packages that contain files named like this"
+#: ../../english/distrib/search_packages-form.inc:16
+msgid "Descriptions"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:22
-msgid "packages that contain files whose names contain the keyword"
+#: ../../english/distrib/search_packages-form.inc:18
+msgid "Source package names"
+msgstr ""
+
+#: ../../english/distrib/search_packages-form.inc:21
+msgid "Only show exact matches"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:25
#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_contents-form.inc:25
msgid "Distribution"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:27
#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_contents-form.inc:27
msgid "experimental"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:28
#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_contents-form.inc:28
msgid "unstable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:29
#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_contents-form.inc:29
msgid "testing"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:30
#: ../../english/distrib/search_packages-form.inc:30
+#: ../../english/distrib/search_contents-form.inc:30
msgid "stable"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:31
#: ../../english/distrib/search_packages-form.inc:31
+#: ../../english/distrib/search_contents-form.inc:31
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:32
#: ../../english/distrib/search_packages-form.inc:39
+#: ../../english/distrib/search_contents-form.inc:38
msgid "any"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:48
-#: ../../english/distrib/search_packages-form.inc:43
-msgid "Search"
+#: ../../english/distrib/search_packages-form.inc:34
+msgid "Section"
msgstr ""
-#: ../../english/distrib/search_contents-form.inc:49
-#: ../../english/distrib/search_packages-form.inc:44
-msgid "Reset"
+#: ../../english/distrib/search_packages-form.inc:36
+msgid "main"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:12
-msgid "Search on"
+#: ../../english/distrib/search_packages-form.inc:37
+msgid "contrib"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:14
-msgid "Package names only"
+#: ../../english/distrib/search_packages-form.inc:38
+msgid "non-free"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:16
-msgid "Descriptions"
+#: ../../english/distrib/search_packages-form.inc:43
+#: ../../english/distrib/search_contents-form.inc:48
+msgid "Search"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:18
-msgid "Source package names"
+#: ../../english/distrib/search_packages-form.inc:44
+#: ../../english/distrib/search_contents-form.inc:49
+msgid "Reset"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:21
-msgid "Only show exact matches"
+#: ../../english/distrib/search_contents-form.inc:13
+msgid "Display"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:34
-msgid "Section"
+#: ../../english/distrib/search_contents-form.inc:16
+msgid "paths ending with the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:36
-msgid "main"
+#: ../../english/distrib/search_contents-form.inc:19
+msgid "packages that contain files named like this"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:37
-msgid "contrib"
+#: ../../english/distrib/search_contents-form.inc:22
+msgid "packages that contain files whose names contain the keyword"
msgstr ""
-#: ../../english/distrib/search_packages-form.inc:38
-msgid "non-free"
+#: ../../english/distrib/search_contents-form.inc:33
+msgid "Architecture"
msgstr ""
#: ../../english/releases/arches.data:8
diff --git a/vietnamese/po/doc.vi.po b/vietnamese/po/doc.vi.po
index 891541d02a7..966a944e825 100644
--- a/vietnamese/po/doc.vi.po
+++ b/vietnamese/po/doc.vi.po
@@ -3,113 +3,27 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../english/doc/books.data:31
-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:59 ../../english/doc/books.data:163
-#: ../../english/doc/books.data:216
-msgid ""
-"Written by two Debian developers, this free book\n"
-" started as a translation of their French best-seller known as Cahier de\n"
-" 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:80
-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:101
-msgid ""
-"The first French book about Debian is already in its fifth edition. It\n"
-" covers all aspects of the administration of Debian from the installation\n"
-" 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:120
-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:140
-msgid ""
-"This book teaches you how to install and configure the system and also how "
-"to use Debian in a professional environment. It shows the full potential of "
-"the distribution (in its current version 8) 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:191
-msgid ""
-"Written by two penetration researcher - Annihilator, Firstblood.\n"
-" This book teaches you how to build and configure Debian 8.x server system\n"
-" security hardening using Kali Linux and Debian simultaneously.\n"
-" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
-" From the perspective that 'the origin of Kali Linux is Debian', it "
-"explains\n"
-" how to enhance Debian's security by applying the method of penetration\n"
-" testing.\n"
-" This book covers various security issues like SSL cerificates, UFW "
-"firewall,\n"
-" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
-" intrusion detection system."
-msgstr ""
-
#: ../../english/doc/books.def:38
msgid "Author:"
msgstr ""
#: ../../english/doc/books.def:41
+msgid "Debian Release:"
+msgstr ""
+
+#: ../../english/doc/books.def:44
msgid "email:"
msgstr ""
-#: ../../english/doc/books.def:45
+#: ../../english/doc/books.def:48
msgid "Available at:"
msgstr ""
-#: ../../english/doc/books.def:48
+#: ../../english/doc/books.def:51
msgid "CD Included:"
msgstr ""
-#: ../../english/doc/books.def:51
+#: ../../english/doc/books.def:54
msgid "Publisher:"
msgstr ""
@@ -133,65 +47,158 @@ msgstr ""
msgid "Availability:"
msgstr ""
-#: ../../english/doc/manuals.defs:92
+#: ../../english/doc/manuals.defs:97
msgid "Latest version:"
msgstr ""
-#: ../../english/doc/manuals.defs:108
+#: ../../english/doc/manuals.defs:113
msgid "(version <get-var version />)"
msgstr ""
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:38
+#: ../../english/doc/manuals.defs:143 ../../english/releases/arches.data:38
msgid "plain text"
msgstr ""
-#: ../../english/doc/manuals.defs:154 ../../english/doc/manuals.defs:178
+#: ../../english/doc/manuals.defs:159 ../../english/doc/manuals.defs:169
+#: ../../english/doc/manuals.defs:193
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:156 ../../english/doc/manuals.defs:164
-#: ../../english/doc/manuals.defs:172 ../../english/doc/manuals.defs:180
+#: ../../english/doc/manuals.defs:161 ../../english/doc/manuals.defs:171
+#: ../../english/doc/manuals.defs:179 ../../english/doc/manuals.defs:187
+#: ../../english/doc/manuals.defs:195
msgid "Web interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:157 ../../english/doc/manuals.defs:165
-#: ../../english/doc/manuals.defs:173 ../../english/doc/manuals.defs:181
+#: ../../english/doc/manuals.defs:162 ../../english/doc/manuals.defs:172
+#: ../../english/doc/manuals.defs:180 ../../english/doc/manuals.defs:188
+#: ../../english/doc/manuals.defs:196
msgid "VCS interface: "
msgstr ""
-#: ../../english/doc/manuals.defs:162
+#: ../../english/doc/manuals.defs:177
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
+#: ../../english/doc/manuals.defs:185
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:188
+#: ../../english/doc/manuals.defs:203
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
+#: ../../english/doc/manuals.defs:208
msgid "CVS via web"
msgstr ""
-#: ../../english/doc/manuals.defs:197 ../../english/doc/manuals.defs:201
+#: ../../english/doc/manuals.defs:212 ../../english/doc/manuals.defs:216
msgid "Debian package"
msgstr ""
-#: ../../english/doc/manuals.defs:206 ../../english/doc/manuals.defs:210
+#: ../../english/doc/manuals.defs:221 ../../english/doc/manuals.defs:225
msgid "Debian package (archived)"
msgstr ""
+#: ../../english/doc/books.data:32
+msgid ""
+"\n"
+" Debian 9 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:61 ../../english/doc/books.data:171
+#: ../../english/doc/books.data:226
+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:83
+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:105
+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:125
+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:146
+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 8) 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:200
+msgid ""
+"Written by two penetration researcher - Annihilator, Firstblood.\n"
+" This book teaches you how to build and configure Debian 8.x server system\n"
+" security hardening using Kali Linux and Debian simultaneously.\n"
+" DNS, FTP, SAMBA, DHCP, Apache2 webserver, etc.\n"
+" From the perspective that 'the origin of Kali Linux is Debian', it "
+"explains\n"
+" how to enhance Debian's security by applying the method of penetration\n"
+" testing.\n"
+" This book covers various security issues like SSL cerificates, UFW "
+"firewall,\n"
+" MySQL Vulnerability, commercial Symantec antivirus, including Snort\n"
+" intrusion detection system."
+msgstr ""
+
#: ../../english/releases/arches.data:36
msgid "HTML"
msgstr ""
diff --git a/vietnamese/po/newsevents.vi.po b/vietnamese/po/newsevents.vi.po
index 58b2bdb0ae9..658df2f08dc 100644
--- a/vietnamese/po/newsevents.vi.po
+++ b/vietnamese/po/newsevents.vi.po
@@ -14,90 +14,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: ../../english/News/news.rdf.in:16
-msgid "Debian News"
-msgstr "Tin tức Debian"
-
-#: ../../english/News/news.rdf.in:19
-msgid "Debian Latest News"
-msgstr "Tin tức Debian mới nhất"
-
-#: ../../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 "Thư thông báo cho cộng đồng Debian"
-
-#: ../../english/events/speakers/speakers.defs:12
-msgid "Name:"
-msgstr "Tên:"
-
-#: ../../english/events/speakers/speakers.defs:15
-msgid "Email:"
-msgstr "Thư điện tử:"
-
-#: ../../english/events/speakers/speakers.defs:20
-msgid "Previous Talks:"
-msgstr "Buổi nói chuyện trước đây:"
-
-#: ../../english/events/speakers/speakers.defs:24
-msgid "Languages:"
-msgstr "Ngôn ngữ:"
-
-#: ../../english/events/speakers/speakers.defs:28
-msgid "Location:"
-msgstr "Vị trí:"
-
-#: ../../english/events/speakers/speakers.defs:31
-msgid "Topics:"
-msgstr "Chủ đề:"
-
-#: ../../english/events/talks.defs:9
-msgid "Title:"
-msgstr "Tiêu đề:"
-
-#: ../../english/events/talks.defs:12
-msgid "Author:"
-msgstr "Tác giả:"
-
-#: ../../english/events/talks.defs:15
-msgid "Language:"
-msgstr "Ngôn ngữ:"
-
-#: ../../english/events/talks.defs:19
-msgid "Date:"
-msgstr "Ngày:"
-
-#: ../../english/events/talks.defs:23
-msgid "Event:"
-msgstr "Sự kiện:"
-
-#: ../../english/events/talks.defs:26
-msgid "Slides:"
-msgstr "Trình chiếu:"
-
-#: ../../english/events/talks.defs:29
-msgid "source"
-msgstr "nguồn"
-
-#: ../../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 "Tổng quát"
-
#: ../../english/template/debian/events_common.wml:8
msgid "Upcoming Attractions"
msgstr "Các sự kiện hấp dẫn sắp diễn ra"
@@ -156,6 +72,130 @@ msgstr ""
msgid "<get-var url /> (dead link)"
msgstr "<get-var url /> (liên kết đã chết)"
+#: ../../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 ""
+"Để nhận được thông báo thư này bằng hộp thư điện tử của bạn, <a href="
+"\"https://lists.debian.org/debian-news/\">hãy đặt xem dài hạn bó thư 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=\"../../\">Các phát hành trước đây</a> của thư thông báo cũng sẵn có."
+
+#. 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\" />Tin tức Dự án Debian được biên tập bởi <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\" />Tin tức Dự án Debian được biên tập bởi <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\" />Phát hành này của Tin tức Dự án Debian được biên tập "
+"bởi <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\" />Phát hành này của Tin tức Dự án Debian được biên tập "
+"bởi <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\" />Được dịch bởi %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\" />Được dịch bởi %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\" />Được dịch bởi %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\" />Được dịch bởi %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 ""
+"Để nhận được tin tức này hàng tuần bằng hộp thư điện tử của bạn, <a href="
+"\"https://lists.debian.org/debian-news/\">hãy đặt xem dài hạn bó thư 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\" />Tin tức Tuần Debian được biên tập bởi <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\" />Tin tức Tuần Debian được biên tập bởi <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\" />Bản phát hành này của Tin tức Tuần Debian được biên "
+"tập bởi <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\" />Bản phát hành này của Tin tức Tuần Debian được biên "
+"tập bởi <a href=\"mailto:dwn@debian.org\">%s</a>."
+
#: ../../english/template/debian/projectnews/boilerplates.wml:35
msgid ""
"Welcome to this year's <get-var issue /> issue of DPN, the newsletter for "
@@ -405,137 +445,89 @@ msgstr ""
"news />\">tin tức lặt vặt cho các nhà phát triển</a> đã được phát hành và "
"bao gồm các chủ đề sau đây:"
-#: ../../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 ""
-"Để nhận được thông báo thư này bằng hộp thư điện tử của bạn, <a href="
-"\"https://lists.debian.org/debian-news/\">hãy đặt xem dài hạn bó thư debian-"
-"news</a>."
+#: ../../english/News/press/press.tags:11
+msgid "p<get-var page />"
+msgstr "p<get-var page />"
-#: ../../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=\"../../\">Các phát hành trước đây</a> của thư thông báo cũng sẵn có."
+#: ../../english/events/talks.defs:9
+msgid "Title:"
+msgstr "Tiêu đề:"
-#. 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\" />Tin tức Dự án Debian được biên tập bởi <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:12
+msgid "Author:"
+msgstr "Tác giả:"
-#. 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\" />Tin tức Dự án Debian được biên tập bởi <a href="
-"\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:15
+msgid "Language:"
+msgstr "Ngôn ngữ:"
-#. 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\" />Phát hành này của Tin tức Dự án Debian được biên tập "
-"bởi <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:19
+msgid "Date:"
+msgstr "Ngày:"
-#. 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\" />Phát hành này của Tin tức Dự án Debian được biên tập "
-"bởi <a href=\"mailto:debian-publicity@lists.debian.org\">%s</a>."
+#: ../../english/events/talks.defs:23
+msgid "Event:"
+msgstr "Sự kiện:"
-#. 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\" />Được dịch bởi %s."
+#: ../../english/events/talks.defs:26
+msgid "Slides:"
+msgstr "Trình chiếu:"
-#. 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\" />Được dịch bởi %s."
+#: ../../english/events/talks.defs:29
+msgid "source"
+msgstr "nguồn"
-#. 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\" />Được dịch bởi %s."
+#: ../../english/events/talks.defs:32
+msgid "PDF"
+msgstr "PDF"
-#. 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\" />Được dịch bởi %s."
+#: ../../english/events/talks.defs:35
+msgid "HTML"
+msgstr "HTML"
-#: ../../english/template/debian/speakers.wml:6
-msgid "List of Speakers"
-msgstr "Danh sách người nói chuyện"
+#: ../../english/events/talks.defs:38
+msgid "MagicPoint"
+msgstr "MagicPoint"
-#: ../../english/template/debian/speakers.wml:9
-msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-msgstr "Quay trở lại <a href=\"./\">trang nói chuyện về Debian</a>."
+#: ../../english/events/talks.defs:41
+msgid "Abstract"
+msgstr "Tổng quát"
-#: ../../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 ""
-"Để nhận được tin tức này hàng tuần bằng hộp thư điện tử của bạn, <a href="
-"\"https://lists.debian.org/debian-news/\">hãy đặt xem dài hạn bó thư debian-"
-"news</a>."
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Tin tức Debian"
-#. 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\" />Tin tức Tuần Debian được biên tập bởi <a href="
-"\"mailto:dwn@debian.org\">%s</a>."
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Tin tức Debian mới nhất"
-#. 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\" />Tin tức Tuần Debian được biên tập bởi <a href=\"mailto:"
-"dwn@debian.org\">%s</a>."
+#: ../../english/News/weekly/dwn-to-rdf.pl:143
+msgid "The newsletter for the Debian community"
+msgstr "Thư thông báo cho cộng đồng 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\" />Bản phát hành này của Tin tức Tuần Debian được biên "
-"tập bởi <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Name:"
+#~ msgstr "Tên:"
-#. 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\" />Bản phát hành này của Tin tức Tuần Debian được biên "
-"tập bởi <a href=\"mailto:dwn@debian.org\">%s</a>."
+#~ msgid "Email:"
+#~ msgstr "Thư điện tử:"
+
+#~ msgid "Previous Talks:"
+#~ msgstr "Buổi nói chuyện trước đây:"
+
+#~ msgid "Languages:"
+#~ msgstr "Ngôn ngữ:"
+
+#~ msgid "Location:"
+#~ msgstr "Vị trí:"
+
+#~ msgid "Topics:"
+#~ msgstr "Chủ đề:"
+
+#~ msgid "List of Speakers"
+#~ msgstr "Danh sách người nói chuyện"
+
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Quay trở lại <a href=\"./\">trang nói chuyện về Debian</a>."
#~| msgid ""
#~| "To receive this newsletter weekly in your mailbox, <a href=\"https://"
diff --git a/vietnamese/po/organization.vi.po b/vietnamese/po/organization.vi.po
index 9a5100edf7c..3759d29330d 100644
--- a/vietnamese/po/organization.vi.po
+++ b/vietnamese/po/organization.vi.po
@@ -47,281 +47,327 @@ msgid "manager"
msgstr "nhà quản lý"
#: ../../english/intro/organization.data:34
-msgid "SRM"
-msgstr "SRM"
-
-#: ../../english/intro/organization.data:34
msgid "Stable Release Manager"
msgstr "Quản lý phát hành bản ổn định"
+#: ../../english/intro/organization.data:34
+msgid "SRM"
+msgstr "SRM"
+
#: ../../english/intro/organization.data:36
msgid "wizard"
msgstr "thuật sỹ"
-#: ../../english/intro/organization.data:39
+#. we only use the chair tag once, for techctte, I wonder why it's here.
+#: ../../english/intro/organization.data:38
#, fuzzy
-#| msgid "chairman"
msgid "chair"
msgstr "chủ tịch"
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:41
msgid "assistant"
msgstr "trợ lý"
-#: ../../english/intro/organization.data:44
+#: ../../english/intro/organization.data:43
msgid "secretary"
msgstr "thư ký"
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:66
+#: ../../english/intro/organization.data:45
+msgid "representative"
+msgstr ""
+
+#: ../../english/intro/organization.data:47
+msgid "role"
+msgstr ""
+
+#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:75
msgid "Officers"
msgstr "Các nhân viên"
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:90
+#: ../../english/intro/organization.data:64
+#: ../../english/intro/organization.data:99
msgid "Distribution"
msgstr "Phân phối"
-#: ../../english/intro/organization.data:55
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:235
msgid "Communication and Outreach"
msgstr ""
-#: ../../english/intro/organization.data:57
-#: ../../english/intro/organization.data:235
+#: ../../english/intro/organization.data:67
+#: ../../english/intro/organization.data:238
msgid "Data Protection team"
msgstr ""
-#: ../../english/intro/organization.data:58
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:242
#, fuzzy
-#| msgid "Publicity"
msgid "Publicity team"
msgstr "Publicity"
-#: ../../english/intro/organization.data:60
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:70
+#: ../../english/intro/organization.data:311
+msgid "Membership in other organizations"
+msgstr ""
+
+#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:339
msgid "Support and Infrastructure"
msgstr "Hỗ trợ và Cơ sở hạ tầng"
-#. formerly Custom Debian Distributions (CCDs); see https://blends.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:62
-msgid "Debian Pure Blends"
-msgstr "Debian Pure Blends"
-
-#: ../../english/intro/organization.data:69
+#: ../../english/intro/organization.data:78
msgid "Leader"
msgstr "Lãnh đạo"
-#: ../../english/intro/organization.data:71
+#: ../../english/intro/organization.data:80
msgid "Technical Committee"
msgstr "Ủy ban kỹ thuật"
-#: ../../english/intro/organization.data:85
+#: ../../english/intro/organization.data:94
msgid "Secretary"
msgstr "Thư ký"
-#: ../../english/intro/organization.data:93
+#: ../../english/intro/organization.data:102
msgid "Development Projects"
msgstr "Các dự án phát triển"
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:103
msgid "FTP Archives"
msgstr "Lưu trữ FTP"
-#: ../../english/intro/organization.data:96
+#: ../../english/intro/organization.data:105
msgid "FTP Masters"
msgstr "Chủ FPT"
-#: ../../english/intro/organization.data:102
+#: ../../english/intro/organization.data:111
msgid "FTP Assistants"
msgstr "Trợ lý FTP"
-#: ../../english/intro/organization.data:107
+#: ../../english/intro/organization.data:116
msgid "FTP Wizards"
msgstr "Thuật sỹ FTP"
-#: ../../english/intro/organization.data:111
+#: ../../english/intro/organization.data:120
msgid "Backports"
msgstr "Chuyển ngược"
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:122
msgid "Backports Team"
msgstr "Nhóm chuyển ngược"
-#: ../../english/intro/organization.data:117
-msgid "Individual Packages"
-msgstr "Các gói riêng lẻ"
-
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:126
msgid "Release Management"
msgstr "Ban quản lý phát hành"
-#: ../../english/intro/organization.data:120
+#: ../../english/intro/organization.data:128
msgid "Release Team"
msgstr "Nhóm phát hành"
-#: ../../english/intro/organization.data:133
+#: ../../english/intro/organization.data:141
msgid "Quality Assurance"
msgstr "Đảm bảo chất lượng"
-#: ../../english/intro/organization.data:134
+#: ../../english/intro/organization.data:142
msgid "Installation System Team"
msgstr "Nhóm Hệ thống cài đặt"
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:143
+msgid "Debian Live Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:144
msgid "Release Notes"
msgstr "Ghi chú phát hành"
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:146
msgid "CD Images"
msgstr "Ảnh CD"
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:148
msgid "Production"
msgstr "Sản xuất"
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:156
msgid "Testing"
msgstr "Thử nghiệm"
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:158
+msgid "Cloud Team"
+msgstr ""
+
+#: ../../english/intro/organization.data:162
msgid "Autobuilding infrastructure"
msgstr "Cơ sở hạ tầng tự động biên dịch"
-#: ../../english/intro/organization.data:151
+#: ../../english/intro/organization.data:164
msgid "Wanna-build team"
msgstr "Nhóm Wanna-build"
-#: ../../english/intro/organization.data:159
+#: ../../english/intro/organization.data:171
msgid "Buildd administration"
msgstr "Quản tri Buildd"
-#: ../../english/intro/organization.data:178
+#: ../../english/intro/organization.data:189
msgid "Documentation"
msgstr "Tài liệu"
-#: ../../english/intro/organization.data:183
+#: ../../english/intro/organization.data:194
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:186
-msgid "Debian Live Team"
-msgstr ""
-
-#: ../../english/intro/organization.data:187
+#: ../../english/intro/organization.data:196
msgid "Ports"
msgstr "Bản chuyển đổi"
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:226
msgid "Special Configurations"
msgstr "Các cấu hình đặc biệt"
-#: ../../english/intro/organization.data:225
+#: ../../english/intro/organization.data:228
msgid "Laptops"
msgstr "Máy tính xách tay"
-#: ../../english/intro/organization.data:226
+#: ../../english/intro/organization.data:229
msgid "Firewalls"
msgstr "Tường lửa"
-#: ../../english/intro/organization.data:227
+#: ../../english/intro/organization.data:230
msgid "Embedded systems"
msgstr "Các hệ thống nhúng"
-#: ../../english/intro/organization.data:242
+#: ../../english/intro/organization.data:245
msgid "Press Contact"
msgstr "Liên hệ báo chí"
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:247
msgid "Web Pages"
msgstr "Trang thông tin điện tử"
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:259
msgid "Planet Debian"
msgstr "Planet Debian"
-#: ../../english/intro/organization.data:259
+#: ../../english/intro/organization.data:264
msgid "Outreach"
msgstr "Hoạt động ngoài lề"
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:269
msgid "Debian Women Project"
msgstr "Dự án Phụ nữ Debian"
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:277
msgid "Anti-harassment"
msgstr "Chống quấy rối"
-#: ../../english/intro/organization.data:276
+#: ../../english/intro/organization.data:282
msgid "Events"
msgstr "Sự kiện"
-#: ../../english/intro/organization.data:282
+#: ../../english/intro/organization.data:289
#, fuzzy
-#| msgid "Technical Committee"
msgid "DebConf Committee"
msgstr "Ủy ban kỹ thuật"
-#: ../../english/intro/organization.data:289
+#: ../../english/intro/organization.data:296
msgid "Partner Program"
msgstr "Chương trình đối tác"
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:301
msgid "Hardware Donations Coordination"
msgstr "Điều phối các quyên góp phần cứng"
-#: ../../english/intro/organization.data:307
+#: ../../english/intro/organization.data:317
+msgid "GNOME Foundation"
+msgstr ""
+
+#: ../../english/intro/organization.data:319
+msgid "Linux Professional Institute"
+msgstr ""
+
+#: ../../english/intro/organization.data:321
+msgid "Linux Magazine"
+msgstr ""
+
+#: ../../english/intro/organization.data:323
+msgid "Linux Standards Base"
+msgstr ""
+
+#: ../../english/intro/organization.data:325
+msgid "Free Standards Group"
+msgstr ""
+
+#: ../../english/intro/organization.data:326
+msgid "SchoolForge"
+msgstr ""
+
+#: ../../english/intro/organization.data:329
+msgid ""
+"OASIS: Organization\n"
+" for the Advancement of Structured Information Standards"
+msgstr ""
+
+#: ../../english/intro/organization.data:332
+msgid ""
+"OVAL: Open Vulnerability\n"
+" Assessment Language"
+msgstr ""
+
+#: ../../english/intro/organization.data:335
+msgid "Open Source Initiative"
+msgstr ""
+
+#: ../../english/intro/organization.data:342
msgid "User support"
msgstr "Hỗ trợ người dùng"
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:409
msgid "Bug Tracking System"
msgstr "Hệ thống theo dõi lỗi"
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:414
msgid "Mailing Lists Administration and Mailing List Archives"
msgstr "Quản trị và Lưu trữ các bó thư"
-#: ../../english/intro/organization.data:387
+#: ../../english/intro/organization.data:422
msgid "New Members Front Desk"
msgstr "Các thành viên Bàn lễ tân mới"
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:428
msgid "Debian Account Managers"
msgstr "Quản lý các tài khoản Debian"
-#: ../../english/intro/organization.data:397
+#: ../../english/intro/organization.data:432
msgid ""
"To send a private message to all DAMs, use the GPG key "
"57731224A9762EA155AB2A530CA8D15BB24D96F2."
msgstr ""
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:433
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:402
+#: ../../english/intro/organization.data:437
msgid "Security Team"
msgstr "Nhóm bảo mật"
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:448
msgid "Consultants Page"
msgstr "Trang cố vấn"
-#: ../../english/intro/organization.data:419
+#: ../../english/intro/organization.data:453
msgid "CD Vendors Page"
msgstr "Trang nhà cung cấp CD"
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:456
msgid "Policy"
msgstr "Chính sách"
-#: ../../english/intro/organization.data:425
+#: ../../english/intro/organization.data:459
msgid "System Administration"
msgstr "Quản trị hệ thống"
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:460
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."
@@ -329,7 +375,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:435
+#: ../../english/intro/organization.data:469
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 "
@@ -339,68 +385,66 @@ 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:436
+#: ../../english/intro/organization.data:470
msgid "LDAP Developer Directory Administrator"
msgstr "Nhà quản trị Thư mục Phát triển LDAP"
-#: ../../english/intro/organization.data:437
+#: ../../english/intro/organization.data:471
msgid "Mirrors"
msgstr "Máy bản sao"
-#: ../../english/intro/organization.data:444
+#: ../../english/intro/organization.data:478
msgid "DNS Maintainer"
msgstr "Quản trị DNS"
-#: ../../english/intro/organization.data:445
+#: ../../english/intro/organization.data:479
msgid "Package Tracking System"
msgstr "Hệ thống theo dõi lỗi"
-#: ../../english/intro/organization.data:447
+#: ../../english/intro/organization.data:481
msgid "Treasurer"
msgstr ""
-#: ../../english/intro/organization.data:453
+#: ../../english/intro/organization.data:488
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:456
+#: ../../english/intro/organization.data:491
#, fuzzy
-#| msgid "Alioth administrators"
msgid "Salsa administrators"
msgstr "Các quản trị viên Alioth"
-#: ../../english/intro/organization.data:467
-msgid "Debian for children from 1 to 99"
-msgstr "Debian dành cho trẻ em từ 1 đến 99"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
-#: ../../english/intro/organization.data:470
-msgid "Debian for medical practice and research"
-msgstr "Debian dành cho nghiên cứu và thực hành y học"
+#~ msgid "Individual Packages"
+#~ msgstr "Các gói riêng lẻ"
-#: ../../english/intro/organization.data:473
-msgid "Debian for education"
-msgstr "Debian dành cho giáo dục"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian dành cho trẻ em từ 1 đến 99"
-#: ../../english/intro/organization.data:478
-msgid "Debian in legal offices"
-msgstr "Debian trong các văn phòng luật"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian dành cho nghiên cứu và thực hành y học"
+
+#~ msgid "Debian for education"
+#~ msgstr "Debian dành cho giáo dục"
+
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian trong các văn phòng luật"
-#: ../../english/intro/organization.data:482
-msgid "Debian for people with disabilities"
-msgstr "Debian dành cho những người khuyết tật"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian dành cho những người khuyết tật"
-#: ../../english/intro/organization.data:486
-msgid "Debian for science and related research"
-msgstr "Debian dành cho khoa học và nghiên cứu"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian dành cho khoa học và nghiên cứu"
-#: ../../english/intro/organization.data:489
#, fuzzy
-#| msgid "Debian for education"
-msgid "Debian for astronomy"
-msgstr "Debian dành cho giáo dục"
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian dành cho giáo dục"
#~ msgid "Live System Team"
#~ msgstr "Nhóm hệ thống Live"
diff --git a/vietnamese/po/others.vi.po b/vietnamese/po/others.vi.po
index f486f9cfeb4..32ca0cb4ad5 100644
--- a/vietnamese/po/others.vi.po
+++ b/vietnamese/po/others.vi.po
@@ -51,42 +51,6 @@ msgstr ""
msgid "Unavailable"
msgstr ""
-#: ../../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> "
@@ -146,129 +110,94 @@ msgstr ""
msgid "[Debian] (mini button)"
msgstr ""
-#: ../../english/mirror/submit.inc:7
-msgid "same as the above"
-msgstr ""
-
-#: ../../english/misc/merchandise.def:8
+#: ../../english/events/merchandise.def:10
msgid "Products"
msgstr ""
-#: ../../english/misc/merchandise.def:11
+#: ../../english/events/merchandise.def:13
msgid "T-shirts"
msgstr ""
-#: ../../english/misc/merchandise.def:14
+#: ../../english/events/merchandise.def:16
msgid "hats"
msgstr ""
-#: ../../english/misc/merchandise.def:17
+#: ../../english/events/merchandise.def:19
msgid "stickers"
msgstr ""
-#: ../../english/misc/merchandise.def:20
+#: ../../english/events/merchandise.def:22
msgid "mugs"
msgstr ""
-#: ../../english/misc/merchandise.def:23
+#: ../../english/events/merchandise.def:25
msgid "other clothing"
msgstr ""
-#: ../../english/misc/merchandise.def:26
+#: ../../english/events/merchandise.def:28
msgid "polo shirts"
msgstr ""
-#: ../../english/misc/merchandise.def:29
+#: ../../english/events/merchandise.def:31
msgid "frisbees"
msgstr ""
-#: ../../english/misc/merchandise.def:32
+#: ../../english/events/merchandise.def:34
msgid "mouse pads"
msgstr ""
-#: ../../english/misc/merchandise.def:35
+#: ../../english/events/merchandise.def:37
msgid "badges"
msgstr ""
-#: ../../english/misc/merchandise.def:38
+#: ../../english/events/merchandise.def:40
msgid "basketball goals"
msgstr ""
-#: ../../english/misc/merchandise.def:42
+#: ../../english/events/merchandise.def:44
msgid "earrings"
msgstr ""
-#: ../../english/misc/merchandise.def:45
+#: ../../english/events/merchandise.def:47
msgid "suitcases"
msgstr ""
-#: ../../english/misc/merchandise.def:48
+#: ../../english/events/merchandise.def:50
msgid "umbrellas"
msgstr ""
-#: ../../english/misc/merchandise.def:51
+#: ../../english/events/merchandise.def:53
msgid "pillowcases"
msgstr ""
-#: ../../english/misc/merchandise.def:54
+#: ../../english/events/merchandise.def:56
msgid "keychains"
msgstr ""
-#: ../../english/misc/merchandise.def:57
+#: ../../english/events/merchandise.def:59
msgid "Swiss army knives"
msgstr ""
-#: ../../english/misc/merchandise.def:60
+#: ../../english/events/merchandise.def:62
msgid "USB-Sticks"
msgstr ""
-#: ../../english/misc/merchandise.def:75
+#: ../../english/events/merchandise.def:77
msgid "lanyards"
msgstr ""
-#: ../../english/misc/merchandise.def:78
+#: ../../english/events/merchandise.def:80
msgid "others"
msgstr ""
-#: ../../english/misc/merchandise.def:98
+#: ../../english/events/merchandise.def:101
msgid "Donates money to Debian"
msgstr ""
-#: ../../english/misc/merchandise.def:102
+#: ../../english/events/merchandise.def:106
msgid "Money is used to organize local free software events"
msgstr ""
-#: ../../english/women/profiles/profiles.def:24
-msgid "How long have you been using Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:27
-msgid "Are you a Debian Developer?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:30
-msgid "What areas of Debian are you involved in?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:33
-msgid "What got you interested in working with Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:36
-msgid ""
-"Do you have any tips for women interested in getting more involved with "
-"Debian?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:39
-msgid ""
-"Are you involved with any other women in technology group? Which one(s)?"
-msgstr ""
-
-#: ../../english/women/profiles/profiles.def:42
-msgid "A bit more about you..."
-msgstr ""
-
#: ../../english/y2k/l10n.data:6
msgid "OK"
msgstr ""
@@ -312,3 +241,74 @@ msgstr ""
#: ../../english/y2k/l10n.data:36
msgid "URL"
msgstr ""
+
+#: ../../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/mirror/submit.inc:7
+msgid "same as the above"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:24
+msgid "How long have you been using Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:27
+msgid "Are you a Debian Developer?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:30
+msgid "What areas of Debian are you involved in?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:33
+msgid "What got you interested in working with Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:36
+msgid ""
+"Do you have any tips for women interested in getting more involved with "
+"Debian?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:39
+msgid ""
+"Are you involved with any other women in technology group? Which one(s)?"
+msgstr ""
+
+#: ../../english/women/profiles/profiles.def:42
+msgid "A bit more about you..."
+msgstr ""
diff --git a/vietnamese/po/partners.vi.po b/vietnamese/po/partners.vi.po
index 021ae624d61..644cd23a422 100644
--- a/vietnamese/po/partners.vi.po
+++ b/vietnamese/po/partners.vi.po
@@ -78,7 +78,7 @@ msgid ""
"consulting and services company and since 1999 been offering comprehensive "
"services and technical support for the implementation and operation of open "
"source software in business applications. Our <q>Open Source Support Center</"
-"q> is always available, 365 days a year, around the clock."
+"q> is always available, 365 days a year, around the clock. "
msgstr ""
#: ../../english/partners/partners.def:67
@@ -162,20 +162,33 @@ msgstr ""
#: ../../english/partners/partners.def:113
msgid ""
+"<a href=\"https://www.google.com\">Google</a> sponsors parts of Salsa's "
+"continuous integration infrastructure within Google Cloud Platform."
+msgstr ""
+
+#: ../../english/partners/partners.def:116
+msgid ""
+"Google is one of the largest technology companies in the world, providing a "
+"wide range of Internet-related services and products as online advertising "
+"technologies, search, cloud computing, software, and hardware."
+msgstr ""
+
+#: ../../english/partners/partners.def:123
+msgid ""
"<a href=\"http://www.hpe.com/engage/opensource\">Hewlett Packard Enterprise "
"(HPE)</a> provides hardware for port development, Debian mirrors, and other "
"Debian services (current HPE hardware donations are listed in the <a href="
"\"https://db.debian.org/machines.cgi\">Debian machines</a> page)."
msgstr ""
-#: ../../english/partners/partners.def:116
+#: ../../english/partners/partners.def:126
msgid ""
"HPE is one of the largest computer companies in the world, providing a wide "
"range of products and services, such as servers, storage, networking, "
"consulting and support, software, and financial services."
msgstr ""
-#: ../../english/partners/partners.def:124
+#: ../../english/partners/partners.def:134
msgid ""
"<a href=\"https://www.leaseweb.com/\">LeaseWeb</a> has been one of two "
"partners that provide the infrastructure for the <a href=\"https://snapshot."
@@ -186,7 +199,7 @@ msgid ""
"50%, enough to accommodate anticipated growth for years to come."
msgstr ""
-#: ../../english/partners/partners.def:127
+#: ../../english/partners/partners.def:137
msgid ""
"LeaseWeb is a global Infrastructure-as-a-Service (IaaS) provider – offering "
"customers on-demand, world-class hosting solutions, from dedicated servers "
@@ -194,7 +207,7 @@ msgid ""
"\"https://www.leaseweb.com/\">website</a>."
msgstr ""
-#: ../../english/partners/partners.def:133
+#: ../../english/partners/partners.def:143
msgid ""
"<a href=\"http://www.loongson.cn\">Loongson</a> and <a href=\"http://www."
"lemote.com\">Lemote</a> have provided several Loongson-based machines to "
@@ -203,7 +216,7 @@ msgid ""
"Loongson</a>."
msgstr ""
-#: ../../english/partners/partners.def:136
+#: ../../english/partners/partners.def:146
msgid ""
"Loongson processors are a series of MIPS-compatible processors. They have "
"been widely used in many areas, such as desktop, server, embedded "
@@ -211,7 +224,7 @@ msgid ""
"<a href=\"mailto:info@loongson.cn\">info@loongson.cn</a>."
msgstr ""
-#: ../../english/partners/partners.def:142
+#: ../../english/partners/partners.def:152
msgid ""
"<a href=\"http://www.man-da.de/\">man-da.de GmbH</a> is the backbone "
"provider of the Metropolitan Area Network Darmstadt. It is supporting Debian "
@@ -219,7 +232,7 @@ msgid ""
"network for experimental and debconf.org machines."
msgstr ""
-#: ../../english/partners/partners.def:146
+#: ../../english/partners/partners.def:156
msgid ""
"man-da.de GmbH is operating MANDA, a wide area network in the South Hessen "
"region connecting educational and research organisations to a high speed "
@@ -229,27 +242,27 @@ msgid ""
"both universities."
msgstr ""
-#: ../../english/partners/partners.def:154
+#: ../../english/partners/partners.def:164
msgid ""
"<a href=\"http://osuosl.org/\">The Oregon State University Open Source Lab</"
"a> provides hosting and administration services to the Debian project."
msgstr ""
-#: ../../english/partners/partners.def:158
+#: ../../english/partners/partners.def:168
msgid ""
"The Open Source Lab is a focal point for open source development at Oregon "
"State University and beyond. The OSL provides development, hosting and "
"assorted other services to the Open Source community."
msgstr ""
-#: ../../english/partners/partners.def:165
+#: ../../english/partners/partners.def:175
msgid ""
"nic.at is sponsoring the anycast service <a href=\"https://www.rcodezero.at/"
"\">RcodeZero DNS</a> for Debian as it meets the needs to have geographically "
"disperse locations and support DNSSEC."
msgstr ""
-#: ../../english/partners/partners.def:169
+#: ../../english/partners/partners.def:179
msgid ""
"ipcom is a subsidiary of nic.at, the Austrian domain registry. nic.at has "
"been managing the .at-zone since 1998 on a highly professional and reliable "
@@ -257,14 +270,14 @@ msgid ""
"department and has been successfully in use for the .at zone."
msgstr ""
-#: ../../english/partners/partners.def:175
+#: ../../english/partners/partners.def:185
msgid ""
"<a href=\"http://www.skolelinux.org/\">Skolelinux</a> is heavily involved in "
"both the creation and testing of the new debian-installer and the "
"localization of Debian."
msgstr ""
-#: ../../english/partners/partners.def:178
+#: ../../english/partners/partners.def:188
msgid ""
"Skolelinux is an effort to create a Debian Pure Blend aimed at schools and "
"universities. An easy 3-question installation results in a preconfigured "
@@ -273,7 +286,7 @@ msgid ""
"environment."
msgstr ""
-#: ../../english/partners/partners.def:185
+#: ../../english/partners/partners.def:195
msgid ""
"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
@@ -283,35 +296,35 @@ msgid ""
"\">Planet Debian</a>."
msgstr ""
-#: ../../english/partners/partners.def:188
+#: ../../english/partners/partners.def:198
msgid ""
"StackPath is a platform of secure edge services that enables developers to "
"protect, accelerate, and innovate cloud properties ranging from websites to "
"media delivery and IoT services."
msgstr ""
-#: ../../english/partners/partners.def:194
+#: ../../english/partners/partners.def:204
msgid ""
"<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
"supporting the Debian community by donating hardware, rackspace and "
"bandwidth for the Debian server hosting alioth, arch and svn."
msgstr ""
-#: ../../english/partners/partners.def:197
+#: ../../english/partners/partners.def:207
msgid ""
"Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
"Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
"are highly motivated Debian users and some of them also Debian maintainers."
msgstr ""
-#: ../../english/partners/partners.def:200
+#: ../../english/partners/partners.def:210
msgid ""
"Telegraaf Media Group runs some of the most popular Dutch websites (http://"
"www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
"the two biggest newspapers in The Netherlands."
msgstr ""
-#: ../../english/partners/partners.def:206
+#: ../../english/partners/partners.def:216
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
"high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -321,7 +334,7 @@ msgid ""
"thomas-krenn.com/linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:209
+#: ../../english/partners/partners.def:219
msgid ""
"<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
"online shop for server systems and high-quality hosting. They offer rack-"
@@ -331,7 +344,7 @@ msgid ""
"course they support Debian as operating system on their servers!"
msgstr ""
-#: ../../english/partners/partners.def:215
+#: ../../english/partners/partners.def:225
msgid ""
"<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
"to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -340,7 +353,7 @@ msgid ""
"for LinuxTag 2001 in Stuttgart."
msgstr ""
-#: ../../english/partners/partners.def:218
+#: ../../english/partners/partners.def:228
msgid ""
"trustsec offers customer support, consulting and training for Debian on the "
"Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -348,7 +361,7 @@ msgid ""
"\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
msgstr ""
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:236
msgid ""
"The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
"provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -358,7 +371,7 @@ msgid ""
"increasing the amount of snapshot storage provided."
msgstr ""
-#: ../../english/partners/partners.def:229
+#: ../../english/partners/partners.def:239
msgid ""
"The Wellcome Sanger Institute is one of the world's leading genome centres. "
"Through its ability to conduct research at scale, it is able to engage in "
@@ -369,14 +382,14 @@ msgid ""
"treatments for human disease."
msgstr ""
-#: ../../english/partners/partners.def:239
+#: ../../english/partners/partners.def:249
msgid ""
"<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
"Novare) provides several machines to Debian, as well as hosting and server "
"administration services."
msgstr ""
-#: ../../english/partners/partners.def:242
+#: ../../english/partners/partners.def:252
msgid ""
"Brainfood is a technology solutions company whose goal is to work to produce "
"an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -385,7 +398,7 @@ msgid ""
"\">debian-contact@brainfood.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:249
+#: ../../english/partners/partners.def:259
msgid ""
"<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
"port development, Debian mirrors, and other Debian services (current HP "
@@ -395,7 +408,7 @@ msgid ""
"com/products1/linux/\">HP Linux</a>."
msgstr ""
-#: ../../english/partners/partners.def:252
+#: ../../english/partners/partners.def:262
msgid ""
"Hewlett-Packard is one of the largest computer companies in the world, "
"providing a wide range of products and services, such as servers, PCs, "
@@ -403,7 +416,7 @@ msgid ""
"solutions, etc."
msgstr ""
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:269
msgid ""
"<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
"Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -411,7 +424,7 @@ msgid ""
"current users."
msgstr ""
-#: ../../english/partners/partners.def:263
+#: ../../english/partners/partners.def:273
msgid ""
"Linux Central sells all the latest releases of Linux products such as "
"commercial software, books, hardware, and versions of major Linux "
@@ -421,14 +434,14 @@ msgid ""
"contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
msgstr ""
-#: ../../english/partners/partners.def:270
+#: ../../english/partners/partners.def:280
msgid ""
"<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
"Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
"are a UK based web hosting, domain registration and co-location company."
msgstr ""
-#: ../../english/partners/partners.def:277
+#: ../../english/partners/partners.def:287
msgid ""
"San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
"a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -439,7 +452,7 @@ msgid ""
"copy of The Debian System to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:284
+#: ../../english/partners/partners.def:294
msgid ""
"<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
"Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -447,7 +460,7 @@ msgid ""
"donate 1&euro; to the Debian Project."
msgstr ""
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:297
msgid ""
"Open Source Press specialises on books around Linux and Open Source "
"Software, written by authors with considerable experience in the fields, and "
@@ -455,7 +468,7 @@ msgid ""
"Source Press publications are renowned for their quality and depth."
msgstr ""
-#: ../../english/partners/partners.def:295
+#: ../../english/partners/partners.def:305
msgid ""
"<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
"Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -463,13 +476,13 @@ msgid ""
"virtual servers."
msgstr ""
-#: ../../english/partners/partners.def:298
+#: ../../english/partners/partners.def:308
msgid ""
"It hosts a Debian development machine, <a href=\"https://db.debian.org/"
"machines.cgi?host=caballero\">caballero</a>."
msgstr ""
-#: ../../english/partners/partners.def:306
+#: ../../english/partners/partners.def:316
msgid ""
"<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
"machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -477,7 +490,7 @@ msgid ""
"ARM port."
msgstr ""
-#: ../../english/partners/partners.def:309
+#: ../../english/partners/partners.def:319
msgid ""
"Simtec is a leading provider of ARM based computing products. We have a "
"range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
diff --git a/vietnamese/po/ports.vi.po b/vietnamese/po/ports.vi.po
index af60bbe50d1..bcd4a0b54f4 100644
--- a/vietnamese/po/ports.vi.po
+++ b/vietnamese/po/ports.vi.po
@@ -3,22 +3,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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 ""
@@ -83,6 +67,22 @@ msgstr ""
msgid "Systems"
msgstr ""
+#: ../../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/netbsd/menu.inc:6
msgid "Debian GNU/NetBSD for i386"
msgstr ""
diff --git a/vietnamese/po/security.vi.po b/vietnamese/po/security.vi.po
index 39c632da6c2..6fb3eeef1f4 100644
--- a/vietnamese/po/security.vi.po
+++ b/vietnamese/po/security.vi.po
@@ -14,42 +14,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Gtranslator 2.91.6\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:"
msgstr "Nguồn:"
@@ -131,3 +95,39 @@ 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 a8bfea2710f..bd3c099a2d8 100644
--- a/vietnamese/po/stats.vi.po
+++ b/vietnamese/po/stats.vi.po
@@ -3,22 +3,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../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:278 ../../stattrans.pl:494
msgid "Wrong translation version"
msgstr ""
@@ -36,11 +20,11 @@ msgid "The original no longer exists"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hit count N/A"
+msgid "hits"
msgstr ""
#: ../../stattrans.pl:470
-msgid "hits"
+msgid "hit count N/A"
msgstr ""
#: ../../stattrans.pl:488 ../../stattrans.pl:489
@@ -55,15 +39,6 @@ msgstr ""
msgid "Translation summary for"
msgstr ""
-#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
-#: ../../stattrans.pl:852
-msgid "Not translated"
-msgstr ""
-
-#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
-msgid "Outdated"
-msgstr ""
-
#: ../../stattrans.pl:607
msgid "Translated"
msgstr ""
@@ -73,6 +48,15 @@ msgstr ""
msgid "Up to date"
msgstr ""
+#: ../../stattrans.pl:607 ../../stattrans.pl:762 ../../stattrans.pl:808
+msgid "Outdated"
+msgstr ""
+
+#: ../../stattrans.pl:607 ../../stattrans.pl:763 ../../stattrans.pl:809
+#: ../../stattrans.pl:852
+msgid "Not translated"
+msgstr ""
+
#: ../../stattrans.pl:608 ../../stattrans.pl:609 ../../stattrans.pl:610
#: ../../stattrans.pl:611
msgid "files"
@@ -220,3 +204,19 @@ msgstr ""
#: ../../stattrans.pl:790
msgid "Translation Statistics by Page Size"
msgstr ""
+
+#: ../../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 ""
diff --git a/vietnamese/po/templates.vi.po b/vietnamese/po/templates.vi.po
index 6fc8d966791..eab3d9356fb 100644
--- a/vietnamese/po/templates.vi.po
+++ b/vietnamese/po/templates.vi.po
@@ -14,14 +14,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: ../../english/search.xml.in:7
-msgid "Debian website"
-msgstr "Wiki về Debian"
-
-#: ../../english/search.xml.in:9
-msgid "Search the Debian website."
-msgstr "Tìm kiếm trang thông tin điện tử Debian."
-
#: ../../english/template/debian/basic.wml:19
#: ../../english/template/debian/navbar.wml:11
msgid "Debian"
@@ -84,7 +76,6 @@ msgstr "Liên hệ với chúng tôi"
#: ../../english/template/debian/common_translation.wml:37
#, fuzzy
-#| msgid "Release Info"
msgid "Legal Info"
msgstr "Thông tin phát hành"
@@ -162,6 +153,11 @@ msgstr "Lấy Debian"
msgid "The Debian Blog"
msgstr "Nhật ký Debian"
+#: ../../english/template/debian/common_translation.wml:94
+#, fuzzy
+msgid "Last Updated"
+msgstr "Lần sửa cuối"
+
#: ../../english/template/debian/ddp.wml:6
msgid ""
"Please send all comments, criticisms and suggestions about these web pages "
@@ -208,14 +204,8 @@ msgstr "trong bản phát hành 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:107
+#: ../../english/template/debian/footer.wml:106
#, fuzzy
-#| msgid ""
-#| "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
-#| "www@lists.debian.org\">debian-www@lists.debian.org</a>. For other "
-#| "contact information, see the Debian <a href=\"m4_HOME/contact\">contact "
-#| "page</a>. Web site source code is <a href=\"m4_HOME/devel/website/"
-#| "using_cvs\">available</a>."
msgid ""
"To report a problem with the web site, please e-mail our publicly archived "
"mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists."
@@ -231,29 +221,29 @@ msgstr ""
"Debian. Mã nguồn trang thông tin điện tử cũng <a href=\"m4_HOME/devel/"
"website/using_cvs\">sẵn có</a>."
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:109
msgid "Last Modified"
msgstr "Lần sửa cuối"
-#: ../../english/template/debian/footer.wml:113
+#: ../../english/template/debian/footer.wml:112
msgid "Last Built"
msgstr ""
-#: ../../english/template/debian/footer.wml:116
+#: ../../english/template/debian/footer.wml:115
msgid "Copyright"
msgstr "Bản quyền"
-#: ../../english/template/debian/footer.wml:119
+#: ../../english/template/debian/footer.wml:118
msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
msgstr "<a href=\"https://www.spi-inc.org/\">SPI</a> và các chủ thể khác;"
-#: ../../english/template/debian/footer.wml:122
+#: ../../english/template/debian/footer.wml:121
msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
msgstr ""
"Xem <a href=\"m4_HOME/license\" rel=\"copyright\">các điều khoản giấy phép</"
"a>"
-#: ../../english/template/debian/footer.wml:125
+#: ../../english/template/debian/footer.wml:124
msgid ""
"Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
"Software in the Public Interest, Inc."
@@ -270,6 +260,14 @@ msgstr "Trang này cũng sẵn có bằng các ngôn ngữ sau:"
msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
msgstr "Làm sao để đặt <a href=m4_HOME/intro/cn>ngôn ngữ tài liệu mặc định</a>"
+#: ../../english/template/debian/languages.wml:323
+msgid "Browser default"
+msgstr ""
+
+#: ../../english/template/debian/languages.wml:323
+msgid "Unset the language override cookie"
+msgstr ""
+
#: ../../english/template/debian/links.tags.wml:4
msgid "Debian International"
msgstr "Debian quốc tế"
@@ -498,6 +496,15 @@ msgstr "(phiên bản mới)"
msgid "Report"
msgstr "Báo cáo"
+#: ../../english/template/debian/redirect.wml:6
+msgid "Page redirected to <newpage/>"
+msgstr ""
+
+#: ../../english/template/debian/redirect.wml:12
+msgid ""
+"This page has been renamed to <url <newpage/>>, please update your links."
+msgstr ""
+
#. given a manual name and an architecture, join them
#. if you need to reorder the two, use "%2$s ... %1$s", cf. printf(3)
#: ../../english/template/debian/release.wml:7
@@ -532,9 +539,17 @@ msgstr ""
msgid "URL"
msgstr "URL"
-#: ../../english/template/debian/users.wml:7
+#: ../../english/template/debian/users.wml:12
msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
msgstr "Quay trở về trang <a href=\"../\">Ai đang dùng Debian?</a>."
+#: ../../english/search.xml.in:7
+msgid "Debian website"
+msgstr "Wiki về Debian"
+
+#: ../../english/search.xml.in:9
+msgid "Search the Debian website."
+msgstr "Tìm kiếm trang thông tin điện tử Debian."
+
#~ msgid "Visit the site sponsor"
#~ msgstr "Viếng thăm trang của nhà đỡ đầu"
diff --git a/vietnamese/po/vote.vi.po b/vietnamese/po/vote.vi.po
index 57703ac0a36..7ba75e28899 100644
--- a/vietnamese/po/vote.vi.po
+++ b/vietnamese/po/vote.vi.po
@@ -20,237 +20,265 @@ msgid "Nominations"
msgstr ""
#: ../../english/template/debian/votebar.wml:25
-msgid "Debate"
+msgid "Withdrawals"
msgstr ""
#: ../../english/template/debian/votebar.wml:28
-msgid "Platforms"
+msgid "Debate"
msgstr ""
#: ../../english/template/debian/votebar.wml:31
-msgid "Proposer"
+msgid "Platforms"
msgstr ""
#: ../../english/template/debian/votebar.wml:34
-msgid "Proposal A Proposer"
+msgid "Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:37
-msgid "Proposal B Proposer"
+msgid "Proposal A Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:40
-msgid "Proposal C Proposer"
+msgid "Proposal B Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:43
-msgid "Proposal D Proposer"
+msgid "Proposal C Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:46
-msgid "Proposal E Proposer"
+msgid "Proposal D Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:49
-msgid "Proposal F Proposer"
+msgid "Proposal E Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:52
-msgid "Seconds"
+msgid "Proposal F Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:55
-msgid "Proposal A Seconds"
+msgid "Proposal G Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:58
-msgid "Proposal B Seconds"
+msgid "Proposal H Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:61
-msgid "Proposal C Seconds"
+msgid "Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:64
-msgid "Proposal D Seconds"
+msgid "Proposal A Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:67
-msgid "Proposal E Seconds"
+msgid "Proposal B Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:70
-msgid "Proposal F Seconds"
+msgid "Proposal C Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:73
-msgid "Opposition"
+msgid "Proposal D Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:76
-msgid "Text"
+msgid "Proposal E Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:79
-msgid "Proposal A"
+msgid "Proposal F Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:82
-msgid "Proposal B"
+msgid "Proposal G Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:85
-msgid "Proposal C"
+msgid "Proposal H Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:88
-msgid "Proposal D"
+msgid "Opposition"
msgstr ""
#: ../../english/template/debian/votebar.wml:91
-msgid "Proposal E"
+msgid "Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:94
-msgid "Proposal F"
+msgid "Proposal A"
msgstr ""
#: ../../english/template/debian/votebar.wml:97
-msgid "Choices"
+msgid "Proposal B"
msgstr ""
#: ../../english/template/debian/votebar.wml:100
-msgid "Amendment Proposer"
+msgid "Proposal C"
msgstr ""
#: ../../english/template/debian/votebar.wml:103
-msgid "Amendment Seconds"
+msgid "Proposal D"
msgstr ""
#: ../../english/template/debian/votebar.wml:106
-msgid "Amendment Text"
+msgid "Proposal E"
msgstr ""
#: ../../english/template/debian/votebar.wml:109
-msgid "Amendment Proposer A"
+msgid "Proposal F"
msgstr ""
#: ../../english/template/debian/votebar.wml:112
-msgid "Amendment Seconds A"
+msgid "Proposal G"
msgstr ""
#: ../../english/template/debian/votebar.wml:115
-msgid "Amendment Text A"
+msgid "Proposal H"
msgstr ""
#: ../../english/template/debian/votebar.wml:118
-msgid "Amendment Proposer B"
+msgid "Choices"
msgstr ""
#: ../../english/template/debian/votebar.wml:121
-msgid "Amendment Seconds B"
+msgid "Amendment Proposer"
msgstr ""
#: ../../english/template/debian/votebar.wml:124
-msgid "Amendment Text B"
+msgid "Amendment Seconds"
msgstr ""
#: ../../english/template/debian/votebar.wml:127
-msgid "Amendment Proposer C"
+msgid "Amendment Text"
msgstr ""
#: ../../english/template/debian/votebar.wml:130
-msgid "Amendment Seconds C"
+msgid "Amendment Proposer A"
msgstr ""
#: ../../english/template/debian/votebar.wml:133
-msgid "Amendment Text C"
+msgid "Amendment Seconds A"
msgstr ""
#: ../../english/template/debian/votebar.wml:136
-msgid "Amendments"
+msgid "Amendment Text A"
msgstr ""
#: ../../english/template/debian/votebar.wml:139
-msgid "Proceedings"
+msgid "Amendment Proposer B"
msgstr ""
#: ../../english/template/debian/votebar.wml:142
-msgid "Majority Requirement"
+msgid "Amendment Seconds B"
msgstr ""
#: ../../english/template/debian/votebar.wml:145
-msgid "Data and Statistics"
+msgid "Amendment Text B"
msgstr ""
#: ../../english/template/debian/votebar.wml:148
-msgid "Quorum"
+msgid "Amendment Proposer C"
msgstr ""
#: ../../english/template/debian/votebar.wml:151
-msgid "Minimum Discussion"
+msgid "Amendment Seconds C"
msgstr ""
#: ../../english/template/debian/votebar.wml:154
-msgid "Ballot"
+msgid "Amendment Text C"
msgstr ""
#: ../../english/template/debian/votebar.wml:157
-msgid "Forum"
+msgid "Amendments"
msgstr ""
#: ../../english/template/debian/votebar.wml:160
+msgid "Proceedings"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:163
+msgid "Majority Requirement"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:166
+msgid "Data and Statistics"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:169
+msgid "Quorum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:172
+msgid "Minimum Discussion"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:175
+msgid "Ballot"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:178
+msgid "Forum"
+msgstr ""
+
+#: ../../english/template/debian/votebar.wml:181
msgid "Outcome"
msgstr ""
-#: ../../english/template/debian/votebar.wml:164
+#: ../../english/template/debian/votebar.wml:185
msgid "Waiting&nbsp;for&nbsp;Sponsors"
msgstr ""
-#: ../../english/template/debian/votebar.wml:167
+#: ../../english/template/debian/votebar.wml:188
msgid "In&nbsp;Discussion"
msgstr ""
-#: ../../english/template/debian/votebar.wml:170
+#: ../../english/template/debian/votebar.wml:191
msgid "Voting&nbsp;Open"
msgstr ""
-#: ../../english/template/debian/votebar.wml:173
+#: ../../english/template/debian/votebar.wml:194
msgid "Decided"
msgstr ""
-#: ../../english/template/debian/votebar.wml:176
+#: ../../english/template/debian/votebar.wml:197
msgid "Withdrawn"
msgstr ""
-#: ../../english/template/debian/votebar.wml:179
+#: ../../english/template/debian/votebar.wml:200
msgid "Other"
msgstr ""
-#: ../../english/template/debian/votebar.wml:183
+#: ../../english/template/debian/votebar.wml:204
msgid "Home&nbsp;Vote&nbsp;Page"
msgstr ""
-#: ../../english/template/debian/votebar.wml:186
+#: ../../english/template/debian/votebar.wml:207
msgid "How&nbsp;To"
msgstr ""
-#: ../../english/template/debian/votebar.wml:189
+#: ../../english/template/debian/votebar.wml:210
msgid "Submit&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:192
+#: ../../english/template/debian/votebar.wml:213
msgid "Amend&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:195
+#: ../../english/template/debian/votebar.wml:216
msgid "Follow&nbsp;a&nbsp;Proposal"
msgstr ""
-#: ../../english/template/debian/votebar.wml:198
+#: ../../english/template/debian/votebar.wml:219
msgid "Read&nbsp;a&nbsp;Result"
msgstr ""
-#: ../../english/template/debian/votebar.wml:201
+#: ../../english/template/debian/votebar.wml:222
msgid "Vote"
msgstr ""

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